studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Provide default for empty PathAndQuery (Sentry ID c09f58adf5...)

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-11-30 12:35:04 +00:00
parent 74f8cd3708
commit 50bfb0fe5e
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/router/auth/server.rs
View File

@@ -1,5 +1,6 @@
use axum::RequestPartsExt; use axum::RequestPartsExt;
use axum_extra::{TypedHeader, headers::Authorization, typed_header::TypedHeaderRejectionReason}; use axum_extra::{TypedHeader, headers::Authorization, typed_header::TypedHeaderRejectionReason};
use http::uri::PathAndQuery;
use ruma::{ use ruma::{
CanonicalJsonName, CanonicalJsonObject, CanonicalJsonValue, CanonicalJsonName, CanonicalJsonObject, CanonicalJsonValue,
api::federation::authentication::XMatrix, api::federation::authentication::XMatrix,
@@ -30,8 +31,8 @@ pub(super) async fn auth_server(
.parts .parts
.uri .uri
.path_and_query() .path_and_query()
.expect("all requests have a path") .map(PathAndQuery::as_str)
.to_string(); .unwrap_or("/");
let signature: [Member; 1] = let signature: [Member; 1] =
[(x_matrix.key.as_str().into(), Value::String(x_matrix.sig.to_string()))]; [(x_matrix.key.as_str().into(), Value::String(x_matrix.sig.to_string()))];
@@ -45,7 +46,7 @@ pub(super) async fn auth_server(
("method".into(), Value::String(request.parts.method.as_str().into())), ("method".into(), Value::String(request.parts.method.as_str().into())),
("origin".into(), Value::String(origin.as_str().into())), ("origin".into(), Value::String(origin.as_str().into())),
("signatures".into(), Value::Object(signatures.into())), ("signatures".into(), Value::Object(signatures.into())),
("uri".into(), Value::String(signature_uri)), ("uri".into(), Value::String(signature_uri.into())),
]; ];
authorization.into() authorization.into()
@@ -55,7 +56,7 @@ pub(super) async fn auth_server(
("method".into(), Value::String(request.parts.method.as_str().into())), ("method".into(), Value::String(request.parts.method.as_str().into())),
("origin".into(), Value::String(origin.as_str().into())), ("origin".into(), Value::String(origin.as_str().into())),
("signatures".into(), Value::Object(signatures.into())), ("signatures".into(), Value::Object(signatures.into())),
("uri".into(), Value::String(signature_uri)), ("uri".into(), Value::String(signature_uri.into())),
]; ];
authorization.into() authorization.into()

5
src/router/layers.rs
View File

@@ -8,6 +8,7 @@ use axum_client_ip::SecureClientIpSource;
use http::{ use http::{
HeaderValue, Method, StatusCode, HeaderValue, Method, StatusCode,
header::{self, HeaderName}, header::{self, HeaderName},
uri::PathAndQuery,
}; };
use tower::ServiceBuilder; use tower::ServiceBuilder;
use tower_http::{ use tower_http::{
@@ -239,8 +240,8 @@ fn request_path_str<T>(request: &http::Request<T>) -> &str {
request request
.uri() .uri()
.path_and_query() .path_and_query()
.expect("all requests have a path") .map(PathAndQuery::as_str)
.as_str() .unwrap_or("/")
} }
fn truncated_matched_path(path: &MatchedPath) -> &str { fn truncated_matched_path(path: &MatchedPath) -> &str {