jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Re-structure Permissions; add perm to view users from mutual groups.

Browse Source
This commit is contained in:
Paul Makles
2021-01-26 21:12:23 +00:00
parent 23ec2d61f1
commit f42480886b
17 changed files with 210 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/channels/delete_channel.rs
View File

@@ -7,7 +7,9 @@ use mongodb::bson::doc;
pub async fn req(user: User, target: Ref) -> Result<()> {
let target = target.fetch_channel().await?;
let perm = permissions::channel::calculate(&user, &target).await;
let perm = permissions::PermissionCalculator::new(&user)
.with_channel(&target)
.for_channel().await?;
if !perm.get_view() {
Err(Error::LabelMe)?
}

4
src/routes/channels/fetch_channel.rs
View File

@@ -7,7 +7,9 @@ use rocket_contrib::json::JsonValue;
pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
let target = target.fetch_channel().await?;
let perm = permissions::channel::calculate(&user, &target).await;
let perm = permissions::PermissionCalculator::new(&user)
.with_channel(&target)
.for_channel().await?;
if !perm.get_view() {
Err(Error::LabelMe)?
}

5
src/routes/channels/group_add_member.rs
View File

@@ -11,8 +11,9 @@ pub async fn req(user: User, target: Ref, member: Ref) -> Result<()> {
}
let channel = target.fetch_channel().await?;
let perm = permissions::channel::calculate(&user, &channel).await;
let perm = permissions::PermissionCalculator::new(&user)
.with_channel(&channel)
.for_channel().await?;
if !perm.get_view() {
Err(Error::LabelMe)?
}

4
src/routes/channels/message_delete.rs
View File

@@ -7,7 +7,9 @@ use mongodb::bson::doc;
pub async fn req(user: User, target: Ref, msg: Ref) -> Result<()> {
let channel = target.fetch_channel().await?;
let perm = permissions::channel::calculate(&user, &channel).await;
let perm = permissions::PermissionCalculator::new(&user)
.with_channel(&channel)
.for_channel().await?;
if !perm.get_view() {
Err(Error::LabelMe)?
}

5
src/routes/channels/message_edit.rs
View File

@@ -19,8 +19,9 @@ pub async fn req(user: User, target: Ref, msg: Ref, edit: Json<Data>) -> Result<
.map_err(|error| Error::FailedValidation { error })?;
let channel = target.fetch_channel().await?;
let perm = permissions::channel::calculate(&user, &channel).await;
let perm = permissions::PermissionCalculator::new(&user)
.with_channel(&channel)
.for_channel().await?;
if !perm.get_view() {
Err(Error::LabelMe)?
}

4
src/routes/channels/message_fetch.rs
View File

@@ -7,7 +7,9 @@ use rocket_contrib::json::JsonValue;
pub async fn req(user: User, target: Ref, msg: Ref) -> Result<JsonValue> {
let channel = target.fetch_channel().await?;
let perm = permissions::channel::calculate(&user, &channel).await;
let perm = permissions::PermissionCalculator::new(&user)
.with_channel(&channel)
.for_channel().await?;
if !perm.get_view() {
Err(Error::LabelMe)?
}

4
src/routes/channels/message_query.rs
View File

@@ -29,7 +29,9 @@ pub async fn req(user: User, target: Ref, options: Form<Options>) -> Result<Json
let target = target.fetch_channel().await?;
let perm = permissions::channel::calculate(&user, &target).await;
let perm = permissions::PermissionCalculator::new(&user)
.with_channel(&target)
.for_channel().await?;
if !perm.get_view() {
Err(Error::LabelMe)?
}

4
src/routes/channels/message_send.rs
View File

@@ -24,7 +24,9 @@ pub async fn req(user: User, target: Ref, message: Json<Data>) -> Result<JsonVal
let target = target.fetch_channel().await?;
let perm = permissions::channel::calculate(&user, &target).await;
let perm = permissions::PermissionCalculator::new(&user)
.with_channel(&target)
.for_channel().await?;
if !perm.get_send_message() {
Err(Error::LabelMe)?
}

4
src/routes/users/fetch_user.rs
View File

@@ -9,7 +9,9 @@ pub async fn req(user: User, target: Ref) -> Result<JsonValue> {
if user.id != target.id {
// Check whether we are allowed to fetch this user.
let perm = permissions::user::calculate(&user, &target.id).await;
let perm = permissions::PermissionCalculator::new(&user)
.with_user(&target)
.for_user_given().await?;
if !perm.get_access() {
Err(Error::LabelMe)?
}