upgrade all cargo dependencies

Unfortunately we need to pull tracing-opentelemetry from git because
there hasn't been a release including the dependency bump on the other
opentelemetry crates.

src/api/client_server/account.rs

@@ -93,7 +93,7 @@ pub(crate) async fn register_route(
         && body.appservice_info.is_none()
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "Registration has been disabled.",
         ));
     }

src/api/client_server/context.rs

@@ -53,7 +53,7 @@ pub(crate) async fn get_context_route(
         &body.event_id,
     )? {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "You don't have permission to view this event.",
         ));
     }

src/api/client_server/membership.rs

@@ -450,7 +450,7 @@ pub(crate) async fn get_member_events_route(
         .user_can_see_state_events(sender_user, &body.room_id)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "You don't have permission to view this room.",
         ));
     }
@@ -485,7 +485,7 @@ pub(crate) async fn joined_members_route(
         .user_can_see_state_events(sender_user, &body.room_id)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "You don't have permission to view this room.",
         ));
     }
@@ -1399,7 +1399,7 @@ pub(crate) async fn invite_helper(
 
     if !services().rooms.state_cache.is_joined(sender_user, room_id)? {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "You don't have permission to view this room.",
         ));
     }

src/api/client_server/message.rs

@@ -48,7 +48,7 @@ pub(crate) async fn send_message_event_route(
         && !services().globals.allow_encryption()
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "Encryption has been disabled",
         ));
     }

src/api/client_server/relations.rs

@@ -49,6 +49,8 @@ pub(crate) async fn get_relating_events_with_rel_type_and_event_type_route(
         chunk: res.chunk,
         next_batch: res.next_batch,
         prev_batch: res.prev_batch,
+        // TODO
+        recursion_depth: None,
     }))
 }
 
@@ -92,6 +94,8 @@ pub(crate) async fn get_relating_events_with_rel_type_route(
         chunk: res.chunk,
         next_batch: res.next_batch,
         prev_batch: res.prev_batch,
+        // TODO
+        recursion_depth: None,
     }))
 }
 

src/api/client_server/room.rs

@@ -78,7 +78,7 @@ pub(crate) async fn create_room_route(
         && !services().users.is_admin(sender_user)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "Room creation has been disabled.",
         ));
     }
@@ -565,7 +565,7 @@ pub(crate) async fn get_room_event_route(
         &body.event_id,
     )? {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "You don't have permission to view this event.",
         ));
     }
@@ -591,7 +591,7 @@ pub(crate) async fn get_room_aliases_route(
 
     if !services().rooms.state_cache.is_joined(sender_user, &body.room_id)? {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "You don't have permission to view this room.",
         ));
     }

src/api/client_server/search.rs

@@ -53,7 +53,7 @@ pub(crate) async fn search_events_route(
     for room_id in room_ids {
         if !services().rooms.state_cache.is_joined(sender_user, &room_id)? {
             return Err(Error::BadRequest(
-                ErrorKind::Forbidden,
+                ErrorKind::forbidden(),
                 "You don't have permission to view this room.",
             ));
         }

src/api/client_server/session.rs

@@ -81,7 +81,7 @@ pub(crate) async fn login_route(
                 } else {
                     warn!("Bad login type: {:?}", &body.login_info);
                     return Err(Error::BadRequest(
-                        ErrorKind::Forbidden,
+                        ErrorKind::forbidden(),
                         "Bad login type.",
                     ));
                 }
@@ -101,7 +101,7 @@ pub(crate) async fn login_route(
 
             let hash = services().users.password_hash(&user_id)?.ok_or(
                 Error::BadRequest(
-                    ErrorKind::Forbidden,
+                    ErrorKind::forbidden(),
                     "Wrong username or password.",
                 ),
             )?;
@@ -119,7 +119,7 @@ pub(crate) async fn login_route(
 
             if !hash_matches {
                 return Err(Error::BadRequest(
-                    ErrorKind::Forbidden,
+                    ErrorKind::forbidden(),
                     "Wrong username or password.",
                 ));
             }
@@ -190,7 +190,7 @@ pub(crate) async fn login_route(
                 } else {
                     warn!("Bad login type: {:?}", &body.login_info);
                     return Err(Error::BadRequest(
-                        ErrorKind::Forbidden,
+                        ErrorKind::forbidden(),
                         "Bad login type.",
                     ));
                 }

src/api/client_server/state.rs

@@ -63,7 +63,7 @@ pub(crate) async fn send_state_event_for_empty_key_route(
         && !services().globals.allow_encryption()
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "Encryption has been disabled",
         ));
     }
@@ -101,7 +101,7 @@ pub(crate) async fn get_state_events_route(
         .user_can_see_state_events(sender_user, &body.room_id)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "You don't have permission to view the room state.",
         ));
     }
