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

Merge pull request 'Include object id when logging apub errors' (#165) from log-ids into main

Browse source 
Reviewed-on: https://yerbamate.ml/LemmyNet/lemmy/pulls/165
This commit is contained in:
dessalines 2021-02-05 17:52:51 +00:00
commit 6f364e60fa
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/apub/src/lib.rs
View file

@ -80,11 +80,11 @@ fn check_is_apub_id_valid(apub_id: &Url) -> Result<(), LemmyError> {
let host = apub_id.host_str().context(location_info!())?; let host = apub_id.host_str().context(location_info!())?;
let host_as_ip = host.parse::<IpAddr>(); let host_as_ip = host.parse::<IpAddr>();
if host == "localhost" || host_as_ip.is_ok() { if host == "localhost" || host_as_ip.is_ok() {
return Err(anyhow!("invalid hostname: {:?}", host).into()); return Err(anyhow!("invalid hostname {}: {}", host, apub_id).into());
} }
if apub_id.scheme() != Settings::get().get_protocol_string() { if apub_id.scheme() != Settings::get().get_protocol_string() {
return Err(anyhow!("invalid apub id scheme: {:?}", apub_id.scheme()).into()); return Err(anyhow!("invalid apub id scheme {}: {}", apub_id.scheme(), apub_id).into());
} }
let mut allowed_instances = Settings::get().get_allowed_instances(); let mut allowed_instances = Settings::get().get_allowed_instances();