natty
/
magnetar
1
0
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects Releases Wiki Activity

Fixed WebFinger hostnames

This commit is contained in:
Natty 2023-04-22 02:35:12 +02:00
parent 2ec0ad6068
commit bc95aa4efa
Signed by: natty
GPG Key ID: BF6CB659ADEE60EC
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/webfinger.rs
View File

@ -40,12 +40,17 @@ pub async fn handle_webfinger(
StatusCode::UNPROCESSABLE_ENTITY StatusCode::UNPROCESSABLE_ENTITY
})?; })?;
ck.get_user_by_tag(&tag.name, tag.host.as_deref()) ck.get_user_by_tag(
.await &tag.name,
.map_err(|e| { tag.host
error!("Data error: {e}"); .filter(|host| *host != config.networking.host)
StatusCode::INTERNAL_SERVER_ERROR .as_deref(),
})? )
.await
.map_err(|e| {
error!("Data error: {e}");
StatusCode::INTERNAL_SERVER_ERROR
})?
} }
// Kinda a // Kinda a
WebFingerSubject::Url(url) => ck.get_user_by_uri(&url).await.map_err(|e| { WebFingerSubject::Url(url) => ck.get_user_by_uri(&url).await.map_err(|e| {
@ -59,7 +64,10 @@ pub async fn handle_webfinger(
} }
let user = user.unwrap(); let user = user.unwrap();
let tag = FediverseTag::from((&user.username, user.host.as_ref())); let tag = FediverseTag::from((
&user.username,
user.host.as_ref().or(Some(&config.networking.host)),
));
let mut links = Vec::new(); let mut links = Vec::new();
let mut aliases = Vec::new(); let mut aliases = Vec::new();