@@ -135,7 +135,7 @@ pub(crate) async fn get_state_events_for_key_route(
         .user_can_see_state_events(sender_user, &body.room_id)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "You don't have permission to view the room state.",
         ));
     }
@@ -176,7 +176,7 @@ pub(crate) async fn get_state_events_for_empty_key_route(
         .user_can_see_state_events(sender_user, &body.room_id)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "You don't have permission to view the room state.",
         ));
     }
@@ -232,7 +232,7 @@ async fn send_state_event_for_key_helper(
                     .is_none()
             {
                 return Err(Error::BadRequest(
-                    ErrorKind::Forbidden,
+                    ErrorKind::forbidden(),
                     "You are only allowed to send canonical_alias events when \
                      it's aliases already exists",
                 ));

src/api/client_server/sync.rs

@@ -605,7 +605,9 @@ async fn load_joined_room(
                                     .state_cache
                                     .is_invited(&user_id, room_id)?)
                             {
-                                Ok::<_, Error>(Some(state_key.clone()))
+                                Ok::<_, Error>(Some(state_key.parse().expect(
+                                    "`state_key` should be a valid user ID",
+                                )))
                             } else {
                                 Ok(None)
                             }
@@ -1686,6 +1688,8 @@ pub(crate) async fn sync_events_v4_route(
                 // Count events in timeline greater than global sync counter
                 num_live: None,
                 timestamp: None,
+                // TODO
+                heroes: None,
             },
         );
     }

src/api/client_server/typing.rs

@@ -14,7 +14,7 @@ pub(crate) async fn create_typing_event_route(
 
     if !services().rooms.state_cache.is_joined(sender_user, &body.room_id)? {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "You are not in this room.",
         ));
     }

src/api/ruma_wrapper/axum.rs

@@ -2,19 +2,22 @@ use std::{collections::BTreeMap, iter::FromIterator, str};
 
 use axum::{
     async_trait,
-    body::{Full, HttpBody},
-    extract::{
-        rejection::TypedHeaderRejectionReason, FromRequest, Path, TypedHeader,
-    },
+    body::Body,
+    extract::{FromRequest, Path},
+    response::{IntoResponse, Response},
+    RequestExt, RequestPartsExt,
+};
+use axum_extra::{
     headers::{
         authorization::{Bearer, Credentials},
         Authorization,
     },
-    response::{IntoResponse, Response},
-    BoxError, RequestExt, RequestPartsExt,
+    typed_header::TypedHeaderRejectionReason,
+    TypedHeader,
 };
-use bytes::{Buf, BufMut, Bytes, BytesMut};
+use bytes::{BufMut, BytesMut};
 use http::{Request, StatusCode};
