alemi/upub
alemi/upub
1
0
Fork 1
Code Issues 4 Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: cloak also user images

Browse source
This commit is contained in:
əlemi 2024-07-16 00:21:16 +02:00
parent eb6cce2787
commit 74bfd77dff
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
upub/core/src/traits/fetch.rs
View file

@ -2,11 +2,11 @@ use std::collections::BTreeMap;
use apb::{Activity, Actor, ActorMut, Base, Collection, Object}; use apb::{Activity, Actor, ActorMut, Base, Collection, Object};
use reqwest::{header::{ACCEPT, CONTENT_TYPE, USER_AGENT}, Method, Response}; use reqwest::{header::{ACCEPT, CONTENT_TYPE, USER_AGENT}, Method, Response};
use sea_orm::{ConnectionTrait, DbErr, EntityTrait, IntoActiveModel, NotSet}; use sea_orm::{ConnectionTrait, DbErr, EntityTrait, IntoActiveModel, NotSet, ActiveValue::{Set, NotSet, Unchanged}};
use crate::traits::normalize::AP; use crate::traits::normalize::AP;
use super::{Addresser, Normalizer}; use super::{Addresser, Cloaker, Normalizer};
use httpsign::HttpSignature; use httpsign::HttpSignature;
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
@ -305,7 +305,20 @@ impl Fetcher for crate::Context {
} }
} }
let user_model = AP::actor_q(&document, None)?; let mut user_model = AP::actor_q(&document, None)?;
// cloak remote images
if let Set(Some(ref image)) = user_model.image {
if !image.starts_with(self.base()) {
user_model.image = Set(Some(self.cloaked(image)));
}
}
if let Set(Some(ref icon)) = user_model.icon {
if !icon.starts_with(self.base()) {
user_model.icon = Set(Some(self.cloaked(icon)));
}
}
// TODO this may fail: while fetching, remote server may fetch our service actor. // TODO this may fail: while fetching, remote server may fetch our service actor.
// if it does so with http signature, we will fetch that actor in background // if it does so with http signature, we will fetch that actor in background