feat(perms): consistently throw correct permissions

This commit is contained in:
Paul Makles
2022-02-22 21:41:12 +00:00
parent 7befd77c5b
commit 4c40c6c2cc
33 changed files with 134 additions and 264 deletions

View File

@@ -32,14 +32,11 @@ pub async fn invite_bot(
match dest.into_inner() {
Destination::Server { server } => {
let server = db.fetch_server(&server).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_manage_server()
{
return Error::from_permission(Permission::ManageServer);
}
.throw_permission(db, Permission::ManageServer)
.await?;
let member = Member {
id: MemberCompositeKey {
@@ -53,14 +50,11 @@ pub async fn invite_bot(
}
Destination::Group { group } => {
let channel = db.fetch_channel(&group).await?;
if !perms(&user)
perms(&user)
.channel(&channel)
.calc(db)
.await
.can_invite_others()
{
return Error::from_permission(Permission::InviteOthers);
}
.throw_permission_and_view_channel(db, Permission::InviteOthers)
.await?;
if let Channel::Group { id, .. } = channel {
db.add_user_to_group(&id, &bot.id)

View File

@@ -1,16 +1,12 @@
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Ref, Result};
use revolt_quark::{models::User, perms, Db, EmptyResponse, Permission, Ref, Result};
#[put("/<target>/ack/<message>")]
pub async fn req(db: &Db, user: User, target: Ref, message: Ref) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?;
if !perms(&user)
perms(&user)
.channel(&channel)
.calc(db)
.await
.can_view_channel()
{
return Err(Error::NotFound);
}
.throw_permission(db, Permission::ViewChannel)
.await?;
channel
.ack(db, &user.id, &message.id)

View File

@@ -6,11 +6,8 @@ use revolt_quark::{
#[delete("/<target>")]
pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?;
let perm = perms(&user).channel(&channel).calc(db).await;
if !perm.can_view_channel() {
return Err(Error::NotFound);
}
let mut perms = perms(&user).channel(&channel);
perms.throw_permission(db, Permission::ViewChannel).await?;
match &channel {
Channel::SavedMessages { .. } => Err(Error::NoEffect),
@@ -30,11 +27,11 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
.await
.map(|_| EmptyResponse),
Channel::TextChannel { .. } | Channel::VoiceChannel { .. } => {
if perm.can_manage_channel() {
perms
.throw_permission(db, Permission::ManageChannel)
.await?;
channel.delete(db).await.map(|_| EmptyResponse)
} else {
Error::from_permission(Permission::ManageChannel)
}
}
}
}

View File

@@ -38,14 +38,10 @@ pub async fn req(
.map_err(|error| Error::FailedValidation { error })?;
let mut channel = target.as_channel(db).await?;
if !perms(&user)
perms(&user)
.channel(&channel)
.calc(db)
.await
.can_manage_channel()
{
return Error::from_permission(Permission::ManageChannel);
}
.throw_permission_and_view_channel(db, Permission::ManageChannel)
.await?;
if data.name.is_none()
&& data.description.is_none()

View File

@@ -1,22 +1,17 @@
use revolt_quark::{
models::{Channel, User},
perms, Database, Error, Permission, Ref, Result,
perms, Database, Permission, Ref, Result,
};
use rocket::{serde::json::Json, State};
#[get("/<target>")]
pub async fn req(db: &State<Database>, user: User, target: Ref) -> Result<Json<Channel>> {
let target = target.as_channel(db).await?;
let channel = target.as_channel(db).await?;
perms(&user)
.channel(&channel)
.throw_permission(db, Permission::ViewChannel)
.await?;
if perms(&user)
.channel(&target)
.calc(db)
.await
.can_view_channel()
{
Ok(Json(target))
} else {
Error::from_permission(Permission::ViewChannel)
}
Ok(Json(channel))
}

View File

@@ -6,14 +6,10 @@ use revolt_quark::{
#[put("/<target>/recipients/<member>")]
pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
let channel = target.as_channel(db).await?;
if !perms(&user)
perms(&user)
.channel(&channel)
.calc(db)
.await
.can_invite_others()
{
return Error::from_permission(Permission::InviteOthers);
}
.throw_permission_and_view_channel(db, Permission::InviteOthers)
.await?;
match &channel {
Channel::Group { .. } => {

View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{Invite, User},
perms, Db, Error, Permission, Ref, Result,
perms, Db, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -8,15 +8,10 @@ use rocket::serde::json::Json;
#[post("/<target>/invites")]
pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Invite>> {
let channel = target.as_channel(db).await?;
if !perms(&user)
perms(&user)
.channel(&channel)
.calc(db)
.await
.can_invite_others()
{
return Error::from_permission(Permission::InviteOthers);
}
.throw_permission_and_view_channel(db, Permission::InviteOthers)
.await?;
Invite::create(db, &user, &channel).await.map(Json)
}

View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{Channel, User},
perms, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -8,14 +8,10 @@ use rocket::serde::json::Json;
#[get("/<target>/members")]
pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Vec<User>>> {
let channel = target.as_channel(db).await?;
if !perms(&user)
perms(&user)
.channel(&channel)
.calc(db)
.await
.can_view_channel()
{
return Err(Error::NotFound);
}
.throw_permission(db, Permission::ViewChannel)
.await?;
if let Channel::Group { recipients, .. } = channel {
Ok(Json(

View File

@@ -11,9 +11,8 @@ pub async fn req(db: &Db, user: User, target: Ref, msg: Ref) -> Result<EmptyResp
|| !{
perms(&user)
.channel(&target.as_channel(db).await?)
.calc(db)
.await
.can_manage_messages()
.has_permission(db, Permission::ManageMessages)
.await?
}
{
return Error::from_permission(Permission::ManageMessages);

View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{Message, User},
perms, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -8,14 +8,10 @@ use rocket::serde::json::Json;
#[get("/<target>/messages/<msg>")]
pub async fn req(db: &Db, user: User, target: Ref, msg: Ref) -> Result<Json<Message>> {
let channel = target.as_channel(db).await?;
if !perms(&user)
perms(&user)
.channel(&channel)
.calc(db)
.await
.can_view_channel()
{
return Err(Error::NotFound);
}
.throw_permission(db, Permission::ViewChannel)
.await?;
let message = msg.as_message(db).await?;
if message.channel != channel.as_id() {

View File

@@ -3,7 +3,7 @@ use revolt_quark::{
message::{BulkMessageResponse, MessageSort},
User,
},
perms, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::Json;
use serde::{Deserialize, Serialize};
@@ -42,14 +42,10 @@ pub async fn req(
}
let channel = target.as_channel(db).await?;
if !perms(&user)
perms(&user)
.channel(&channel)
.calc(db)
.await
.can_view_channel()
{
return Err(Error::NotFound);
}
.throw_permission_and_view_channel(db, Permission::ReadMessageHistory)
.await?;
let Options {
limit,

View File

@@ -3,7 +3,7 @@ use revolt_quark::{
message::{BulkMessageResponse, MessageSort},
User,
},
perms, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -39,14 +39,10 @@ pub async fn req(
.map_err(|error| Error::FailedValidation { error })?;
let channel = target.as_channel(db).await?;
if !perms(&user)
perms(&user)
.channel(&channel)
.calc(db)
.await
.can_view_channel()
{
return Err(Error::NotFound);
}
.throw_permission_and_view_channel(db, Permission::ReadMessageHistory)
.await?;
let Options {
query,

View File

@@ -51,11 +51,10 @@ pub async fn message_send(
idempotency.consume_nonce(data.nonce).await?;
let channel = target.as_channel(db).await?;
let permissions = perms(&user).channel(&channel).calc(db).await;
if !permissions.can_send_message() {
return Error::from_permission(Permission::SendMessage);
}
let mut permissions = perms(&user).channel(&channel);
permissions
.throw_permission_and_view_channel(db, Permission::SendMessage)
.await?;
if data.content.is_empty()
&& (data.attachments.is_none() || data.attachments.as_ref().unwrap().is_empty())
@@ -66,8 +65,8 @@ pub async fn message_send(
let message_id = Ulid::new().to_string();
let mut message = Message {
id: message_id.clone(),
channel: channel.as_id(),
author: user.id,
channel: channel.id().to_string(),
author: user.id.clone(),
..Default::default()
};
@@ -80,8 +79,10 @@ pub async fn message_send(
}
// 2. Verify permissions for masquerade.
if data.masquerade.is_some() && !permissions.can_masquerade() {
return Error::from_permission(Permission::Masquerade);
if data.masquerade.is_some() {
permissions
.throw_permission(db, Permission::Masquerade)
.await?;
}
// 3. Verify replies are valid.
@@ -117,8 +118,10 @@ pub async fn message_send(
// 4. Add attachments to message.
let mut attachments = vec![];
if let Some(ids) = &data.attachments {
if !ids.is_empty() && !permissions.can_upload_files() {
return Error::from_permission(Permission::UploadFiles);
if !ids.is_empty() {
permissions
.throw_permission(db, Permission::UploadFiles)
.await?;
}
// ! FIXME: move this to app config

View File

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
use revolt_quark::{
models::{Channel, User},
perms, Db, Error, Permission, Ref, Result,
perms, Db, Permission, Ref, Result,
};
#[derive(Serialize, Deserialize)]
@@ -20,14 +20,10 @@ pub async fn req(
data: Json<Data>,
) -> Result<Json<Channel>> {
let mut channel = target.as_channel(db).await?;
if !perms(&user)
perms(&user)
.channel(&channel)
.calc(db)
.await
.can_manage_permissions()
{
return Error::from_permission(Permission::ManageChannel);
}
.throw_permission_and_view_channel(db, Permission::ManagePermissions)
.await?;
// ! FIXME_PERMISSIONS

View File

@@ -14,14 +14,10 @@ pub struct Data {
#[put("/<target>/permissions/default", data = "<data>", rank = 1)]
pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<Json<Channel>> {
let mut channel = target.as_channel(db).await?;
if !perms(&user)
perms(&user)
.channel(&channel)
.calc(db)
.await
.can_manage_permissions()
{
return Error::from_permission(Permission::ManagePermissions);
}
.throw_permission_and_view_channel(db, Permission::ManagePermissions)
.await?;
match &channel {
Channel::Group { .. } => {

View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{Invite, User},
perms, Db, EmptyResponse, Error, Permission, Ref, Result,
perms, Db, EmptyResponse, Permission, Ref, Result,
};
#[delete("/<target>")]
@@ -13,14 +13,10 @@ pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
match invite {
Invite::Server { code, server, .. } => {
let server = db.fetch_server(&server).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_manage_server()
{
return Error::from_permission(Permission::ManageServer);
}
.throw_permission(db, Permission::ManageServer)
.await?;
db.delete_invite(&code).await
}

View File

@@ -26,14 +26,10 @@ pub async fn req(
.map_err(|error| Error::FailedValidation { error })?;
let server = server.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_ban_members()
{
return Error::from_permission(Permission::BanMembers);
}
.throw_permission(db, Permission::BanMembers)
.await?;
let member = target.as_member(db, &server.id).await?;
// ! FIXME_PERMISSIONS

View File

@@ -1,5 +1,5 @@
use revolt_quark::models::{File, ServerBan, User};
use revolt_quark::{perms, Db, Error, Permission, Ref, Result};
use revolt_quark::{perms, Db, Permission, Ref, Result};
use rocket::serde::json::Json;
use serde::{Deserialize, Serialize};
@@ -14,14 +14,10 @@ struct BannedUser {
#[get("/<target>/bans")]
pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Vec<ServerBan>>> {
let server = target.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_ban_members()
{
return Error::from_permission(Permission::BanMembers);
}
.throw_permission(db, Permission::BanMembers)
.await?;
db.fetch_bans(&server.id).await.map(Json)
}

View File

@@ -1,16 +1,12 @@
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
use revolt_quark::{models::User, perms, Db, EmptyResponse, Permission, Ref, Result};
#[delete("/<server>/bans/<target>")]
pub async fn req(db: &Db, user: User, server: Ref, target: Ref) -> Result<EmptyResponse> {
let server = server.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_ban_members()
{
return Error::from_permission(Permission::BanMembers);
}
.throw_permission(db, Permission::BanMembers)
.await?;
let ban = target.as_ban(db, &server.id).await?;
db.delete_ban(&ban.id).await.map(|_| EmptyResponse)

View File

@@ -41,14 +41,10 @@ pub async fn req(db: &Db, user: User, target: Ref, info: Json<Data>) -> Result<J
.map_err(|error| Error::FailedValidation { error })?;
let mut server = target.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_manage_channel()
{
return Error::from_permission(Permission::ManageChannel);
}
.throw_permission(db, Permission::ManageChannel)
.await?;
let id = Ulid::new().to_string();
let mut channels = server.channels.clone();

View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{Invite, User},
perms, Db, Error, Permission, Ref, Result,
perms, Db, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -17,14 +17,10 @@ pub struct ServerInvite {
#[get("/<target>/invites")]
pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Vec<Invite>>> {
let server = target.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_manage_server()
{
return Error::from_permission(Permission::ManageServer);
}
.throw_permission(db, Permission::ManageServer)
.await?;
db.fetch_invites_for_server(&server.id).await.map(Json)
}

View File

@@ -33,10 +33,7 @@ pub async fn req(
.map_err(|error| Error::FailedValidation { error })?;
let server = server.as_server(db).await?;
let permissions = perms(&user).server(&server).calc(db).await;
if !permissions.can_view_channel() {
return Err(Error::NotFound);
}
perms(&user).server(&server).calc(db).await?;
let mut member = target.as_member(db, &server.id).await?;

View File

@@ -1,20 +1,13 @@
use revolt_quark::{
models::{Member, User},
perms, Db, Error, Ref, Result,
perms, Db, Ref, Result,
};
use rocket::serde::json::Json;
#[get("/<target>/members/<member>")]
pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<Json<Member>> {
let server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc(db)
.await
.can_view_channel()
{
return Err(Error::NotFound);
}
perms(&user).server(&server).calc(db).await?;
member.as_member(db, &server.id).await.map(Json)
}

View File

@@ -1,18 +1,11 @@
use revolt_quark::{models::User, perms, presence::presence_filter_online, Db, Error, Ref, Result};
use revolt_quark::{models::User, perms, presence::presence_filter_online, Db, Ref, Result};
use rocket::serde::json::Value;
#[get("/<target>/members")]
pub async fn req(db: &Db, user: User, target: Ref) -> Result<Value> {
let server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc(db)
.await
.can_view_channel()
{
return Err(Error::NotFound);
}
perms(&user).server(&server).calc(db).await?;
let members = db.fetch_all_members(&server.id).await?;

View File

@@ -1,16 +1,12 @@
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
use revolt_quark::{models::User, perms, Db, EmptyResponse, Permission, Ref, Result};
#[delete("/<target>/members/<member>")]
pub async fn req(db: &Db, user: User, target: Ref, member: Ref) -> Result<EmptyResponse> {
let server = target.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_kick_members()
{
return Error::from_permission(Permission::KickMembers);
}
.throw_permission(db, Permission::KickMembers)
.await?;
let member = member.as_member(db, &server.id).await?;
// ! FIXME_PERMISSIONS

View File

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
use revolt_quark::{
models::{Server, User},
perms, Db, Error, Ref, Result,
perms, Db, Permission, Ref, Result,
};
#[derive(Serialize, Deserialize)]
@@ -26,16 +26,12 @@ pub async fn req(
data: Json<Data>,
) -> Result<Json<Server>> {
let mut server = target.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_manage_permissions()
{
return Err(Error::NotFound);
}
.throw_permission(db, Permission::ManagePermissions)
.await?;
// ! FIXME: calculate permission against role
// ! FIXME_PERMISSIONS
server
.set_role_permission(

View File

@@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize};
use revolt_quark::{
models::{server::PartialServer, Server, User},
perms, Db, Error, Ref, Result,
perms, Db, Permission, Ref, Result,
};
#[derive(Serialize, Deserialize)]
@@ -22,14 +22,12 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
let data = data.into_inner();
let mut server = target.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_manage_permissions()
{
return Err(Error::NotFound);
}
.throw_permission(db, Permission::ManagePermissions)
.await?;
// ! FIXME_PERMISSIONS
server
.update(

View File

@@ -1,6 +1,6 @@
use revolt_quark::{
models::{server::Role, User},
perms, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::{Json, Value};
@@ -20,14 +20,10 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<V
.map_err(|error| Error::FailedValidation { error })?;
let server = target.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_manage_roles()
{
return Err(Error::NotFound);
}
.throw_permission(db, Permission::ManageRole)
.await?;
let role = Role {
name: data.name,

View File

@@ -1,16 +1,12 @@
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Ref, Result};
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Permission, Ref, Result};
#[delete("/<target>/roles/<role_id>")]
pub async fn req(db: &Db, user: User, target: Ref, role_id: String) -> Result<EmptyResponse> {
let mut server = target.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_manage_roles()
{
return Err(Error::NotFound);
}
.throw_permission(db, Permission::ManageRole)
.await?;
// ! FIXME_PERMISSIONS

View File

@@ -3,7 +3,7 @@ use revolt_quark::{
server::{FieldsRole, PartialRole, Role},
User,
},
perms, Db, Error, Ref, Result,
perms, Db, Error, Permission, Ref, Result,
};
use rocket::serde::json::Json;
@@ -35,14 +35,10 @@ pub async fn req(
.map_err(|error| Error::FailedValidation { error })?;
let mut server = target.as_server(db).await?;
if !perms(&user)
perms(&user)
.server(&server)
.calc(db)
.await
.can_manage_roles()
{
return Err(Error::NotFound);
}
.throw_permission(db, Permission::ManageRole)
.await?;
if let Some(mut role) = server.roles.remove(&role_id) {
let Data {

View File

@@ -1,16 +1,9 @@
use revolt_quark::{models::User, perms, Db, EmptyResponse, Error, Ref, Result};
use revolt_quark::{models::User, perms, Db, EmptyResponse, Ref, Result};
#[put("/<target>/ack")]
pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {
let server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc(db)
.await
.can_view_channel()
{
return Err(Error::NotFound);
}
perms(&user).server(&server).calc(db).await?;
db.acknowledge_channels(&user.id, &server.channels)
.await

View File

@@ -38,7 +38,7 @@ pub async fn req(db: &Db, user: User, target: Ref, data: Json<Data>) -> Result<J
.map_err(|error| Error::FailedValidation { error })?;
let mut server = target.as_server(db).await?;
let permissions = perms(&user).server(&server).calc(db).await;
let permissions = perms(&user).server(&server).calc(db).await?;
if !permissions.can_view_channel() {
return Err(Error::NotFound);
}

View File

@@ -1,20 +1,13 @@
use revolt_quark::{
models::{Server, User},
perms, Db, Error, Ref, Result,
perms, Db, Ref, Result,
};
use rocket::serde::json::Json;
#[get("/<target>")]
pub async fn req(db: &Db, user: User, target: Ref) -> Result<Json<Server>> {
let server = target.as_server(db).await?;
if !perms(&user)
.server(&server)
.calc(db)
.await
.can_view_channel()
{
return Err(Error::NotFound);
}
perms(&user).server(&server).calc(db).await?;
Ok(Json(server))
}