oss/conduit
oss/conduit
1
0
Fork 0
mirror of https://gitlab.com/famedly/conduit.git synced 2025-06-27 16:35:59 +00:00
Code Wiki Activity

chore(ruma): upgrade

Browse source
This commit is contained in:
Matthias Ahouansou 2025-03-08 11:35:21 +00:00
parent 4dc15a4605
commit b726ccaab8
No known key found for this signature in database
3 changed files with 30 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Cargo.lock generated
View file

@ -2190,7 +2190,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma" name = "ruma"
version = "0.12.1" version = "0.12.1"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" source = "git+https://github.com/ruma/ruma.git#7c03b554c0d3e8b0a27fc0fadba36a4d636935d3"
dependencies = [ dependencies = [
"assign", "assign",
"js_int", "js_int",
@ -2201,7 +2201,6 @@ dependencies = [
"ruma-events", "ruma-events",
"ruma-federation-api", "ruma-federation-api",
"ruma-push-gateway-api", "ruma-push-gateway-api",
"ruma-server-util",
"ruma-signatures", "ruma-signatures",
"ruma-state-res", "ruma-state-res",
"web-time", "web-time",
@ -2210,7 +2209,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-appservice-api" name = "ruma-appservice-api"
version = "0.12.1" version = "0.12.1"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" source = "git+https://github.com/ruma/ruma.git#7c03b554c0d3e8b0a27fc0fadba36a4d636935d3"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2222,7 +2221,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.20.1" version = "0.20.1"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" source = "git+https://github.com/ruma/ruma.git#7c03b554c0d3e8b0a27fc0fadba36a4d636935d3"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"assign", "assign",
@ -2245,7 +2244,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-common" name = "ruma-common"
version = "0.15.1" version = "0.15.1"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" source = "git+https://github.com/ruma/ruma.git#7c03b554c0d3e8b0a27fc0fadba36a4d636935d3"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"base64 0.22.1", "base64 0.22.1",
@ -2276,7 +2275,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-events" name = "ruma-events"
version = "0.30.1" version = "0.30.1"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" source = "git+https://github.com/ruma/ruma.git#7c03b554c0d3e8b0a27fc0fadba36a4d636935d3"
dependencies = [ dependencies = [
"as_variant", "as_variant",
"indexmap 2.2.6", "indexmap 2.2.6",
@ -2299,10 +2298,12 @@ dependencies = [
[[package]] [[package]]
name = "ruma-federation-api" name = "ruma-federation-api"
version = "0.11.0" version = "0.11.0"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" source = "git+https://github.com/ruma/ruma.git#7c03b554c0d3e8b0a27fc0fadba36a4d636935d3"
dependencies = [ dependencies = [
"bytes", "bytes",
"headers",
"http 1.1.0", "http 1.1.0",
"http-auth",
"httparse", "httparse",
"js_int", "js_int",
"memchr", "memchr",
@ -2312,12 +2313,14 @@ dependencies = [
"ruma-events", "ruma-events",
"serde", "serde",
"serde_json", "serde_json",
"thiserror 2.0.11",
"tracing",
] ]
[[package]] [[package]]
name = "ruma-identifiers-validation" name = "ruma-identifiers-validation"
version = "0.10.1" version = "0.10.1"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" source = "git+https://github.com/ruma/ruma.git#7c03b554c0d3e8b0a27fc0fadba36a4d636935d3"
dependencies = [ dependencies = [
"js_int", "js_int",
"thiserror 2.0.11", "thiserror 2.0.11",
@ -2326,7 +2329,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-macros" name = "ruma-macros"
version = "0.15.1" version = "0.15.1"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" source = "git+https://github.com/ruma/ruma.git#7c03b554c0d3e8b0a27fc0fadba36a4d636935d3"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"proc-macro-crate", "proc-macro-crate",
@ -2341,7 +2344,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-push-gateway-api" name = "ruma-push-gateway-api"
version = "0.11.0" version = "0.11.0"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" source = "git+https://github.com/ruma/ruma.git#7c03b554c0d3e8b0a27fc0fadba36a4d636935d3"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",
@ -2350,23 +2353,10 @@ dependencies = [
"serde_json", "serde_json",
] ]
[[package]]
name = "ruma-server-util"
version = "0.5.0"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f"
dependencies = [
"headers",
"http 1.1.0",
"http-auth",
"ruma-common",
"thiserror 2.0.11",
"tracing",
]
[[package]] [[package]]
name = "ruma-signatures" name = "ruma-signatures"
version = "0.17.0" version = "0.17.0"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" source = "git+https://github.com/ruma/ruma.git#7c03b554c0d3e8b0a27fc0fadba36a4d636935d3"
dependencies = [ dependencies = [
"base64 0.22.1", "base64 0.22.1",
"ed25519-dalek", "ed25519-dalek",
@ -2382,7 +2372,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-state-res" name = "ruma-state-res"
version = "0.13.0" version = "0.13.0"
source = "git+https://github.com/ruma/ruma.git#9e6099161d4ed295e694fa0d5de2b28a23840a4f" source = "git+https://github.com/ruma/ruma.git#7c03b554c0d3e8b0a27fc0fadba36a4d636935d3"
dependencies = [ dependencies = [
"js_int", "js_int",
"ruma-common", "ruma-common",

1
Cargo.toml
View file

@ -160,7 +160,6 @@ features = [
"push-gateway-api-c", "push-gateway-api-c",
"rand", "rand",
"ring-compat", "ring-compat",
"server-util",
"state-res", "state-res",
"unstable-msc2448", "unstable-msc2448",
"unstable-msc3575", "unstable-msc3575",

22
src/api/ruma_wrapper/axum.rs
View file

@ -15,8 +15,10 @@ use axum_extra::{
use bytes::{BufMut, BytesMut}; use bytes::{BufMut, BytesMut};
use http::{Request, StatusCode}; use http::{Request, StatusCode};
use ruma::{ use ruma::{
api::{client::error::ErrorKind, AuthScheme, IncomingRequest, OutgoingResponse}, api::{
server_util::authorization::XMatrix, client::error::ErrorKind, federation::authentication::XMatrix, AuthScheme, IncomingRequest,
OutgoingResponse,
},
CanonicalJsonValue, MilliSecondsSinceUnixEpoch, OwnedDeviceId, OwnedUserId, UserId, CanonicalJsonValue, MilliSecondsSinceUnixEpoch, OwnedDeviceId, OwnedUserId, UserId,
}; };
use serde::Deserialize; use serde::Deserialize;
@ -110,7 +112,10 @@ where
)); ));
} }
} }
(AuthScheme::AccessToken, Token::Appservice(info)) => { (
AuthScheme::AccessToken | AuthScheme::AppserviceToken,
Token::Appservice(info),
) => {
let user_id = query_params let user_id = query_params
.user_id .user_id
.map_or_else( .map_or_else(
@ -144,11 +149,11 @@ where
} }
( (
AuthScheme::None AuthScheme::None
| AuthScheme::AppserviceToken | AuthScheme::AppserviceTokenOptional
| AuthScheme::AccessTokenOptional, | AuthScheme::AccessTokenOptional,
Token::Appservice(info), Token::Appservice(info),
) => (None, None, None, Some(*info)), ) => (None, None, None, Some(*info)),
(AuthScheme::AccessToken, Token::None) => { (AuthScheme::AppserviceToken | AuthScheme::AccessToken, Token::None) => {
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::MissingToken, ErrorKind::MissingToken,
"Missing access token.", "Missing access token.",
@ -287,7 +292,7 @@ where
} }
( (
AuthScheme::None AuthScheme::None
| AuthScheme::AppserviceToken | AuthScheme::AppserviceTokenOptional
| AuthScheme::AccessTokenOptional, | AuthScheme::AccessTokenOptional,
Token::None, Token::None,
) => (None, None, None, None), ) => (None, None, None, None),
@ -297,7 +302,10 @@ where
"Only server signatures should be used on this endpoint.", "Only server signatures should be used on this endpoint.",
)); ));
} }
(AuthScheme::AppserviceToken, Token::User(_)) => { (
AuthScheme::AppserviceToken | AuthScheme::AppserviceTokenOptional,
Token::User(_),
) => {
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::Unauthorized, ErrorKind::Unauthorized,
"Only appservice access tokens should be used on this endpoint.", "Only appservice access tokens should be used on this endpoint.",