+use http_body_util::BodyExt;
 use ruma::{
     api::{
         client::error::ErrorKind, AuthScheme, IncomingRequest, OutgoingResponse,
@@ -35,18 +38,15 @@ enum Token {
 }
 
 #[async_trait]
-impl<T, S, B> FromRequest<S, B> for Ar<T>
+impl<T, S> FromRequest<S> for Ar<T>
 where
     T: IncomingRequest,
-    B: HttpBody + Send + 'static,
-    B::Data: Send,
-    B::Error: Into<BoxError>,
 {
     type Rejection = Error;
 
     #[allow(clippy::too_many_lines)]
     async fn from_request(
-        req: Request<B>,
+        req: axum::extract::Request,
         _state: &S,
     ) -> Result<Self, Self::Rejection> {
         #[derive(Deserialize)]
@@ -55,21 +55,17 @@ where
             user_id: Option<String>,
         }
 
-        let (mut parts, mut body) = match req.with_limited_body() {
-            Ok(limited_req) => {
-                let (parts, body) = limited_req.into_parts();
-                let body = to_bytes(body).await.map_err(|_| {
+        let (mut parts, mut body) = {
+            let limited_req = req.with_limited_body();
+            let (parts, body) = limited_req.into_parts();
+            let body = body
+                .collect()
+                .await
+                .map_err(|_| {
                     Error::BadRequest(ErrorKind::MissingToken, "Missing token.")
-                })?;
-                (parts, body)
-            }
-            Err(original_req) => {
-                let (parts, body) = original_req.into_parts();
-                let body = to_bytes(body).await.map_err(|_| {
-                    Error::BadRequest(ErrorKind::MissingToken, "Missing token.")
-                })?;
-                (parts, body)
-            }
+                })?
+                .to_bytes();
+            (parts, body)
         };
 
         let metadata = T::METADATA;
@@ -151,7 +147,7 @@ where
 
                     if !services().users.exists(&user_id)? {
                         return Err(Error::BadRequest(
-                            ErrorKind::Forbidden,
+                            ErrorKind::forbidden(),
                             "User does not exist.",
                         ));
                     }
@@ -196,7 +192,7 @@ where
                                 _ => "Unknown header-related error",
                             };
 
-                            Error::BadRequest(ErrorKind::Forbidden, msg)
+                            Error::BadRequest(ErrorKind::forbidden(), msg)
                         })?;
 
                     let origin_signatures = BTreeMap::from_iter([(
@@ -261,7 +257,7 @@ where
                         Err(e) => {
                             warn!("Failed to fetch signing keys: {}", e);
                             return Err(Error::BadRequest(
-                                ErrorKind::Forbidden,
+                                ErrorKind::forbidden(),
                                 "Failed to fetch signing keys.",
                             ));
                         }
@@ -294,7 +290,7 @@ where
                             }
 
                             return Err(Error::BadRequest(
-                                ErrorKind::Forbidden,
+                                ErrorKind::forbidden(),
                                 "Failed to verify X-Matrix signatures.",
                             ));
                         }
@@ -453,62 +449,10 @@ impl Credentials for XMatrix {
 impl<T: OutgoingResponse> IntoResponse for Ra<T> {
     fn into_response(self) -> Response {
         match self.0.try_into_http_response::<BytesMut>() {
-            Ok(res) => res.map(BytesMut::freeze).map(Full::new).into_response(),
+            Ok(res) => {
+                res.map(BytesMut::freeze).map(Body::from).into_response()
+            }
             Err(_) => StatusCode::INTERNAL_SERVER_ERROR.into_response(),
         }
     }
 }
-
-// copied from hyper under the following license:
-// Copyright (c) 2014-2021 Sean McArthur
-
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-pub(crate) async fn to_bytes<T>(body: T) -> Result<Bytes, T::Error>
-where
-    T: HttpBody,
-{
-    futures_util::pin_mut!(body);
-
-    // If there's only 1 chunk, we can just return Buf::to_bytes()
-    let mut first = if let Some(buf) = body.data().await {
-        buf?
-    } else {
-        return Ok(Bytes::new());
-    };
-
-    let second = if let Some(buf) = body.data().await {
-        buf?
-    } else {
-        return Ok(first.copy_to_bytes(first.remaining()));
-    };
-
-    // With more than 1 buf, we gotta flatten into a Vec first.
-    let cap = first.remaining()
-        + second.remaining()
-        + body.size_hint().lower().try_into().unwrap_or(usize::MAX);
-    let mut vec = Vec::with_capacity(cap);
-    vec.put(first);
-    vec.put(second);
-
-    while let Some(buf) = body.data().await {
-        vec.put(buf?);
-    }
-
-    Ok(vec.into())
-}

src/api/server_server.rs

@@ -1023,7 +1023,7 @@ pub(crate) async fn get_event_route(
         .server_in_room(sender_servername, room_id)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "Server is not in room",
         ));
     }
@@ -1034,7 +1034,7 @@ pub(crate) async fn get_event_route(
         &body.event_id,
     )? {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "Server is not allowed to see event.",
         ));
     }
@@ -1064,7 +1064,7 @@ pub(crate) async fn get_backfill_route(
         .server_in_room(sender_servername, &body.room_id)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "Server is not in room.",
         ));
     }
@@ -1132,7 +1132,7 @@ pub(crate) async fn get_missing_events_route(
         .server_in_room(sender_servername, &body.room_id)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "Server is not in room",
         ));
     }
@@ -1234,7 +1234,7 @@ pub(crate) async fn get_event_authorization_route(
         .server_in_room(sender_servername, &body.room_id)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "Server is not in room.",
         ));
     }
@@ -1292,7 +1292,7 @@ pub(crate) async fn get_room_state_route(
         .server_in_room(sender_servername, &body.room_id)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "Server is not in room.",
         ));
     }
@@ -1362,7 +1362,7 @@ pub(crate) async fn get_room_state_ids_route(
         .server_in_room(sender_servername, &body.room_id)?
     {
         return Err(Error::BadRequest(
-            ErrorKind::Forbidden,
+            ErrorKind::forbidden(),
             "Server is not in room.",
         ));
     }