grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fix-federation-enabled-option' into main

Browse source
This commit is contained in:
Dessalines 2020-08-18 09:35:27 -04:00
commit 53d449d5d7
2 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/src/apub/activities.rs
View file

@ -45,6 +45,10 @@ pub async fn send_activity(
actor: &dyn ActorType, actor: &dyn ActorType,
to: Vec<Url>, to: Vec<Url>,
) -> Result<(), LemmyError> { ) -> Result<(), LemmyError> {
if !Settings::get().federation.enabled {
return Ok(());
}
let activity = serde_json::to_string(&activity)?; let activity = serde_json::to_string(&activity)?;
debug!("Sending activitypub activity {} to {:?}", activity, to); debug!("Sending activitypub activity {} to {:?}", activity, to);

34
server/src/apub/mod.rs
View file

@ -72,6 +72,30 @@ where
// Checks if the ID has a valid format, correct scheme, and is in the allowed instance list. // Checks if the ID has a valid format, correct scheme, and is in the allowed instance list.
fn check_is_apub_id_valid(apub_id: &Url) -> Result<(), LemmyError> { fn check_is_apub_id_valid(apub_id: &Url) -> Result<(), LemmyError> {
let settings = Settings::get();
let domain = apub_id.domain().context(location_info!())?.to_string();
let local_instance = settings
.hostname
.split(':')
.collect::<Vec<&str>>()
.first()
.context(location_info!())?
.to_string();
if !settings.federation.enabled {
return if domain == local_instance {
Ok(())
} else {
Err(
anyhow!(
"Trying to connect with {}, but federation is disabled",
domain
)
.into(),
)
};
}
if apub_id.scheme() != get_apub_protocol_string() { if apub_id.scheme() != get_apub_protocol_string() {
return Err(anyhow!("invalid apub id scheme: {:?}", apub_id.scheme()).into()); return Err(anyhow!("invalid apub id scheme: {:?}", apub_id.scheme()).into());
} }
@ -79,18 +103,10 @@ fn check_is_apub_id_valid(apub_id: &Url) -> Result<(), LemmyError> {
let mut allowed_instances = Settings::get().get_allowed_instances(); let mut allowed_instances = Settings::get().get_allowed_instances();
let blocked_instances = Settings::get().get_blocked_instances(); let blocked_instances = Settings::get().get_blocked_instances();
let domain = apub_id.domain().context(location_info!())?.to_string();
if !allowed_instances.is_empty() { if !allowed_instances.is_empty() {
// need to allow this explicitly because apub activities might contain objects from our local // need to allow this explicitly because apub activities might contain objects from our local
// instance. split is needed to remove the port in our federation test setup. // instance. split is needed to remove the port in our federation test setup.
let settings = Settings::get(); allowed_instances.push(local_instance);
let local_instance = settings.hostname.split(':').collect::<Vec<&str>>();
allowed_instances.push(
local_instance
.first()
.context(location_info!())?
.to_string(),
);
if allowed_instances.contains(&domain) { if allowed_instances.contains(&domain) {
Ok(()) Ok(())