mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2026-11-16 05:36:50 +00:00
refactor: Ruma upstraming, bake a little more
This commit is contained in:
1 parent
204bc1367e
commit
a4e64383b7
115 files changed
+1907
-1504
No files matched your search
@@ -9,10 +9,12 @@ use conduwuit::{
|
||||
use database::{Deserialized, Ignore, Interfix, Map};
|
||||
use futures::{Stream, StreamExt, TryFutureExt};
|
||||
use ruma::{
|
||||
OwnedRoomAliasId, OwnedRoomId, OwnedServerName, OwnedUserId, RoomAliasId, RoomId, RoomOrAliasId, UserId, events::{
|
||||
OwnedRoomAliasId, OwnedRoomId, OwnedServerName, OwnedUserId, RoomAliasId, RoomId,
|
||||
RoomOrAliasId, UserId,
|
||||
events::{
|
||||
StateEventType,
|
||||
room::power_levels::{RoomPowerLevels, RoomPowerLevelsEventContent},
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
use crate::{Dep, admin, appservice, appservice::RegistrationInfo, globals, rooms, sending};
|
||||
|
||||
@@ -109,7 +109,10 @@ where
|
||||
match self
|
||||
.services
|
||||
.sending
|
||||
.send_federation_request(origin, get_event::v1::Request::new((*next_id).to_owned()))
|
||||
.send_federation_request(
|
||||
origin,
|
||||
get_event::v1::Request::new((*next_id).to_owned()),
|
||||
)
|
||||
.await
|
||||
{
|
||||
| Ok(res) => {
|
||||
|
||||
@@ -31,7 +31,10 @@ where
|
||||
let res = self
|
||||
.services
|
||||
.sending
|
||||
.send_federation_request(origin, get_room_state_ids::v1::Request::new(event_id.to_owned(), room_id.to_owned()))
|
||||
.send_federation_request(
|
||||
origin,
|
||||
get_room_state_ids::v1::Request::new(event_id.to_owned(), room_id.to_owned()),
|
||||
)
|
||||
.await
|
||||
.inspect_err(|e| debug_warn!("Fetching state for event failed: {e}"))?;
|
||||
|
||||
|
||||
@@ -182,7 +182,8 @@ pub async fn handle_incoming_pdu<'a>(
|
||||
// copied from https://github.com/element-hq/synapse/blob/7e4588a/synapse/handlers/federation_event.py#L255-L300
|
||||
if value.get("type").and_then(|t| t.as_str()) == Some("m.room.member") {
|
||||
if let Some(pdu) =
|
||||
should_rescind_invite(&self.services, &mut value.clone(), &sender, room_id).await?
|
||||
should_rescind_invite(&self.services, &mut value.clone(), &sender, room_id)
|
||||
.await?
|
||||
{
|
||||
debug_info!(
|
||||
"Invite to {room_id} appears to have been rescinded by {sender}, marking as \
|
||||
|
||||
@@ -42,7 +42,9 @@ where
|
||||
// 2. Check signatures, otherwise drop
|
||||
// 3. check content hash, redact if doesn't match
|
||||
let room_version = get_room_version(create_event)?;
|
||||
let room_rules = room_version.rules().expect("room version should have defined rules");
|
||||
let room_rules = room_version
|
||||
.rules()
|
||||
.expect("room version should have defined rules");
|
||||
let mut incoming_pdu = match self
|
||||
.services
|
||||
.server_keys
|
||||
|
||||
@@ -119,4 +119,4 @@ fn get_room_version<Pdu: Event>(create_event: &Pdu) -> Result<RoomVersionId> {
|
||||
let room_version = content.room_version;
|
||||
|
||||
Ok(room_version)
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,8 @@ use conduwuit::{
|
||||
matrix::event::{gen_event_id, gen_event_id_canonical_json},
|
||||
};
|
||||
use itertools::Itertools;
|
||||
use ruma::{CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId, RoomVersionId};
|
||||
use ruma::{
|
||||
CanonicalJsonObject, CanonicalJsonValue, OwnedEventId, OwnedRoomId, RoomVersionId, };
|
||||
use serde_json::value::RawValue as RawJsonValue;
|
||||
|
||||
type Parsed = (OwnedRoomId, OwnedEventId, CanonicalJsonObject);
|
||||
|
||||
@@ -10,16 +10,17 @@ use conduwuit::{
|
||||
warn,
|
||||
};
|
||||
use ruma::{
|
||||
CanonicalJsonObject, CanonicalJsonValue, KeyId, OwnedKeyId, RoomId, ServerName, SigningKeyId, events::StateEventType
|
||||
CanonicalJsonObject, CanonicalJsonValue, KeyId, OwnedKeyId, RoomId, ServerName, SigningKeyId,
|
||||
events::StateEventType,
|
||||
};
|
||||
use ruminuwuity::policy::{
|
||||
policy_check::unstable::Request as PolicyCheckRequest,
|
||||
event::RoomPolicyEventContent, policy_check::unstable::Request as PolicyCheckRequest,
|
||||
policy_sign::unstable::Request as PolicySignRequest,
|
||||
event::RoomPolicyEventContent
|
||||
};
|
||||
use serde_json::value::RawValue;
|
||||
|
||||
static POLICY_EVENT_TYPE_UNSTABLE: LazyLock<StateEventType> = LazyLock::new(|| StateEventType::from("org.matrix.msc4284.policy"));
|
||||
static POLICY_EVENT_TYPE_UNSTABLE: LazyLock<StateEventType> =
|
||||
LazyLock::new(|| StateEventType::from("org.matrix.msc4284.policy"));
|
||||
|
||||
/// Asks a remote policy server if the event is allowed.
|
||||
///
|
||||
@@ -88,7 +89,12 @@ pub async fn ask_policy_server(
|
||||
return Ok(true);
|
||||
},
|
||||
};
|
||||
if !self.services.state_cache.server_in_room(&via, room_id).await {
|
||||
if !self
|
||||
.services
|
||||
.state_cache
|
||||
.server_in_room(&via, room_id)
|
||||
.await
|
||||
{
|
||||
debug!(
|
||||
via = %via,
|
||||
"Policy server is not in the room, skipping spam check"
|
||||
@@ -132,15 +138,13 @@ pub async fn ask_policy_server(
|
||||
via = %via,
|
||||
"Checking event for spam with policy server via legacy check"
|
||||
);
|
||||
|
||||
|
||||
let mut request = PolicyCheckRequest::new(pdu.event_id().to_owned());
|
||||
request.pdu = Some(outgoing);
|
||||
|
||||
|
||||
let response = tokio::time::timeout(
|
||||
Duration::from_secs(self.services.server.config.policy_server_request_timeout),
|
||||
self.services
|
||||
.sending
|
||||
.send_federation_request(&via, request),
|
||||
self.services.sending.send_federation_request(&via, request),
|
||||
)
|
||||
.await;
|
||||
let response = match response {
|
||||
|
||||
@@ -112,7 +112,13 @@ where
|
||||
{
|
||||
let event_fetch = |event_id| self.event_fetch(event_id);
|
||||
let event_exists = |event_id| self.event_exists(event_id);
|
||||
state_res::resolve(room_version_rules, state_sets, auth_chain_sets, &event_fetch, &event_exists)
|
||||
.map_err(|e| err!(error!("State resolution failed: {e:?}")))
|
||||
.await
|
||||
state_res::resolve(
|
||||
room_version_rules,
|
||||
state_sets,
|
||||
auth_chain_sets,
|
||||
&event_fetch,
|
||||
&event_exists,
|
||||
)
|
||||
.map_err(|e| err!(error!("State resolution failed: {e:?}")))
|
||||
.await
|
||||
}
|
||||
@@ -53,7 +53,9 @@ where
|
||||
);
|
||||
let timer = Instant::now();
|
||||
let room_version_id = get_room_version(create_event)?;
|
||||
let room_version_rules = room_version_id.rules().expect("room version should have defined rules");
|
||||
let room_version_rules = room_version_id
|
||||
.rules()
|
||||
.expect("room version should have defined rules");
|
||||
|
||||
// 10. Fetch missing state and auth chain events by calling /state_ids at
|
||||
// backwards extremities doing all the checks in this list starting at 1.
|
||||
|
||||
@@ -7,7 +7,9 @@ use conduwuit::{
|
||||
use database::{Deserialized, Json, Map};
|
||||
use futures::{Stream, StreamExt};
|
||||
use ruma::{
|
||||
CanonicalJsonObject, OwnedRoomId, OwnedUserId, RoomId, UserId, events::{AnySyncEphemeralRoomEvent, receipt::ReceiptEvent}, serde::Raw
|
||||
CanonicalJsonObject, OwnedRoomId, OwnedUserId, RoomId, UserId,
|
||||
events::{AnySyncEphemeralRoomEvent, receipt::ReceiptEvent},
|
||||
serde::Raw,
|
||||
};
|
||||
|
||||
use crate::{Dep, globals};
|
||||
|
||||
@@ -17,16 +17,17 @@ use conduwuit_core::{
|
||||
use futures::{FutureExt, Stream, StreamExt, TryFutureExt, pin_mut, stream::FuturesUnordered};
|
||||
use lru_cache::LruCache;
|
||||
use ruma::{
|
||||
OwnedEventId, OwnedRoomId, OwnedServerName, RoomId, ServerName, UserId, api::{
|
||||
OwnedEventId, OwnedRoomId, OwnedServerName, RoomId, ServerName, UserId,
|
||||
api::{
|
||||
client::space::SpaceHierarchyRoomsChunk,
|
||||
federation::{
|
||||
self,
|
||||
space::SpaceHierarchyParentSummary,
|
||||
},
|
||||
}, events::{
|
||||
federation::{self, space::SpaceHierarchyParentSummary},
|
||||
},
|
||||
events::{
|
||||
StateEventType,
|
||||
space::child::{HierarchySpaceChildEvent, SpaceChildEventContent},
|
||||
}, room::{JoinRuleSummary, RoomSummary}, serde::Raw,
|
||||
},
|
||||
room::{JoinRuleSummary, RoomSummary},
|
||||
serde::Raw,
|
||||
};
|
||||
use tokio::sync::{Mutex, MutexGuard};
|
||||
|
||||
@@ -299,11 +300,7 @@ async fn get_room_summary(
|
||||
let join_rule = self.services.state_accessor.get_join_rules(room_id).await;
|
||||
|
||||
let is_accessible_child = self
|
||||
.is_accessible_child(
|
||||
room_id,
|
||||
&join_rule.clone().into(),
|
||||
identifier,
|
||||
)
|
||||
.is_accessible_child(room_id, &join_rule.clone().into(), identifier)
|
||||
.await;
|
||||
|
||||
if !is_accessible_child {
|
||||
@@ -375,7 +372,7 @@ async fn get_room_summary(
|
||||
join_rule.clone().into(),
|
||||
guest_can_join,
|
||||
num_joined_members.try_into().unwrap_or_default(),
|
||||
world_readable
|
||||
world_readable,
|
||||
);
|
||||
summary.canonical_alias = canonical_alias;
|
||||
summary.name = name;
|
||||
@@ -426,13 +423,17 @@ async fn is_accessible_child(
|
||||
| JoinRuleSummary::Public
|
||||
| JoinRuleSummary::Knock
|
||||
| JoinRuleSummary::KnockRestricted(_) => true,
|
||||
| JoinRuleSummary::Restricted(restricted_summary) => {
|
||||
(&restricted_summary.allowed_room_ids).stream().any(async |room| match identifier {
|
||||
| Identifier::UserId(user) => self.services.state_cache.is_joined(user, room).await,
|
||||
| Identifier::ServerName(server) => self.services.state_cache.server_in_room(server, room).await,
|
||||
}).await
|
||||
},
|
||||
_ => false
|
||||
| JoinRuleSummary::Restricted(restricted_summary) =>
|
||||
(&restricted_summary.allowed_room_ids)
|
||||
.stream()
|
||||
.any(async |room| match identifier {
|
||||
| Identifier::UserId(user) =>
|
||||
self.services.state_cache.is_joined(user, room).await,
|
||||
| Identifier::ServerName(server) =>
|
||||
self.services.state_cache.server_in_room(server, room).await,
|
||||
})
|
||||
.await,
|
||||
| _ => false,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -463,10 +464,10 @@ async fn cache_insert(
|
||||
summary: RoomSummary,
|
||||
) {
|
||||
let children_state = self
|
||||
.get_space_child_events(&summary.room_id)
|
||||
.map(Event::into_format)
|
||||
.collect()
|
||||
.await;
|
||||
.get_space_child_events(&summary.room_id)
|
||||
.map(Event::into_format)
|
||||
.collect()
|
||||
.await;
|
||||
let summary = SpaceHierarchyParentSummary::new(summary, children_state);
|
||||
|
||||
cache.insert(current_room.to_owned(), Some(CachedSpaceHierarchySummary { summary }));
|
||||
|
||||
@@ -4,7 +4,7 @@ use std::{
|
||||
};
|
||||
|
||||
use conduwuit::{Error, Result};
|
||||
use ruma::{UInt, api::client::error::ErrorKind};
|
||||
use ruma::{UInt, api::error::ErrorKind};
|
||||
|
||||
use crate::rooms::short::ShortRoomId;
|
||||
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
use std::str::FromStr;
|
||||
|
||||
use ruma::{
|
||||
UInt, api::federation::space::SpaceHierarchyParentSummary, owned_room_id, owned_server_name, room::{JoinRuleSummary, RoomSummary},
|
||||
UInt,
|
||||
api::federation::space::SpaceHierarchyParentSummary,
|
||||
owned_room_id, owned_server_name,
|
||||
room::{JoinRuleSummary, RoomSummary},
|
||||
};
|
||||
|
||||
use crate::rooms::spaces::{PaginationToken, get_parent_children_via};
|
||||
@@ -9,7 +12,13 @@ use crate::rooms::spaces::{PaginationToken, get_parent_children_via};
|
||||
#[test]
|
||||
fn get_summary_children() {
|
||||
let summary = SpaceHierarchyParentSummary::new(
|
||||
RoomSummary::new(owned_room_id!("!root:example.org"), JoinRuleSummary::Public, true, UInt::from(1_u32), true),
|
||||
RoomSummary::new(
|
||||
owned_room_id!("!root:example.org"),
|
||||
JoinRuleSummary::Public,
|
||||
true,
|
||||
UInt::from(1_u32),
|
||||
true,
|
||||
),
|
||||
vec![
|
||||
serde_json::from_str(
|
||||
r#"{
|
||||
@@ -55,7 +64,7 @@ fn get_summary_children() {
|
||||
}"#,
|
||||
)
|
||||
.unwrap(),
|
||||
]
|
||||
],
|
||||
);
|
||||
|
||||
assert_eq!(
|
||||
|
||||
@@ -17,10 +17,13 @@ use futures::{
|
||||
FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt, future::join_all, pin_mut,
|
||||
};
|
||||
use ruma::{
|
||||
EventId, OwnedEventId, OwnedRoomId, RoomId, RoomVersionId, UserId, events::{
|
||||
EventId, OwnedEventId, OwnedRoomId, RoomId, RoomVersionId, UserId,
|
||||
events::{
|
||||
AnyStrippedStateEvent, StateEventType, TimelineEventType,
|
||||
room::create::RoomCreateEventContent,
|
||||
}, room_version_rules::RoomVersionRules, serde::Raw
|
||||
},
|
||||
room_version_rules::RoomVersionRules,
|
||||
serde::Raw,
|
||||
};
|
||||
|
||||
use crate::{
|
||||
@@ -107,7 +110,7 @@ impl Service {
|
||||
.then(|shorteventid| {
|
||||
self.services
|
||||
.short
|
||||
.get_eventid_from_short::<Box<_>>(shorteventid)
|
||||
.get_eventid_from_short::<OwnedEventId>(shorteventid)
|
||||
})
|
||||
.ignore_err();
|
||||
|
||||
@@ -426,8 +429,13 @@ impl Service {
|
||||
return Ok(HashMap::new());
|
||||
};
|
||||
|
||||
let auth_types =
|
||||
state_res::auth_types_for_event(kind, sender, state_key, content, room_version_rules)?;
|
||||
let auth_types = state_res::auth_types_for_event(
|
||||
kind,
|
||||
sender,
|
||||
state_key,
|
||||
content,
|
||||
room_version_rules,
|
||||
)?;
|
||||
debug!(?auth_types, "Auth types for event");
|
||||
let sauthevents: HashMap<_, _> = auth_types
|
||||
.iter()
|
||||
|
||||
@@ -9,12 +9,25 @@ use async_trait::async_trait;
|
||||
use conduwuit::{Event, Result, err};
|
||||
use database::Map;
|
||||
use ruma::{
|
||||
EventEncryptionAlgorithm, JsOption, OwnedRoomAliasId, OwnedUserId, RoomId, UserId, events::{
|
||||
EventEncryptionAlgorithm, JsOption, OwnedRoomAliasId, OwnedUserId, RoomId, UserId,
|
||||
events::{
|
||||
StateEventType,
|
||||
room::{
|
||||
avatar::RoomAvatarEventContent, canonical_alias::RoomCanonicalAliasEventContent, create::{RoomCreateEvent, RoomCreateEventContent}, encryption::RoomEncryptionEventContent, guest_access::{GuestAccess, RoomGuestAccessEventContent}, history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent}, join_rules::{JoinRule, RoomJoinRulesEventContent}, member::RoomMemberEventContent, name::RoomNameEventContent, pinned_events::RoomPinnedEventsEventContent, power_levels::{RoomPowerLevels, RoomPowerLevelsEventContent}, topic::RoomTopicEventContent
|
||||
avatar::RoomAvatarEventContent,
|
||||
canonical_alias::RoomCanonicalAliasEventContent,
|
||||
create::{RoomCreateEvent, RoomCreateEventContent},
|
||||
encryption::RoomEncryptionEventContent,
|
||||
guest_access::{GuestAccess, RoomGuestAccessEventContent},
|
||||
history_visibility::{HistoryVisibility, RoomHistoryVisibilityEventContent},
|
||||
join_rules::{JoinRule, RoomJoinRulesEventContent},
|
||||
member::RoomMemberEventContent,
|
||||
name::RoomNameEventContent,
|
||||
pinned_events::RoomPinnedEventsEventContent,
|
||||
power_levels::{RoomPowerLevels, RoomPowerLevelsEventContent},
|
||||
topic::RoomTopicEventContent,
|
||||
},
|
||||
}, room::RoomType
|
||||
},
|
||||
room::RoomType,
|
||||
};
|
||||
|
||||
use crate::{Dep, rooms};
|
||||
@@ -152,12 +165,25 @@ impl Service {
|
||||
.is_ok()
|
||||
}
|
||||
|
||||
/// Get a set of the room's creators. This will always contain a single user for room versions 11 and earlier.
|
||||
/// Get a set of the room's creators. This will always contain a single user
|
||||
/// for room versions 11 and earlier.
|
||||
pub async fn get_room_creators(&self, room_id: &RoomId) -> HashSet<OwnedUserId> {
|
||||
let room_version_rules = self.services.state.get_room_version(room_id).await.expect("room should have a version").rules().expect("room version should be known");
|
||||
let room_version_rules = self
|
||||
.services
|
||||
.state
|
||||
.get_room_version(room_id)
|
||||
.await
|
||||
.expect("room should have a version")
|
||||
.rules()
|
||||
.expect("room version should be known");
|
||||
|
||||
let create_event = self.room_state_get(room_id, &StateEventType::RoomCreate, "").await.expect("room should have a create event");
|
||||
let create_content: RoomCreateEventContent = create_event.get_content().expect("create event content should be valid");
|
||||
let create_event = self
|
||||
.room_state_get(room_id, &StateEventType::RoomCreate, "")
|
||||
.await
|
||||
.expect("room should have a create event");
|
||||
let create_content: RoomCreateEventContent = create_event
|
||||
.get_content()
|
||||
.expect("create event content should be valid");
|
||||
|
||||
let mut creators = HashSet::new();
|
||||
if room_version_rules.authorization.use_room_create_sender {
|
||||
@@ -174,15 +200,30 @@ impl Service {
|
||||
creators
|
||||
}
|
||||
|
||||
/// Get the room's power levels. This will never fail -- if the room has no power level state event,
|
||||
/// the default power levels for the room's version will be returned.
|
||||
/// Get the room's power levels. This will never fail -- if the room has no
|
||||
/// power level state event, the default power levels for the room's
|
||||
/// version will be returned.
|
||||
pub async fn get_room_power_levels(&self, room_id: &RoomId) -> RoomPowerLevels {
|
||||
let room_version_rules = self.services.state.get_room_version(room_id).await.expect("room should have a version").rules().expect("room version should be known");
|
||||
let creators = self.get_room_creators(room_id).await;
|
||||
let power_levels_event: RoomPowerLevelsEventContent = self.room_state_get_content(room_id, &StateEventType::RoomPowerLevels, "")
|
||||
let room_version_rules = self
|
||||
.services
|
||||
.state
|
||||
.get_room_version(room_id)
|
||||
.await
|
||||
.unwrap_or_else(|_| RoomPowerLevelsEventContent::new(&room_version_rules.authorization));
|
||||
.expect("room should have a version")
|
||||
.rules()
|
||||
.expect("room version should be known");
|
||||
let creators = self.get_room_creators(room_id).await;
|
||||
let power_levels_event: RoomPowerLevelsEventContent = self
|
||||
.room_state_get_content(room_id, &StateEventType::RoomPowerLevels, "")
|
||||
.await
|
||||
.unwrap_or_else(|_| {
|
||||
RoomPowerLevelsEventContent::new(&room_version_rules.authorization)
|
||||
});
|
||||
|
||||
RoomPowerLevels::new(power_levels_event.into(), &room_version_rules.authorization, creators)
|
||||
RoomPowerLevels::new(
|
||||
power_levels_event.into(),
|
||||
&room_version_rules.authorization,
|
||||
creators,
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -44,17 +44,13 @@ pub async fn server_can_see_event(
|
||||
| HistoryVisibility::Invited => {
|
||||
// Allow if any member on requesting server was AT LEAST invited, else deny
|
||||
current_server_members
|
||||
.any(async |member| {
|
||||
self.user_was_invited(shortstatehash, &member).await
|
||||
})
|
||||
.any(async |member| self.user_was_invited(shortstatehash, &member).await)
|
||||
.await
|
||||
},
|
||||
| HistoryVisibility::Joined => {
|
||||
// Allow if any member on requested server was joined, else deny
|
||||
current_server_members
|
||||
.any(async |member| {
|
||||
self.user_was_joined(shortstatehash, &member).await
|
||||
})
|
||||
.any(async |member| self.user_was_joined(shortstatehash, &member).await)
|
||||
.await
|
||||
},
|
||||
| HistoryVisibility::WorldReadable | HistoryVisibility::Shared | _ => true,
|
||||
|
||||
@@ -316,7 +316,9 @@ pub fn state_full(
|
||||
shortstatehash: ShortStateHash,
|
||||
) -> impl Stream<Item = ((StateEventType, StateKey), impl Event)> + Send + '_ {
|
||||
self.state_full_pdus(shortstatehash)
|
||||
.ready_filter_map(|pdu| Some(((pdu.kind().to_string().into(), pdu.state_key()?.into()), pdu)))
|
||||
.ready_filter_map(|pdu| {
|
||||
Some(((pdu.kind().to_string().into(), pdu.state_key()?.into()), pdu))
|
||||
})
|
||||
}
|
||||
|
||||
#[implement(super::Service)]
|
||||
|
||||
@@ -44,13 +44,22 @@ pub async fn user_can_redact(
|
||||
)));
|
||||
}
|
||||
|
||||
let create_event = self.room_state_get(room_id, &StateEventType::RoomCreate, "").await?;
|
||||
let create_event = self
|
||||
.room_state_get(room_id, &StateEventType::RoomCreate, "")
|
||||
.await?;
|
||||
let create_event_content: RoomCreateEventContent = create_event.get_content().unwrap();
|
||||
let room_version_rules = create_event_content.room_version.rules().expect("room version should have defined rules");
|
||||
if room_version_rules.authorization.explicitly_privilege_room_creators {
|
||||
let room_version_rules = create_event_content
|
||||
.room_version
|
||||
.rules()
|
||||
.expect("room version should have defined rules");
|
||||
if room_version_rules
|
||||
.authorization
|
||||
.explicitly_privilege_room_creators
|
||||
{
|
||||
let sender_owned = sender.to_owned();
|
||||
// NOTE: we don't check the pre-v11 `creator` field because no room version has
|
||||
// `explicitly_privilege_room_creators` and `use_room_create_sender` set at the same time
|
||||
// `explicitly_privilege_room_creators` and `use_room_create_sender` set at the
|
||||
// same time
|
||||
if sender == create_event.sender()
|
||||
|| create_event_content
|
||||
.additional_creators
|
||||
@@ -60,7 +69,6 @@ pub async fn user_can_redact(
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
let power_levels = self.get_room_power_levels(room_id).await;
|
||||
|
||||
if power_levels.user_can_redact_event_of_other(sender) {
|
||||
@@ -69,14 +77,13 @@ pub async fn user_can_redact(
|
||||
|
||||
if power_levels.user_can_redact_own_event(sender) {
|
||||
let is_own_event = match redacting_event {
|
||||
Ok(redacting_event) => {
|
||||
| Ok(redacting_event) =>
|
||||
if federation {
|
||||
redacting_event.sender().server_name() == sender.server_name()
|
||||
} else {
|
||||
redacting_event.sender() == sender
|
||||
}
|
||||
},
|
||||
_ => false
|
||||
},
|
||||
| _ => false,
|
||||
};
|
||||
|
||||
return Ok(is_own_event);
|
||||
|
||||
@@ -12,7 +12,9 @@ use conduwuit::{
|
||||
use database::{Deserialized, Ignore, Interfix, Map};
|
||||
use futures::{Stream, StreamExt, future::join5, pin_mut};
|
||||
use ruma::{
|
||||
OwnedRoomId, OwnedServerName, OwnedUserId, RoomId, ServerName, UserId, events::{AnyStrippedStateEvent, room::member::MembershipState}, serde::Raw
|
||||
OwnedRoomId, OwnedServerName, OwnedUserId, RoomId, ServerName, UserId,
|
||||
events::{AnyStrippedStateEvent, room::member::MembershipState},
|
||||
serde::Raw,
|
||||
};
|
||||
|
||||
use crate::{Dep, account_data, appservice::RegistrationInfo, config, globals, rooms, users};
|
||||
@@ -415,7 +417,9 @@ pub async fn invite_state(
|
||||
.qry(&key)
|
||||
.await
|
||||
.deserialized()
|
||||
.and_then(|val: Raw<Vec<AnyStrippedStateEvent>>| val.deserialize_as_unchecked().map_err(Into::into))
|
||||
.and_then(|val: Raw<Vec<AnyStrippedStateEvent>>| {
|
||||
val.deserialize_as_unchecked().map_err(Into::into)
|
||||
})
|
||||
}
|
||||
|
||||
#[implement(Service)]
|
||||
@@ -431,7 +435,9 @@ pub async fn knock_state(
|
||||
.qry(&key)
|
||||
.await
|
||||
.deserialized()
|
||||
.and_then(|val: Raw<Vec<AnyStrippedStateEvent>>| val.deserialize_as_unchecked().map_err(Into::into))
|
||||
.and_then(|val: Raw<Vec<AnyStrippedStateEvent>>| {
|
||||
val.deserialize_as_unchecked().map_err(Into::into)
|
||||
})
|
||||
}
|
||||
|
||||
#[implement(Service)]
|
||||
|
||||
@@ -11,7 +11,9 @@ use conduwuit_core::{
|
||||
use conduwuit_database::{Deserialized, Map};
|
||||
use futures::{Stream, StreamExt};
|
||||
use ruma::{
|
||||
CanonicalJsonValue, EventId, OwnedUserId, RoomId, UserId, api::client::threads::get_threads::v1::IncludeThreads, events::relation::BundledThread, serde::Raw, uint
|
||||
CanonicalJsonValue, EventId, OwnedUserId, RoomId, UserId,
|
||||
api::client::threads::get_threads::v1::IncludeThreads, events::relation::BundledThread,
|
||||
serde::Raw, uint,
|
||||
};
|
||||
use serde_json::json;
|
||||
|
||||
@@ -100,7 +102,11 @@ impl Service {
|
||||
);
|
||||
} else {
|
||||
// New thread
|
||||
let relations = BundledThread::new(Raw::from_json(event.content().to_owned()), uint!(1), true);
|
||||
let relations = BundledThread::new(
|
||||
Raw::from_json(event.content().to_owned()),
|
||||
uint!(1),
|
||||
true,
|
||||
);
|
||||
|
||||
let content = serde_json::to_value(relations).expect("to_value always works");
|
||||
|
||||
|
||||
@@ -18,10 +18,7 @@ use ruma::{
|
||||
events::{
|
||||
GlobalAccountDataEventType, TimelineEventType,
|
||||
push_rules::PushRulesEvent,
|
||||
room::{
|
||||
encrypted::Relation,
|
||||
redaction::RoomRedactionEventContent,
|
||||
},
|
||||
room::{encrypted::Relation, redaction::RoomRedactionEventContent},
|
||||
},
|
||||
push::{Action, Ruleset, Tweak},
|
||||
};
|
||||
@@ -204,7 +201,11 @@ where
|
||||
drop(insert_lock);
|
||||
|
||||
// See if the event matches any known pushers via power level
|
||||
let power_levels = self.services.state_accessor.get_room_power_levels(room_id).await;
|
||||
let power_levels = self
|
||||
.services
|
||||
.state_accessor
|
||||
.get_room_power_levels(room_id)
|
||||
.await;
|
||||
let mut push_target: HashSet<_> = self
|
||||
.services
|
||||
.state_cache
|
||||
@@ -251,7 +252,7 @@ where
|
||||
{
|
||||
match action {
|
||||
| Action::Notify => notify = true,
|
||||
| Action::SetTweak(Tweak::Highlight(true)) => {
|
||||
| Action::SetTweak(Tweak::Highlight(ruma::push::HighlightTweakValue::Yes)) => {
|
||||
highlight = true;
|
||||
},
|
||||
| _ => {},
|
||||
@@ -366,10 +367,12 @@ where
|
||||
|
||||
if let Ok(content) = pdu.get_content::<ExtractRelatesTo>() {
|
||||
match content.relates_to {
|
||||
| Relation::Reply { in_reply_to } => {
|
||||
| Relation::Reply(in_reply_to) => {
|
||||
// We need to do it again here, because replies don't have
|
||||
// event_id as a top level field
|
||||
if let Ok(related_pducount) = self.get_pdu_count(&in_reply_to.event_id).await {
|
||||
if let Ok(related_pducount) =
|
||||
self.get_pdu_count(&in_reply_to.in_reply_to.event_id).await
|
||||
{
|
||||
self.services
|
||||
.pdu_metadata
|
||||
.add_relation(count2, related_pducount);
|
||||
|
||||
@@ -12,10 +12,16 @@ use conduwuit_core::{
|
||||
};
|
||||
use futures::{FutureExt, Stream, StreamExt};
|
||||
use ruma::{
|
||||
CanonicalJsonObject, EventId, Int, OwnedServerName, RoomId, ServerName, api::federation, events::{
|
||||
CanonicalJsonObject, EventId, Int, OwnedServerName, RoomId, ServerName,
|
||||
api::federation,
|
||||
events::{
|
||||
StateEventType, TimelineEventType,
|
||||
room::{create::RoomCreateEventContent, power_levels::{RoomPowerLevelsEventContent, UserPowerLevel}},
|
||||
}, uint
|
||||
room::{
|
||||
create::RoomCreateEventContent,
|
||||
power_levels::{RoomPowerLevelsEventContent, UserPowerLevel},
|
||||
},
|
||||
},
|
||||
uint,
|
||||
};
|
||||
use serde_json::value::RawValue as RawJsonValue;
|
||||
|
||||
@@ -66,7 +72,11 @@ pub async fn backfill_if_required(&self, room_id: &RoomId, from: PduCount) -> Re
|
||||
.sending
|
||||
.send_federation_request(
|
||||
&backfill_server,
|
||||
federation::backfill::get_backfill::v1::Request::new(room_id.to_owned(), vec![first_pdu.1.event_id().to_owned()], uint!(100))
|
||||
federation::backfill::get_backfill::v1::Request::new(
|
||||
room_id.to_owned(),
|
||||
vec![first_pdu.1.event_id().to_owned()],
|
||||
uint!(100),
|
||||
),
|
||||
)
|
||||
.await;
|
||||
match response {
|
||||
@@ -125,7 +135,10 @@ pub async fn get_remote_pdu(&self, room_id: &RoomId, event_id: &EventId) -> Resu
|
||||
let value = self
|
||||
.services
|
||||
.sending
|
||||
.send_federation_request(&backfill_server, federation::event::get_event::v1::Request::new(event_id.to_owned()))
|
||||
.send_federation_request(
|
||||
&backfill_server,
|
||||
federation::event::get_event::v1::Request::new(event_id.to_owned()),
|
||||
)
|
||||
.await
|
||||
.and_then(|response| {
|
||||
serde_json::from_str::<CanonicalJsonObject>(response.pdu.get()).map_err(|e| {
|
||||
@@ -220,7 +233,11 @@ pub async fn backfill_pdu(&self, origin: &ServerName, pdu: Box<RawJsonValue>) ->
|
||||
async fn candidate_backfill_servers(&self, room_id: &RoomId) -> HashSet<OwnedServerName> {
|
||||
let mut candidate_backfill_servers = HashSet::new();
|
||||
|
||||
let power_levels = self.services.state_accessor.get_room_power_levels(room_id).await;
|
||||
let power_levels = self
|
||||
.services
|
||||
.state_accessor
|
||||
.get_room_power_levels(room_id)
|
||||
.await;
|
||||
|
||||
// Insert servers of room creators
|
||||
if let Some(creators) = &power_levels.rules.privileged_creators {
|
||||
@@ -237,19 +254,30 @@ async fn candidate_backfill_servers(&self, room_id: &RoomId) -> HashSet<OwnedSer
|
||||
}
|
||||
|
||||
// Insert the canonical room alias server
|
||||
if let Ok(canonical_alias) = self.services.state_accessor.get_canonical_alias(room_id).await {
|
||||
if let Ok(canonical_alias) = self
|
||||
.services
|
||||
.state_accessor
|
||||
.get_canonical_alias(room_id)
|
||||
.await
|
||||
{
|
||||
candidate_backfill_servers.insert(canonical_alias.server_name().to_owned());
|
||||
}
|
||||
|
||||
// Insert all trusted servers in the config
|
||||
candidate_backfill_servers.extend(self.services.server.config.trusted_servers.iter().cloned());
|
||||
candidate_backfill_servers
|
||||
.extend(self.services.server.config.trusted_servers.iter().cloned());
|
||||
|
||||
// Remove our own name, we can't request backfill from ourselves
|
||||
candidate_backfill_servers.remove(self.services.globals.server_name());
|
||||
|
||||
// Remove all servers that aren't in the room
|
||||
for server in candidate_backfill_servers.clone() {
|
||||
if !self.services.state_cache.server_in_room(&server, room_id).await {
|
||||
if !self
|
||||
.services
|
||||
.state_cache
|
||||
.server_in_room(&server, room_id)
|
||||
.await
|
||||
{
|
||||
candidate_backfill_servers.remove(&server);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -140,7 +140,7 @@ pub async fn build_and_append_pdu(
|
||||
body,
|
||||
Some(pdu.event_id().into()),
|
||||
source,
|
||||
pdu.sender.clone().into(),
|
||||
pdu.sender.clone(),
|
||||
)?;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,7 +96,7 @@ pub async fn create_event(
|
||||
event_type,
|
||||
room_id.as_ref().map_or("None", |id| id.as_str())
|
||||
);
|
||||
let room_version_id = match room_id {
|
||||
let room_version = match room_id {
|
||||
| Some(room_id) => {
|
||||
trace!(%room_id, "Looking up existing room ID");
|
||||
self.services
|
||||
@@ -114,7 +114,7 @@ pub async fn create_event(
|
||||
| None => {
|
||||
trace!("No room ID, assuming room creation");
|
||||
room_version_from_event(
|
||||
RoomId::new(self.services.globals.server_name()),
|
||||
RoomId::new_v1(self.services.globals.server_name()),
|
||||
&event_type.clone(),
|
||||
&content.clone(),
|
||||
)?
|
||||
@@ -261,7 +261,7 @@ pub async fn create_event(
|
||||
pdu.event_id,
|
||||
pdu.room_id.as_ref().map_or("None", |id| id.as_str())
|
||||
);
|
||||
Ok((pdu, room_version_id))
|
||||
Ok((pdu, room_version))
|
||||
}
|
||||
|
||||
#[implement(super::Service)]
|
||||
@@ -276,7 +276,7 @@ pub async fn create_hash_and_sign_event(
|
||||
if !self.services.globals.user_is_local(sender) {
|
||||
return Err!(Request(Forbidden("Sender must be a local user")));
|
||||
}
|
||||
let (mut pdu, room_version_id) = self
|
||||
let (mut pdu, room_version) = self
|
||||
.create_event(pdu_builder, sender, room_id, mutex_lock)
|
||||
.await?;
|
||||
// Hash and sign
|
||||
@@ -292,7 +292,7 @@ pub async fn create_hash_and_sign_event(
|
||||
.hash_and_sign_event(&mut pdu_json, &room_version)
|
||||
{
|
||||
return match e {
|
||||
| Error::Signatures(ruma::signatures::Error::PduSize) => {
|
||||
| Error::SignatureJson(ruma::signatures::JsonError::PduTooLarge) => {
|
||||
Err!(Request(TooLarge("Message/PDU is too long (exceeds 65535 bytes)")))
|
||||
},
|
||||
| _ => Err!(Request(Unknown(warn!("Signing event failed: {e}")))),
|
||||
|
||||
Reference in new issue
Block a user