gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reject federated downvotes if downvotes are disabled (fixes #2124) (#2128)

check_admin_add_mod
Nutomic 2022-03-14 18:20:18 +00:00 committed by GitHub
parent 71237f1b53
commit f8fb3b41f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/apub/src/activities/voting/vote.rs
View File

@ -13,6 +13,7 @@ use crate::{
PostOrComment, PostOrComment,
}; };
use activitystreams_kinds::public; use activitystreams_kinds::public;
use anyhow::anyhow;
use lemmy_api_common::blocking; use lemmy_api_common::blocking;
use lemmy_apub_lib::{ use lemmy_apub_lib::{
data::Data, data::Data,
@ -21,7 +22,7 @@ use lemmy_apub_lib::{
}; };
use lemmy_db_schema::{ use lemmy_db_schema::{
newtypes::CommunityId, newtypes::CommunityId,
source::{community::Community, post::Post}, source::{community::Community, post::Post, site::Site},
traits::Crud, traits::Crud,
}; };
use lemmy_utils::LemmyError; use lemmy_utils::LemmyError;
@ -81,6 +82,10 @@ impl ActivityHandler for Vote {
verify_activity(&self.id, self.actor.inner(), &context.settings())?; verify_activity(&self.id, self.actor.inner(), &context.settings())?;
let community = self.get_community(context, request_counter).await?; let community = self.get_community(context, request_counter).await?;
verify_person_in_community(&self.actor, &community, context, request_counter).await?; verify_person_in_community(&self.actor, &community, context, request_counter).await?;
let site = blocking(context.pool(), Site::read_local_site).await??;
if self.kind == VoteType::Dislike && !site.enable_downvotes {
return Err(anyhow!("Downvotes disabled").into());
}
Ok(()) Ok(())
} }

2
crates/apub/src/protocol/activities/voting/vote.rs
View File

@ -27,7 +27,7 @@ pub struct Vote {
pub(crate) unparsed: Unparsed, pub(crate) unparsed: Unparsed,
} }
#[derive(Clone, Debug, Display, Deserialize, Serialize)] #[derive(Clone, Debug, Display, Deserialize, Serialize, PartialEq)]
pub enum VoteType { pub enum VoteType {
Like, Like,
Dislike, Dislike,