feat(server): protocol v2 with signed handshake, secure voice relay, media broadcast and channel authorization
Revoke voice access on channel delete, kick and permission change, and acknowledge the sender's own chat messages.
This commit is contained in:
parent
bc5157046e
commit
3e7f5b22dc
44 changed files with 2825 additions and 386 deletions
|
|
@ -23,6 +23,7 @@ pub async fn handle_role_create(
|
|||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
||||
let access = state.access.write().await;
|
||||
if !super::require_perm(
|
||||
state,
|
||||
&req.guild_id,
|
||||
|
|
@ -31,6 +32,7 @@ pub async fn handle_role_create(
|
|||
)
|
||||
.await?
|
||||
{
|
||||
drop(access);
|
||||
send_err(
|
||||
stream,
|
||||
seq,
|
||||
|
|
@ -44,6 +46,22 @@ pub async fn handle_role_create(
|
|||
|
||||
let color = req.color.as_deref().unwrap_or("#ffffff");
|
||||
let permissions = req.permissions.unwrap_or(0);
|
||||
if req.name.trim().is_empty()
|
||||
|| req.name.chars().count() > 64
|
||||
|| req.name.chars().any(char::is_control)
|
||||
|| !may_grant(state, &req.guild_id, &sess.user_id, permissions).await?
|
||||
{
|
||||
drop(access);
|
||||
send_err(
|
||||
stream,
|
||||
seq,
|
||||
crate::proto::ErrorCode::PermissionDenied,
|
||||
"cannot grant requested role",
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
return Ok(());
|
||||
}
|
||||
let role_id = state
|
||||
.storage
|
||||
.create_role(&req.guild_id, &req.name, color, permissions, 1)
|
||||
|
|
@ -60,6 +78,7 @@ pub async fn handle_role_create(
|
|||
None,
|
||||
)
|
||||
.await?;
|
||||
drop(access);
|
||||
io::send_encrypted(
|
||||
stream,
|
||||
PacketId::RoleCreate,
|
||||
|
|
@ -90,6 +109,7 @@ pub async fn handle_role_delete(
|
|||
.await
|
||||
.ok_or_else(|| anyhow::anyhow!("session not found"))?;
|
||||
|
||||
let access = state.access.write().await;
|
||||
if !super::require_perm(
|
||||
state,
|
||||
&req.guild_id,
|
||||
|
|
@ -98,6 +118,7 @@ pub async fn handle_role_delete(
|
|||
)
|
||||
.await?
|
||||
{
|
||||
drop(access);
|
||||
send_err(
|
||||
stream,
|
||||
seq,
|
||||
|
|
@ -109,7 +130,32 @@ pub async fn handle_role_delete(
|
|||
return Ok(());
|
||||
}
|
||||
|
||||
let Some(permissions) = role_permissions(state, &req.guild_id, &req.role_id).await? else {
|
||||
drop(access);
|
||||
send_err(
|
||||
stream,
|
||||
seq,
|
||||
crate::proto::ErrorCode::PermissionDenied,
|
||||
"role is outside this guild",
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
return Ok(());
|
||||
};
|
||||
if !may_grant(state, &req.guild_id, &sess.user_id, permissions).await? {
|
||||
drop(access);
|
||||
send_err(
|
||||
stream,
|
||||
seq,
|
||||
crate::proto::ErrorCode::PermissionDenied,
|
||||
"cannot manage requested role",
|
||||
crypto,
|
||||
)
|
||||
.await?;
|
||||
return Ok(());
|
||||
}
|
||||
state.storage.delete_role(&req.role_id).await?;
|
||||
crate::handler::channel::recheck_voice_permissions(state, &req.guild_id, None).await?;
|
||||
state
|
||||
.storage
|
||||
.append_audit_log(
|
||||
|
|
@ -121,6 +167,7 @@ pub async fn handle_role_delete(
|
|||
None,
|
||||
)
|
||||
.await?;
|
||||
drop(access);
|
||||
io::send_encrypted(
|
||||
stream,
|
||||
PacketId::RoleDelete,
|
||||
|
|
@ -134,3 +181,36 @@ pub async fn handle_role_delete(
|
|||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// A role manager cannot create/assign permissions they do not themselves hold.
|
||||
pub(super) async fn may_grant(
|
||||
state: &State,
|
||||
guild: &str,
|
||||
actor: &str,
|
||||
permissions: u64,
|
||||
) -> Result<bool> {
|
||||
if state
|
||||
.storage
|
||||
.get_guild(guild)
|
||||
.await?
|
||||
.is_some_and(|g| g.owner_id == actor)
|
||||
{
|
||||
return Ok(true);
|
||||
}
|
||||
let held =
|
||||
Permissions::from_role_perms(&state.storage.get_user_role_perms(guild, actor).await?);
|
||||
Ok(held.has(Permissions::ADMINISTRATOR) || permissions & !held.bits() == 0)
|
||||
}
|
||||
pub(super) async fn role_permissions(
|
||||
state: &State,
|
||||
guild: &str,
|
||||
role: &str,
|
||||
) -> Result<Option<u64>> {
|
||||
Ok(state
|
||||
.storage
|
||||
.list_guild_roles(guild)
|
||||
.await?
|
||||
.into_iter()
|
||||
.find(|r| r.id == role)
|
||||
.map(|r| r.permissions as u64))
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue