git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-06-26 19:06:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP: add event fetchers to auth_check calls
Some checks failed
Documentation / Build and Deploy Documentation (push) Failing after 2s
Details
Release Docker Image / define-variables (push) Failing after 1s
Details
Release Docker Image / build-image (linux/amd64, linux-amd64) (push) Has been skipped
Details
Release Docker Image / build-image (linux/arm64, linux-arm64) (push) Has been skipped
Details
Release Docker Image / merge (push) Has been skipped
Details
Rust Checks / Format (push) Failing after 2s
Details
Rust Checks / Clippy (push) Failing after 11s
Details
Rust Checks / Cargo Test (push) Failing after 10s
Details

Browse source
This commit is contained in:
nexy7574 2025-06-14 00:43:39 +01:00
parent f183f99b07
commit aa25e2c897
No known key found for this signature in database
GPG key ID: 0FA334385D0B689F
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core/matrix/state_res/event_auth.rs
View file

@ -261,11 +261,7 @@ where
if room_version.create_id_as_room_id { if room_version.create_id_as_room_id {
// TODO: fetch the create event from the room ID // TODO: fetch the create event from the room ID
let create_event_id = &EventId::parse(incoming_event.room_id().localpart()); let create_event_id = &EventId::parse(incoming_event.room_id().localpart());
// if let Err(e) = create_event_id {
// error!(?e, "invalid room ID for create event");
// return Ok(false);
// }
// room_create_event = fetch_event(create_event_id).await;
match create_event_id { match create_event_id {
| Ok(id) => { | Ok(id) => {
room_create_event = fetch_event(id).await; room_create_event = fetch_event(id).await;

16
src/core/matrix/state_res/mod.rs
View file

@ -562,6 +562,7 @@ where
event.sender(), event.sender(),
Some(state_key), Some(state_key),
event.content(), event.content(),
room_version,
)?; )?;
let mut auth_state = StateMap::new(); let mut auth_state = StateMap::new();
@ -609,9 +610,20 @@ where
let fetch_state = |ty: &StateEventType, key: &str| { let fetch_state = |ty: &StateEventType, key: &str| {
future::ready(auth_state.get(&ty.with_state_key(key))) future::ready(auth_state.get(&ty.with_state_key(key)))
}; };
let fetch_event2 = |id: &EventId| {
let id = id.to_owned();
let evt = auth_events.get(&id);
future::ready(evt) // TODO: FIXME!
};
let auth_result = let auth_result = auth_check(
auth_check(room_version, &event, current_third_party.as_ref(), fetch_state).await; room_version,
&event,
current_third_party.as_ref(),
fetch_state,
fetch_event2,
)
.await;
match auth_result { match auth_result {
| Ok(true) => { | Ok(true) => {