forked from jmug/stoatchat
Servers: New permissions implementation.
Feature: Roles and group permissions. (server-side)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
use crate::database::*;
|
||||
use crate::util::result::Result;
|
||||
use crate::util::result::{Error, Result};
|
||||
|
||||
use super::PermissionCalculator;
|
||||
|
||||
@@ -19,6 +19,25 @@ pub enum ChannelPermission {
|
||||
UploadFiles = 0b00000000000000000000000010000000, // 128
|
||||
}
|
||||
|
||||
lazy_static! {
|
||||
pub static ref DEFAULT_PERMISSION_DM: u32 =
|
||||
ChannelPermission::View
|
||||
+ ChannelPermission::SendMessage
|
||||
+ ChannelPermission::ManageChannel
|
||||
+ ChannelPermission::VoiceCall
|
||||
+ ChannelPermission::InviteOthers
|
||||
+ ChannelPermission::EmbedLinks
|
||||
+ ChannelPermission::UploadFiles;
|
||||
|
||||
pub static ref DEFAULT_PERMISSION_SERVER: u32 =
|
||||
ChannelPermission::View
|
||||
+ ChannelPermission::SendMessage
|
||||
+ ChannelPermission::VoiceCall
|
||||
+ ChannelPermission::InviteOthers
|
||||
+ ChannelPermission::EmbedLinks
|
||||
+ ChannelPermission::UploadFiles;
|
||||
}
|
||||
|
||||
impl_op_ex!(+ |a: &ChannelPermission, b: &ChannelPermission| -> u32 { *a as u32 | *b as u32 });
|
||||
impl_op_ex_commutative!(+ |a: &u32, b: &ChannelPermission| -> u32 { *a | *b as u32 });
|
||||
|
||||
@@ -62,11 +81,7 @@ impl<'a> PermissionCalculator<'a> {
|
||||
let perms = self.for_user(recipient).await?;
|
||||
|
||||
if perms.get_send_message() {
|
||||
return Ok(ChannelPermission::View
|
||||
+ ChannelPermission::SendMessage
|
||||
+ ChannelPermission::VoiceCall
|
||||
+ ChannelPermission::EmbedLinks
|
||||
+ ChannelPermission::UploadFiles);
|
||||
return Ok(*DEFAULT_PERMISSION_DM);
|
||||
}
|
||||
|
||||
return Ok(ChannelPermission::View as u32);
|
||||
@@ -75,36 +90,61 @@ impl<'a> PermissionCalculator<'a> {
|
||||
|
||||
Ok(0)
|
||||
}
|
||||
Channel::Group { recipients, .. } => {
|
||||
Channel::Group { recipients, permissions, owner, .. } => {
|
||||
if &self.perspective.id == owner {
|
||||
return Ok(*DEFAULT_PERMISSION_DM)
|
||||
}
|
||||
|
||||
if recipients
|
||||
.iter()
|
||||
.find(|x| *x == &self.perspective.id)
|
||||
.is_some()
|
||||
{
|
||||
Ok(ChannelPermission::View
|
||||
+ ChannelPermission::SendMessage
|
||||
+ ChannelPermission::ManageChannel
|
||||
+ ChannelPermission::VoiceCall
|
||||
+ ChannelPermission::InviteOthers
|
||||
+ ChannelPermission::EmbedLinks
|
||||
+ ChannelPermission::UploadFiles)
|
||||
if let Some(permissions) = permissions {
|
||||
Ok(permissions.clone() as u32)
|
||||
} else {
|
||||
Ok(*DEFAULT_PERMISSION_DM)
|
||||
}
|
||||
} else {
|
||||
Ok(0)
|
||||
}
|
||||
}
|
||||
Channel::TextChannel { server, .. }
|
||||
| Channel::VoiceChannel { server, .. } => {
|
||||
Channel::TextChannel { server, default_permissions, role_permissions, .. }
|
||||
| Channel::VoiceChannel { server, default_permissions, role_permissions, .. } => {
|
||||
let server = Ref::from_unchecked(server.clone()).fetch_server().await?;
|
||||
|
||||
if self.perspective.id == server.owner {
|
||||
Ok(u32::MAX)
|
||||
} else {
|
||||
Ok(ChannelPermission::View
|
||||
+ ChannelPermission::SendMessage
|
||||
+ ChannelPermission::VoiceCall
|
||||
+ ChannelPermission::InviteOthers
|
||||
+ ChannelPermission::EmbedLinks
|
||||
+ ChannelPermission::UploadFiles)
|
||||
match Ref::from_unchecked(self.perspective.id.clone()).fetch_member(&server.id).await {
|
||||
Ok(member) => {
|
||||
let mut perm = if let Some(permission) = default_permissions {
|
||||
*permission as u32
|
||||
} else {
|
||||
server.default_permissions.1 as u32
|
||||
};
|
||||
|
||||
if let Some(roles) = member.roles {
|
||||
for role in roles {
|
||||
if let Some(permission) = role_permissions.get(&role) {
|
||||
perm |= *permission as u32;
|
||||
}
|
||||
|
||||
if let Some(server_role) = server.roles.get(&role) {
|
||||
perm |= server_role.permissions.1 as u32;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(perm)
|
||||
}
|
||||
Err(error) => {
|
||||
match &error {
|
||||
Error::NotFound => Ok(0),
|
||||
_ => Err(error)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ pub struct PermissionCalculator<'a> {
|
||||
relationship: Option<&'a RelationshipStatus>,
|
||||
channel: Option<&'a Channel>,
|
||||
server: Option<&'a Server>,
|
||||
// member: Option<&'a Member>,
|
||||
|
||||
has_mutual_connection: bool,
|
||||
}
|
||||
@@ -26,6 +27,7 @@ impl<'a> PermissionCalculator<'a> {
|
||||
relationship: None,
|
||||
channel: None,
|
||||
server: None,
|
||||
// member: None,
|
||||
|
||||
has_mutual_connection: false,
|
||||
}
|
||||
@@ -59,6 +61,13 @@ impl<'a> PermissionCalculator<'a> {
|
||||
}
|
||||
}
|
||||
|
||||
/* pub fn with_member(self, member: &'a Member) -> PermissionCalculator {
|
||||
PermissionCalculator {
|
||||
member: Some(&member),
|
||||
..self
|
||||
}
|
||||
} */
|
||||
|
||||
pub fn with_mutual_connection(self) -> PermissionCalculator<'a> {
|
||||
PermissionCalculator {
|
||||
has_mutual_connection: true,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
use crate::util::result::Result;
|
||||
use crate::util::result::{Error, Result};
|
||||
|
||||
use super::PermissionCalculator;
|
||||
use super::Ref;
|
||||
|
||||
use num_enum::TryFromPrimitive;
|
||||
use std::ops;
|
||||
@@ -22,6 +23,13 @@ pub enum ServerPermission {
|
||||
// 16 bits of space
|
||||
}
|
||||
|
||||
lazy_static! {
|
||||
pub static ref DEFAULT_PERMISSION: u32 =
|
||||
ServerPermission::View
|
||||
+ ServerPermission::ChangeNickname
|
||||
+ ServerPermission::ChangeAvatar;
|
||||
}
|
||||
|
||||
impl_op_ex!(+ |a: &ServerPermission, b: &ServerPermission| -> u32 { *a as u32 | *b as u32 });
|
||||
impl_op_ex_commutative!(+ |a: &u32, b: &ServerPermission| -> u32 { *a | *b as u32 });
|
||||
|
||||
@@ -52,9 +60,26 @@ impl<'a> PermissionCalculator<'a> {
|
||||
if self.perspective.id == server.owner {
|
||||
Ok(u32::MAX)
|
||||
} else {
|
||||
Ok(ServerPermission::View
|
||||
+ ServerPermission::ChangeNickname
|
||||
+ ServerPermission::ChangeAvatar)
|
||||
match Ref::from_unchecked(self.perspective.id.clone()).fetch_member(&server.id).await {
|
||||
Ok(member) => {
|
||||
let mut perm = server.default_permissions.0 as u32;
|
||||
if let Some(roles) = member.roles {
|
||||
for role in roles {
|
||||
if let Some(server_role) = server.roles.get(&role) {
|
||||
perm |= server_role.permissions.0 as u32;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(perm)
|
||||
}
|
||||
Err(error) => {
|
||||
match &error {
|
||||
Error::NotFound => Ok(0),
|
||||
_ => Err(error)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user