zaaarf/upub
1
0
Fork 0
forked from alemi/upub
Code Pull requests Activity

fix: http signatures errors are 500, not 401

Browse source 
if user provides an http signature and we fail to verify, bail out! if
our db didn't give us the local user its unlikely that we will be able
to serve anything anyway, just give up
This commit is contained in:
əlemi 2024-06-06 21:04:04 +02:00
parent 6b24db86f2
commit d93e4f091b
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
upub/routes/src/auth.rs
View file

@ -120,22 +120,21 @@ where
.next().ok_or(ApiError::bad_request())?
.to_string();
match ctx.fetch_user(&user_id, ctx.db()).await {
Err(e) => tracing::warn!("failed resolving http signature actor: {e}"),
Ok(user) => match http_signature
.build_from_parts(parts)
.verify(&user.public_key)
{
Ok(true) => {
let internal = upub::model::instance::Entity::domain_to_internal(&user.domain, ctx.db())
.await?
.ok_or_else(ApiError::internal_server_error)?; // user but not their domain???
identity = Identity::Remote { user: user.id, domain: user.domain, internal };
},
Ok(false) => tracing::warn!("invalid signature: {http_signature:?}"),
Err(e) => tracing::error!("error verifying signature: {e}"),
},
let user = ctx.fetch_user(&user_id, ctx.db()).await?;
let valid = http_signature
.build_from_parts(parts)
.verify(&user.public_key)?;
if !valid {
tracing::warn!("refusing mismatching http signature");
return Err(ApiError::unauthorized());
}
let internal = upub::model::instance::Entity::domain_to_internal(&user.domain, ctx.db())
.await?
.ok_or_else(ApiError::internal_server_error)?; // user but not their domain???
identity = Identity::Remote { user: user.id, domain: user.domain, internal };
}
Ok(AuthIdentity(identity))