FediMovies/fedimovies
1
1
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Activity

Log signer ID when processing incoming activity

Browse source
This commit is contained in:
silverpill 2021-12-01 15:05:17 +00:00
parent 0ec69adbe2
commit a0c0f1d092
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/activitypub/views.rs
View file

@ -99,8 +99,9 @@ async fn inbox(
} else { } else {
log::info!("received in {}: {}", request.uri().path(), activity); log::info!("received in {}: {}", request.uri().path(), activity);
}; };
if let Err(err) = signature_verified { match signature_verified {
log::warn!("invalid signature: {}", err); Ok(signer_id) => log::info!("activity signed by {}", signer_id),
Err(err) => log::warn!("invalid signature: {}", err),
}; };
receive_activity(&config, &db_pool, activity.into_inner()).await?; receive_activity(&config, &db_pool, activity.into_inner()).await?;
Ok(HttpResponse::Ok().finish()) Ok(HttpResponse::Ok().finish())

7
src/http_signatures/verify.rs
View file

@ -108,11 +108,12 @@ fn parse_http_signature(
Ok(signature_data) Ok(signature_data)
} }
/// Verifies HTTP signature and returns signer ID
pub async fn verify_http_signature( pub async fn verify_http_signature(
config: &Config, config: &Config,
db_pool: &Pool, db_pool: &Pool,
request: &HttpRequest, request: &HttpRequest,
) -> Result<(), VerificationError> { ) -> Result<String, VerificationError> {
let signature_data = parse_http_signature( let signature_data = parse_http_signature(
request.method(), request.method(),
request.uri(), request.uri(),
@ -151,7 +152,9 @@ pub async fn verify_http_signature(
if !is_valid_signature { if !is_valid_signature {
return Err(VerificationError::InvalidSignature); return Err(VerificationError::InvalidSignature);
} }
Ok(()) let signer_id = actor_profile.actor_id(&config.instance_url())
.map_err(|_| VerificationError::ActorError("invalid profile".to_string()))?;
Ok(signer_id)
} }
#[cfg(test)] #[cfg(test)]