|
|
|
@ -52,7 +52,7 @@ use ruma::{
|
|
|
|
ServerSigningKeyId, UserId,
|
|
|
|
ServerSigningKeyId, UserId,
|
|
|
|
};
|
|
|
|
};
|
|
|
|
use std::{
|
|
|
|
use std::{
|
|
|
|
collections::{btree_map::Entry, BTreeMap, BTreeSet, HashSet},
|
|
|
|
collections::{hash_map::Entry, BTreeMap, HashMap, HashSet},
|
|
|
|
convert::{TryFrom, TryInto},
|
|
|
|
convert::{TryFrom, TryInto},
|
|
|
|
fmt::Debug,
|
|
|
|
fmt::Debug,
|
|
|
|
future::Future,
|
|
|
|
future::Future,
|
|
|
|
@ -931,7 +931,7 @@ pub fn handle_incoming_pdu<'a>(
|
|
|
|
);
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
// Build map of auth events
|
|
|
|
// Build map of auth events
|
|
|
|
let mut auth_events = BTreeMap::new();
|
|
|
|
let mut auth_events = HashMap::new();
|
|
|
|
for id in &incoming_pdu.auth_events {
|
|
|
|
for id in &incoming_pdu.auth_events {
|
|
|
|
let auth_event = db
|
|
|
|
let auth_event = db
|
|
|
|
.rooms
|
|
|
|
.rooms
|
|
|
|
@ -1097,7 +1097,7 @@ pub fn handle_incoming_pdu<'a>(
|
|
|
|
Err(_) => return Err("Failed to fetch state events.".to_owned()),
|
|
|
|
Err(_) => return Err("Failed to fetch state events.".to_owned()),
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
let mut state = BTreeMap::new();
|
|
|
|
let mut state = HashMap::new();
|
|
|
|
for pdu in state_vec {
|
|
|
|
for pdu in state_vec {
|
|
|
|
match state.entry((pdu.kind.clone(), pdu.state_key.clone().ok_or_else(|| "Found non-state pdu in state events.".to_owned())?)) {
|
|
|
|
match state.entry((pdu.kind.clone(), pdu.state_key.clone().ok_or_else(|| "Found non-state pdu in state events.".to_owned())?)) {
|
|
|
|
Entry::Vacant(v) => {
|
|
|
|
Entry::Vacant(v) => {
|
|
|
|
@ -1173,7 +1173,11 @@ pub fn handle_incoming_pdu<'a>(
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
let mut fork_states = BTreeSet::new();
|
|
|
|
// Only keep those extremities we don't have in our timeline yet
|
|
|
|
|
|
|
|
extremities.retain(|id| !matches!(db.rooms.get_non_outlier_pdu_json(id), Ok(Some(_))));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut extremity_statehashes = Vec::new();
|
|
|
|
|
|
|
|
|
|
|
|
for id in &extremities {
|
|
|
|
for id in &extremities {
|
|
|
|
match db
|
|
|
|
match db
|
|
|
|
.rooms
|
|
|
|
.rooms
|
|
|
|
@ -1181,30 +1185,19 @@ pub fn handle_incoming_pdu<'a>(
|
|
|
|
.map_err(|_| "Failed to ask db for pdu.".to_owned())?
|
|
|
|
.map_err(|_| "Failed to ask db for pdu.".to_owned())?
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Some(leaf_pdu) => {
|
|
|
|
Some(leaf_pdu) => {
|
|
|
|
let pdu_shortstatehash = db
|
|
|
|
extremity_statehashes.push((
|
|
|
|
.rooms
|
|
|
|
db.rooms
|
|
|
|
.pdu_shortstatehash(&leaf_pdu.event_id)
|
|
|
|
.pdu_shortstatehash(&leaf_pdu.event_id)
|
|
|
|
.map_err(|_| "Failed to ask db for pdu state hash.".to_owned())?
|
|
|
|
.map_err(|_| "Failed to ask db for pdu state hash.".to_owned())?
|
|
|
|
.ok_or_else(|| {
|
|
|
|
.ok_or_else(|| {
|
|
|
|
error!(
|
|
|
|
error!(
|
|
|
|
"Found extremity pdu with no statehash in db: {:?}",
|
|
|
|
"Found extremity pdu with no statehash in db: {:?}",
|
|
|
|
leaf_pdu
|
|
|
|
leaf_pdu
|
|
|
|
);
|
|
|
|
);
|
|
|
|
"Found pdu with no statehash in db.".to_owned()
|
|
|
|
"Found pdu with no statehash in db.".to_owned()
|
|
|
|
})?;
|
|
|
|
})?,
|
|
|
|
|
|
|
|
Some(leaf_pdu),
|
|
|
|
let mut leaf_state = db
|
|
|
|
));
|
|
|
|
.rooms
|
|
|
|
|
|
|
|
.state_full(pdu_shortstatehash)
|
|
|
|
|
|
|
|
.map_err(|_| "Failed to ask db for room state.".to_owned())?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(state_key) = &leaf_pdu.state_key {
|
|
|
|
|
|
|
|
// Now it's the state after
|
|
|
|
|
|
|
|
let key = (leaf_pdu.kind.clone(), state_key.clone());
|
|
|
|
|
|
|
|
leaf_state.insert(key, leaf_pdu);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fork_states.insert(leaf_state);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
_ => {
|
|
|
|
error!("Missing state snapshot for {:?}", id);
|
|
|
|
error!("Missing state snapshot for {:?}", id);
|
|
|
|
@ -1218,12 +1211,36 @@ pub fn handle_incoming_pdu<'a>(
|
|
|
|
// don't just trust a set of state we got from a remote).
|
|
|
|
// don't just trust a set of state we got from a remote).
|
|
|
|
|
|
|
|
|
|
|
|
// We do this by adding the current state to the list of fork states
|
|
|
|
// We do this by adding the current state to the list of fork states
|
|
|
|
|
|
|
|
let current_statehash = db
|
|
|
|
|
|
|
|
.rooms
|
|
|
|
|
|
|
|
.current_shortstatehash(&room_id)
|
|
|
|
|
|
|
|
.map_err(|_| "Failed to load current state hash.".to_owned())?
|
|
|
|
|
|
|
|
.expect("every room has state");
|
|
|
|
|
|
|
|
|
|
|
|
let current_state = db
|
|
|
|
let current_state = db
|
|
|
|
.rooms
|
|
|
|
.rooms
|
|
|
|
.room_state_full(&room_id)
|
|
|
|
.state_full(current_statehash)
|
|
|
|
.map_err(|_| "Failed to load room state.".to_owned())?;
|
|
|
|
.map_err(|_| "Failed to load room state.")?;
|
|
|
|
|
|
|
|
|
|
|
|
fork_states.insert(current_state.clone());
|
|
|
|
extremity_statehashes.push((current_statehash.clone(), None));
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut fork_states = Vec::new();
|
|
|
|
|
|
|
|
for (statehash, leaf_pdu) in extremity_statehashes {
|
|
|
|
|
|
|
|
let mut leaf_state = db
|
|
|
|
|
|
|
|
.rooms
|
|
|
|
|
|
|
|
.state_full(statehash)
|
|
|
|
|
|
|
|
.map_err(|_| "Failed to ask db for room state.".to_owned())?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(leaf_pdu) = leaf_pdu {
|
|
|
|
|
|
|
|
if let Some(state_key) = &leaf_pdu.state_key {
|
|
|
|
|
|
|
|
// Now it's the state after
|
|
|
|
|
|
|
|
let key = (leaf_pdu.kind.clone(), state_key.clone());
|
|
|
|
|
|
|
|
leaf_state.insert(key, leaf_pdu);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fork_states.push(leaf_state);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// We also add state after incoming event to the fork states
|
|
|
|
// We also add state after incoming event to the fork states
|
|
|
|
extremities.insert(incoming_pdu.event_id.clone());
|
|
|
|
extremities.insert(incoming_pdu.event_id.clone());
|
|
|
|
@ -1234,9 +1251,7 @@ pub fn handle_incoming_pdu<'a>(
|
|
|
|
incoming_pdu.clone(),
|
|
|
|
incoming_pdu.clone(),
|
|
|
|
);
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fork_states.insert(state_after.clone());
|
|
|
|
fork_states.push(state_after.clone());
|
|
|
|
|
|
|
|
|
|
|
|
let fork_states = fork_states.into_iter().collect::<Vec<_>>();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut update_state = false;
|
|
|
|
let mut update_state = false;
|
|
|
|
// 14. Use state resolution to find new room state
|
|
|
|
// 14. Use state resolution to find new room state
|
|
|
|
@ -1254,28 +1269,29 @@ pub fn handle_incoming_pdu<'a>(
|
|
|
|
// We do need to force an update to this room's state
|
|
|
|
// We do need to force an update to this room's state
|
|
|
|
update_state = true;
|
|
|
|
update_state = true;
|
|
|
|
|
|
|
|
|
|
|
|
let mut auth_events = vec![];
|
|
|
|
let fork_states = &fork_states
|
|
|
|
for map in &fork_states {
|
|
|
|
.into_iter()
|
|
|
|
let state_auth = map
|
|
|
|
.map(|map| {
|
|
|
|
.values()
|
|
|
|
map.into_iter()
|
|
|
|
.flat_map(|pdu| pdu.auth_events.clone())
|
|
|
|
.map(|(k, v)| (k, v.event_id.clone()))
|
|
|
|
.collect();
|
|
|
|
.collect::<StateMap<_>>()
|
|
|
|
auth_events.push(state_auth);
|
|
|
|
})
|
|
|
|
|
|
|
|
.collect::<Vec<_>>();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut auth_chain_sets = Vec::new();
|
|
|
|
|
|
|
|
for state in fork_states {
|
|
|
|
|
|
|
|
auth_chain_sets.push(
|
|
|
|
|
|
|
|
get_auth_chain(state.iter().map(|(_, id)| id.clone()).collect(), db)
|
|
|
|
|
|
|
|
.map_err(|_| "Failed to load auth chain.".to_owned())?,
|
|
|
|
|
|
|
|
);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
match state_res::StateResolution::resolve(
|
|
|
|
let state = match state_res::StateResolution::resolve(
|
|
|
|
&room_id,
|
|
|
|
&room_id,
|
|
|
|
room_version_id,
|
|
|
|
room_version_id,
|
|
|
|
&fork_states
|
|
|
|
fork_states,
|
|
|
|
.into_iter()
|
|
|
|
auth_chain_sets,
|
|
|
|
.map(|map| {
|
|
|
|
|id| {
|
|
|
|
map.into_iter()
|
|
|
|
|
|
|
|
.map(|(k, v)| (k, v.event_id.clone()))
|
|
|
|
|
|
|
|
.collect::<StateMap<_>>()
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.collect::<Vec<_>>(),
|
|
|
|
|
|
|
|
auth_events,
|
|
|
|
|
|
|
|
&|id| {
|
|
|
|
|
|
|
|
let res = db.rooms.get_pdu(id);
|
|
|
|
let res = db.rooms.get_pdu(id);
|
|
|
|
if let Err(e) = &res {
|
|
|
|
if let Err(e) = &res {
|
|
|
|
error!("LOOK AT ME Failed to fetch event: {}", e);
|
|
|
|
error!("LOOK AT ME Failed to fetch event: {}", e);
|
|
|
|
@ -1287,7 +1303,8 @@ pub fn handle_incoming_pdu<'a>(
|
|
|
|
Err(_) => {
|
|
|
|
Err(_) => {
|
|
|
|
return Err("State resolution failed, either an event could not be found or deserialization".into());
|
|
|
|
return Err("State resolution failed, either an event could not be found or deserialization".into());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
state
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
// 13. Check if the event passes auth based on the "current state" of the room, if not "soft fail" it
|
|
|
|
// 13. Check if the event passes auth based on the "current state" of the room, if not "soft fail" it
|
|
|
|
@ -1706,6 +1723,45 @@ async fn append_incoming_pdu(
|
|
|
|
Ok(pdu_id)
|
|
|
|
Ok(pdu_id)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn get_auth_chain(starting_events: Vec<EventId>, db: &Database) -> Result<HashSet<EventId>> {
|
|
|
|
|
|
|
|
let mut full_auth_chain = HashSet::new();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let mut cache = db.rooms.auth_chain_cache();
|
|
|
|
|
|
|
|
for event_id in starting_events {
|
|
|
|
|
|
|
|
let auth_chain = if let Some(cached) = cache.get_mut(&event_id) {
|
|
|
|
|
|
|
|
cached.clone()
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
drop(cache);
|
|
|
|
|
|
|
|
let auth_chain = get_auth_chain_recursive(&event_id, db)?;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cache = db.rooms.auth_chain_cache();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
cache.insert(event_id, auth_chain.clone());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
auth_chain
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
full_auth_chain.extend(auth_chain);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(full_auth_chain)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fn get_auth_chain_recursive(event_id: &EventId, db: &Database) -> Result<HashSet<EventId>> {
|
|
|
|
|
|
|
|
let mut auth_chain = HashSet::new();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if let Some(pdu) = db.rooms.get_pdu(&event_id)? {
|
|
|
|
|
|
|
|
auth_chain.extend(pdu.auth_events.iter().cloned());
|
|
|
|
|
|
|
|
for auth_event in &pdu.auth_events {
|
|
|
|
|
|
|
|
auth_chain.extend(get_auth_chain_recursive(&auth_event, db)?);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
warn!("Could not find pdu mentioned in auth events.");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(auth_chain)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[cfg_attr(
|
|
|
|
#[cfg_attr(
|
|
|
|
feature = "conduit_bin",
|
|
|
|
feature = "conduit_bin",
|
|
|
|
get("/_matrix/federation/v1/event/<_>", data = "<body>")
|
|
|
|
get("/_matrix/federation/v1/event/<_>", data = "<body>")
|
|
|
|
@ -1793,35 +1849,20 @@ pub fn get_event_authorization_route(
|
|
|
|
return Err(Error::bad_config("Federation is disabled."));
|
|
|
|
return Err(Error::bad_config("Federation is disabled."));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
let mut auth_chain = Vec::new();
|
|
|
|
let auth_chain_ids = get_auth_chain(vec![body.event_id.clone()], &db)?;
|
|
|
|
let mut auth_chain_ids = BTreeSet::<EventId>::new();
|
|
|
|
|
|
|
|
let mut todo = BTreeSet::new();
|
|
|
|
|
|
|
|
todo.insert(body.event_id.clone());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
while let Some(event_id) = todo.iter().next().cloned() {
|
|
|
|
|
|
|
|
if let Some(pdu) = db.rooms.get_pdu(&event_id)? {
|
|
|
|
|
|
|
|
todo.extend(
|
|
|
|
|
|
|
|
pdu.auth_events
|
|
|
|
|
|
|
|
.clone()
|
|
|
|
|
|
|
|
.into_iter()
|
|
|
|
|
|
|
|
.collect::<BTreeSet<_>>()
|
|
|
|
|
|
|
|
.difference(&auth_chain_ids)
|
|
|
|
|
|
|
|
.cloned(),
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
auth_chain_ids.extend(pdu.auth_events.clone().into_iter());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
let pdu_json = PduEvent::convert_to_outgoing_federation_event(
|
|
|
|
|
|
|
|
db.rooms.get_pdu_json(&event_id)?.unwrap(),
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
auth_chain.push(pdu_json);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
warn!("Could not find pdu mentioned in auth events.");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
todo.remove(&event_id);
|
|
|
|
Ok(get_event_authorization::v1::Response {
|
|
|
|
|
|
|
|
auth_chain: auth_chain_ids
|
|
|
|
|
|
|
|
.into_iter()
|
|
|
|
|
|
|
|
.map(|id| {
|
|
|
|
|
|
|
|
Ok::<_, Error>(PduEvent::convert_to_outgoing_federation_event(
|
|
|
|
|
|
|
|
db.rooms.get_pdu_json(&id)?.unwrap(),
|
|
|
|
|
|
|
|
))
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.filter_map(|r| r.ok())
|
|
|
|
|
|
|
|
.collect(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.into())
|
|
|
|
Ok(get_event_authorization::v1::Response { auth_chain }.into())
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[cfg_attr(
|
|
|
|
#[cfg_attr(
|
|
|
|
@ -1856,35 +1897,21 @@ pub fn get_room_state_route(
|
|
|
|
})
|
|
|
|
})
|
|
|
|
.collect();
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
|
|
|
|
let mut auth_chain = Vec::new();
|
|
|
|
let auth_chain_ids = get_auth_chain(vec![body.event_id.clone()], &db)?;
|
|
|
|
let mut auth_chain_ids = BTreeSet::<EventId>::new();
|
|
|
|
|
|
|
|
let mut todo = BTreeSet::new();
|
|
|
|
|
|
|
|
todo.insert(body.event_id.clone());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
while let Some(event_id) = todo.iter().next().cloned() {
|
|
|
|
Ok(get_room_state::v1::Response {
|
|
|
|
if let Some(pdu) = db.rooms.get_pdu(&event_id)? {
|
|
|
|
auth_chain: auth_chain_ids
|
|
|
|
todo.extend(
|
|
|
|
.into_iter()
|
|
|
|
pdu.auth_events
|
|
|
|
.map(|id| {
|
|
|
|
.clone()
|
|
|
|
Ok::<_, Error>(PduEvent::convert_to_outgoing_federation_event(
|
|
|
|
.into_iter()
|
|
|
|
db.rooms.get_pdu_json(&id)?.unwrap(),
|
|
|
|
.collect::<BTreeSet<_>>()
|
|
|
|
))
|
|
|
|
.difference(&auth_chain_ids)
|
|
|
|
})
|
|
|
|
.cloned(),
|
|
|
|
.filter_map(|r| r.ok())
|
|
|
|
);
|
|
|
|
.collect(),
|
|
|
|
auth_chain_ids.extend(pdu.auth_events.clone().into_iter());
|
|
|
|
pdus,
|
|
|
|
|
|
|
|
|
|
|
|
let pdu_json = PduEvent::convert_to_outgoing_federation_event(
|
|
|
|
|
|
|
|
db.rooms.get_pdu_json(&event_id)?.unwrap(),
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
auth_chain.push(pdu_json);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
warn!("Could not find pdu mentioned in auth events.");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
todo.remove(&event_id);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.into())
|
|
|
|
Ok(get_room_state::v1::Response { auth_chain, pdus }.into())
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
#[cfg_attr(
|
|
|
|
#[cfg_attr(
|
|
|
|
@ -1914,27 +1941,7 @@ pub fn get_room_state_ids_route(
|
|
|
|
.into_iter()
|
|
|
|
.into_iter()
|
|
|
|
.collect();
|
|
|
|
.collect();
|
|
|
|
|
|
|
|
|
|
|
|
let mut auth_chain_ids = BTreeSet::<EventId>::new();
|
|
|
|
let auth_chain_ids = get_auth_chain(vec![body.event_id.clone()], &db)?;
|
|
|
|
let mut todo = BTreeSet::new();
|
|
|
|
|
|
|
|
todo.insert(body.event_id.clone());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
while let Some(event_id) = todo.iter().next().cloned() {
|
|
|
|
|
|
|
|
if let Some(pdu) = db.rooms.get_pdu(&event_id)? {
|
|
|
|
|
|
|
|
todo.extend(
|
|
|
|
|
|
|
|
pdu.auth_events
|
|
|
|
|
|
|
|
.clone()
|
|
|
|
|
|
|
|
.into_iter()
|
|
|
|
|
|
|
|
.collect::<BTreeSet<_>>()
|
|
|
|
|
|
|
|
.difference(&auth_chain_ids)
|
|
|
|
|
|
|
|
.cloned(),
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
auth_chain_ids.extend(pdu.auth_events.clone().into_iter());
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
warn!("Could not find pdu mentioned in auth events.");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
todo.remove(&event_id);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Ok(get_room_state_ids::v1::Response {
|
|
|
|
Ok(get_room_state_ids::v1::Response {
|
|
|
|
auth_chain_ids: auth_chain_ids.into_iter().collect(),
|
|
|
|
auth_chain_ids: auth_chain_ids.into_iter().collect(),
|
|
|
|
@ -2011,6 +2018,7 @@ pub fn create_join_event_template_route(
|
|
|
|
|
|
|
|
|
|
|
|
let content = serde_json::to_value(MemberEventContent {
|
|
|
|
let content = serde_json::to_value(MemberEventContent {
|
|
|
|
avatar_url: None,
|
|
|
|
avatar_url: None,
|
|
|
|
|
|
|
|
blurhash: None,
|
|
|
|
displayname: None,
|
|
|
|
displayname: None,
|
|
|
|
is_direct: None,
|
|
|
|
is_direct: None,
|
|
|
|
membership: MembershipState::Join,
|
|
|
|
membership: MembershipState::Join,
|
|
|
|
@ -2190,27 +2198,7 @@ pub async fn create_join_event_route(
|
|
|
|
drop(mutex_lock);
|
|
|
|
drop(mutex_lock);
|
|
|
|
|
|
|
|
|
|
|
|
let state_ids = db.rooms.state_full_ids(shortstatehash)?;
|
|
|
|
let state_ids = db.rooms.state_full_ids(shortstatehash)?;
|
|
|
|
|
|
|
|
let auth_chain_ids = get_auth_chain(state_ids.iter().cloned().collect(), &db)?;
|
|
|
|
let mut auth_chain_ids = BTreeSet::<EventId>::new();
|
|
|
|
|
|
|
|
let mut todo = state_ids.iter().cloned().collect::<BTreeSet<_>>();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
while let Some(event_id) = todo.iter().next().cloned() {
|
|
|
|
|
|
|
|
if let Some(pdu) = db.rooms.get_pdu(&event_id)? {
|
|
|
|
|
|
|
|
todo.extend(
|
|
|
|
|
|
|
|
pdu.auth_events
|
|
|
|
|
|
|
|
.clone()
|
|
|
|
|
|
|
|
.into_iter()
|
|
|
|
|
|
|
|
.collect::<BTreeSet<_>>()
|
|
|
|
|
|
|
|
.difference(&auth_chain_ids)
|
|
|
|
|
|
|
|
.cloned(),
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
auth_chain_ids.extend(pdu.auth_events.clone().into_iter());
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
warn!("Could not find pdu mentioned in auth events.");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
todo.remove(&event_id);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for server in db
|
|
|
|
for server in db
|
|
|
|
.rooms
|
|
|
|
.rooms
|
|
|
|
@ -2430,19 +2418,25 @@ pub fn get_profile_information_route(
|
|
|
|
|
|
|
|
|
|
|
|
let mut displayname = None;
|
|
|
|
let mut displayname = None;
|
|
|
|
let mut avatar_url = None;
|
|
|
|
let mut avatar_url = None;
|
|
|
|
|
|
|
|
let mut blurhash = None;
|
|
|
|
|
|
|
|
|
|
|
|
match &body.field {
|
|
|
|
match &body.field {
|
|
|
|
// TODO: what to do with custom
|
|
|
|
|
|
|
|
Some(ProfileField::_Custom(_s)) => {}
|
|
|
|
|
|
|
|
Some(ProfileField::DisplayName) => displayname = db.users.displayname(&body.user_id)?,
|
|
|
|
Some(ProfileField::DisplayName) => displayname = db.users.displayname(&body.user_id)?,
|
|
|
|
Some(ProfileField::AvatarUrl) => avatar_url = db.users.avatar_url(&body.user_id)?,
|
|
|
|
Some(ProfileField::AvatarUrl) => {
|
|
|
|
|
|
|
|
avatar_url = db.users.avatar_url(&body.user_id)?;
|
|
|
|
|
|
|
|
blurhash = db.users.blurhash(&body.user_id)?
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
// TODO: what to do with custom
|
|
|
|
|
|
|
|
Some(_) => {}
|
|
|
|
None => {
|
|
|
|
None => {
|
|
|
|
displayname = db.users.displayname(&body.user_id)?;
|
|
|
|
displayname = db.users.displayname(&body.user_id)?;
|
|
|
|
avatar_url = db.users.avatar_url(&body.user_id)?;
|
|
|
|
avatar_url = db.users.avatar_url(&body.user_id)?;
|
|
|
|
|
|
|
|
blurhash = db.users.blurhash(&body.user_id)?;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Ok(get_profile_information::v1::Response {
|
|
|
|
Ok(get_profile_information::v1::Response {
|
|
|
|
|
|
|
|
blurhash,
|
|
|
|
displayname,
|
|
|
|
displayname,
|
|
|
|
avatar_url,
|
|
|
|
avatar_url,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Timo Kösters
3 years ago