Bump ruma to 649d683f3f5b8f4f7eb1e728443e4baf25cfebca (stateres refactor #1)

The only change to the internal interface for this one is removing the
current_third_party_invite argument from state_res::auth_check. Ruma now
fetches the event using the fetch_state closure. This is convenient for
us, because we previously didn't bother to implement it.
This commit is contained in:
Olivia Lee 2025-07-13 21:46:25 -07:00 committed by Jonas Platte
parent d283da51c6
commit 98dee6ad49
No known key found for this signature in database
GPG key ID: 7D261D771D915378
5 changed files with 20 additions and 30 deletions

22
Cargo.lock generated
View file

@ -2442,7 +2442,7 @@ dependencies = [
[[package]]
name = "ruma"
version = "0.12.1"
source = "git+https://github.com/ruma/ruma.git?rev=1387667de806c37a6d7f72125117009bd618e32a#1387667de806c37a6d7f72125117009bd618e32a"
source = "git+https://github.com/ruma/ruma.git?rev=649d683f3f5b8f4f7eb1e728443e4baf25cfebca#649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
dependencies = [
"assign",
"js_int",
@ -2461,7 +2461,7 @@ dependencies = [
[[package]]
name = "ruma-appservice-api"
version = "0.12.1"
source = "git+https://github.com/ruma/ruma.git?rev=1387667de806c37a6d7f72125117009bd618e32a#1387667de806c37a6d7f72125117009bd618e32a"
source = "git+https://github.com/ruma/ruma.git?rev=649d683f3f5b8f4f7eb1e728443e4baf25cfebca#649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
dependencies = [
"js_int",
"ruma-common",
@ -2473,7 +2473,7 @@ dependencies = [
[[package]]
name = "ruma-client-api"
version = "0.20.1"
source = "git+https://github.com/ruma/ruma.git?rev=1387667de806c37a6d7f72125117009bd618e32a#1387667de806c37a6d7f72125117009bd618e32a"
source = "git+https://github.com/ruma/ruma.git?rev=649d683f3f5b8f4f7eb1e728443e4baf25cfebca#649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
dependencies = [
"as_variant",
"assign",
@ -2496,7 +2496,7 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.15.1"
source = "git+https://github.com/ruma/ruma.git?rev=1387667de806c37a6d7f72125117009bd618e32a#1387667de806c37a6d7f72125117009bd618e32a"
source = "git+https://github.com/ruma/ruma.git?rev=649d683f3f5b8f4f7eb1e728443e4baf25cfebca#649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
dependencies = [
"as_variant",
"base64",
@ -2527,7 +2527,7 @@ dependencies = [
[[package]]
name = "ruma-events"
version = "0.30.1"
source = "git+https://github.com/ruma/ruma.git?rev=1387667de806c37a6d7f72125117009bd618e32a#1387667de806c37a6d7f72125117009bd618e32a"
source = "git+https://github.com/ruma/ruma.git?rev=649d683f3f5b8f4f7eb1e728443e4baf25cfebca#649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
dependencies = [
"as_variant",
"indexmap 2.10.0",
@ -2550,7 +2550,7 @@ dependencies = [
[[package]]
name = "ruma-federation-api"
version = "0.11.0"
source = "git+https://github.com/ruma/ruma.git?rev=1387667de806c37a6d7f72125117009bd618e32a#1387667de806c37a6d7f72125117009bd618e32a"
source = "git+https://github.com/ruma/ruma.git?rev=649d683f3f5b8f4f7eb1e728443e4baf25cfebca#649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
dependencies = [
"bytes",
"headers",
@ -2572,7 +2572,7 @@ dependencies = [
[[package]]
name = "ruma-identifiers-validation"
version = "0.10.1"
source = "git+https://github.com/ruma/ruma.git?rev=1387667de806c37a6d7f72125117009bd618e32a#1387667de806c37a6d7f72125117009bd618e32a"
source = "git+https://github.com/ruma/ruma.git?rev=649d683f3f5b8f4f7eb1e728443e4baf25cfebca#649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
dependencies = [
"js_int",
"thiserror 2.0.12",
@ -2581,7 +2581,7 @@ dependencies = [
[[package]]
name = "ruma-macros"
version = "0.15.1"
source = "git+https://github.com/ruma/ruma.git?rev=1387667de806c37a6d7f72125117009bd618e32a#1387667de806c37a6d7f72125117009bd618e32a"
source = "git+https://github.com/ruma/ruma.git?rev=649d683f3f5b8f4f7eb1e728443e4baf25cfebca#649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
dependencies = [
"cfg-if",
"proc-macro-crate",
@ -2596,7 +2596,7 @@ dependencies = [
[[package]]
name = "ruma-push-gateway-api"
version = "0.11.0"
source = "git+https://github.com/ruma/ruma.git?rev=1387667de806c37a6d7f72125117009bd618e32a#1387667de806c37a6d7f72125117009bd618e32a"
source = "git+https://github.com/ruma/ruma.git?rev=649d683f3f5b8f4f7eb1e728443e4baf25cfebca#649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
dependencies = [
"js_int",
"ruma-common",
@ -2608,7 +2608,7 @@ dependencies = [
[[package]]
name = "ruma-signatures"
version = "0.17.0"
source = "git+https://github.com/ruma/ruma.git?rev=1387667de806c37a6d7f72125117009bd618e32a#1387667de806c37a6d7f72125117009bd618e32a"
source = "git+https://github.com/ruma/ruma.git?rev=649d683f3f5b8f4f7eb1e728443e4baf25cfebca#649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
dependencies = [
"base64",
"ed25519-dalek",
@ -2624,7 +2624,7 @@ dependencies = [
[[package]]
name = "ruma-state-res"
version = "0.13.0"
source = "git+https://github.com/ruma/ruma.git?rev=1387667de806c37a6d7f72125117009bd618e32a#1387667de806c37a6d7f72125117009bd618e32a"
source = "git+https://github.com/ruma/ruma.git?rev=649d683f3f5b8f4f7eb1e728443e4baf25cfebca#649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
dependencies = [
"js_int",
"ruma-common",

View file

@ -145,7 +145,7 @@ xdg = "2.5.2"
[dependencies.ruma]
git = "https://github.com/ruma/ruma.git"
rev = "1387667de806c37a6d7f72125117009bd618e32a"
rev = "649d683f3f5b8f4f7eb1e728443e4baf25cfebca"
features = [
"compat-server-signing-key-version",
"compat-empty-string-null",

View file

@ -1041,8 +1041,6 @@ async fn join_room_by_id_helper(
Error::UnsupportedRoomVersion(room_version_id.clone())
})?,
&parsed_join_pdu,
// TODO: third party invite
None::<PduEvent>,
|k, s| {
services()
.rooms

View file

@ -507,8 +507,6 @@ impl Service {
if !state_res::event_auth::auth_check(
&ruma_room_version,
&incoming_pdu,
// TODO: third party invite
None::<PduEvent>,
|k, s| auth_events.get(&(k.to_string().into(), s.to_owned())),
)
.map_err(|_e| {
@ -878,8 +876,6 @@ impl Service {
let check_result = state_res::event_auth::auth_check(
&ruma_room_version,
&incoming_pdu,
// TODO: third party invite
None::<PduEvent>,
|k, s| {
services()
.rooms
@ -923,7 +919,6 @@ impl Service {
let soft_fail = !state_res::event_auth::auth_check(
&ruma_room_version,
&incoming_pdu,
None::<PduEvent>,
|k, s| auth_events.get(&(k.clone(), s.to_owned())),
)
.map_err(|_e| {

View file

@ -862,17 +862,14 @@ impl Service {
signatures: None,
};
let auth_check = state_res::auth_check(
&ruma_room_version,
&pdu,
// TODO: third_party_invite
None::<PduEvent>,
|k, s| auth_events.get(&(k.clone(), s.to_owned())),
)
.map_err(|error| {
error!(%error, "Auth check failed");
Error::BadDatabase("Auth check failed.")
})?;
let auth_check =
state_res::auth_check(&ruma_room_version, &pdu, |k, s| {
auth_events.get(&(k.clone(), s.to_owned()))
})
.map_err(|error| {
error!(%error, "Auth check failed");
Error::BadDatabase("Auth check failed.")
})?;
if !auth_check {
return Err(Error::BadRequest(