Compare commits
2 Commits
v0.1.6
...
1949fce620
| Author | SHA1 | Date | |
|---|---|---|---|
| 1949fce620 | |||
| 699258f830 |
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -1368,7 +1368,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "k-ap"
|
||||
version = "0.1.5"
|
||||
version = "0.1.7"
|
||||
dependencies = [
|
||||
"activitypub_federation",
|
||||
"anyhow",
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "k-ap"
|
||||
version = "0.1.6"
|
||||
version = "0.1.8"
|
||||
edition = "2024"
|
||||
description = "Generic ActivityPub protocol layer"
|
||||
license = "MIT"
|
||||
|
||||
@@ -65,12 +65,20 @@ impl Activity for FollowActivity {
|
||||
)));
|
||||
}
|
||||
};
|
||||
if target_domain != data.domain {
|
||||
return Err(Error::bad_request(anyhow::anyhow!(
|
||||
"follow target is not a local actor"
|
||||
)));
|
||||
if target_domain == data.domain {
|
||||
return Ok(());
|
||||
}
|
||||
Ok(())
|
||||
// Domain mismatch — still accept if the UUID resolves to a local user.
|
||||
// This handles domain migrations where remote servers have cached the old actor URL.
|
||||
if let Some(uuid) = crate::urls::extract_user_id_from_url(target_url) {
|
||||
if data.user_repo.find_by_id(uuid).await.ok().flatten().is_some() {
|
||||
tracing::debug!(target = %target_url, local_domain = %data.domain, "accepting follow for migrated actor URL");
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
Err(Error::bad_request(anyhow::anyhow!(
|
||||
"follow target is not a local actor"
|
||||
)))
|
||||
}
|
||||
|
||||
async fn receive(self, data: &Data<Self::DataType>) -> Result<(), Self::Error> {
|
||||
|
||||
@@ -328,12 +328,22 @@ impl Object for DbActor {
|
||||
return Ok(());
|
||||
}
|
||||
if apex_domain(json.id.inner()) == apex_domain(expected_domain) {
|
||||
tracing::debug!(
|
||||
actor_id = %json.id.inner(),
|
||||
expected = %expected_domain,
|
||||
"domain verified via www-apex equivalence"
|
||||
);
|
||||
return Ok(());
|
||||
}
|
||||
verify_domains_match(json.id.inner(), expected_domain).map_err(Error::from)
|
||||
}
|
||||
|
||||
async fn from_json(json: Self::Kind, data: &Data<Self::DataType>) -> Result<Self, Self::Error> {
|
||||
tracing::debug!(
|
||||
actor_id = %json.id.inner(),
|
||||
username = %json.preferred_username,
|
||||
"ingesting remote actor"
|
||||
);
|
||||
let shared_inbox_url = json.endpoints.as_ref().map(|e| e.shared_inbox.to_string());
|
||||
let actor = RemoteActor {
|
||||
url: json.id.inner().to_string(),
|
||||
|
||||
@@ -337,10 +337,13 @@ impl ActivityPubService {
|
||||
&self,
|
||||
handle: &str,
|
||||
) -> anyhow::Result<crate::user::LookedUpActor> {
|
||||
tracing::info!(handle, "looking up remote actor");
|
||||
let data = self.federation_config.to_request_data();
|
||||
let actor = Self::webfinger_https(handle, &data).await?;
|
||||
let actor = Self::webfinger_https(handle, &data).await
|
||||
.inspect_err(|e| tracing::warn!(handle, error = %e, "actor lookup failed"))?;
|
||||
let domain = actor.ap_id.host_str().unwrap_or("").to_string();
|
||||
let handle = format!("{}@{}", actor.username, domain);
|
||||
tracing::info!(handle, ap_url = %actor.ap_id, "remote actor resolved");
|
||||
Ok(crate::user::LookedUpActor {
|
||||
handle,
|
||||
display_name: actor.display_name,
|
||||
@@ -597,6 +600,7 @@ impl ActivityPubService {
|
||||
"https://{}/.well-known/webfinger?resource=acct:{}@{}",
|
||||
domain_str, user, domain_str
|
||||
);
|
||||
tracing::debug!(handle, wf_url, "resolving webfinger");
|
||||
let wf: serde_json::Value = reqwest::Client::new()
|
||||
.get(&wf_url)
|
||||
.header("Accept", "application/jrd+json, application/json")
|
||||
@@ -615,6 +619,7 @@ impl ActivityPubService {
|
||||
.and_then(|l| l["href"].as_str())
|
||||
.ok_or_else(|| anyhow::anyhow!("no self link in WebFinger response"))?
|
||||
.to_owned();
|
||||
tracing::debug!(handle, self_href, "webfinger resolved, fetching actor with signature");
|
||||
let self_url = url::Url::parse(&self_href)?;
|
||||
let actor: DbActor = ObjectId::from(self_url)
|
||||
.dereference(data)
|
||||
|
||||
Reference in New Issue
Block a user