fedi/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-12-23 09:44:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proper permission check for federated comment distinguish (#2697)

Browse source 
Co-authored-by: Dessalines <dessalines@users.noreply.github.com>
This commit is contained in:
Nutomic 2023-02-19 03:57:45 +09:00 committed by GitHub
parent 62663a9f2e
commit a42f7271e6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/apub/src/activities/create_or_update/comment.rs
View file

@ -28,7 +28,7 @@ use activitystreams_kinds::public;
use lemmy_api_common::{
comment::{CommentResponse, CreateComment, EditComment},
context::LemmyContext,
utils::check_post_deleted_or_removed,
utils::{check_post_deleted_or_removed, is_mod_or_admin},
websocket::{send::send_comment_ws_message, UserOperationCrud},
};
use lemmy_db_schema::{
@ -178,6 +178,22 @@ impl ActivityHandler for CreateOrUpdateNote {
context: &Data<LemmyContext>,
request_counter: &mut i32,
) -> Result<(), LemmyError> {
// Need to do this check here instead of Note::from_apub because we need the person who
// send the activity, not the comment author.
let existing_comment = self.object.id.dereference_local(context).await.ok();
if let (Some(distinguished), Some(existing_comment)) =
(self.object.distinguished, existing_comment)
{
if distinguished != existing_comment.distinguished {
let creator = self
.actor
.dereference(context, local_instance(context).await, request_counter)
.await?;
let (post, _) = self.object.get_parents(context, request_counter).await?;
is_mod_or_admin(context.pool(), creator.id, post.community_id).await?;
}
}
let comment = ApubComment::from_apub(self.object, context, request_counter).await?;
// author likes their own comment by default

2
crates/utils/translations

@ -1 +1 @@
Subproject commit 21808b45ea3ef7fa91654d4f6738b5144da6bfe7
Subproject commit 1c42c579460871de7b4ea18e58dc25543b80d289