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

Fetch actor before verifying JSON signature

Browse source
This commit is contained in:
silverpill 2022-12-08 00:11:27 +00:00
parent a71c4ccc89
commit cd6968b15a
1 changed files with 27 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/activitypub/authentication.rs
View file

@ -18,10 +18,7 @@ use crate::json_signatures::verify::{
JsonSignatureVerificationError as JsonSignatureError,
JsonSigner,
};
use crate::models::profiles::queries::{
get_profile_by_remote_actor_id,
search_profiles_by_did_only,
};
use crate::models::profiles::queries::get_profile_by_remote_actor_id;
use crate::models::profiles::types::DbActorProfile;
use crate::utils::crypto_rsa::deserialize_public_key;
use super::fetcher::helpers::get_or_import_profile_by_actor_id;
@ -118,32 +115,22 @@ pub async fn verify_signed_request(
Ok(signer)
}
/// Verifies JSON signature and returns signer
pub async fn verify_signed_activity(
config: &Config,
db_client: &impl GenericClient,
activity: &Value,
) -> Result<DbActorProfile, AuthenticationError> {
// Signed activities must have `actor` property, to avoid situations
// where signer is identified by DID but there is no matching
// identity proof in the local database.
let actor_id = activity["actor"].as_str()
.ok_or(AuthenticationError::ActorError("unknown actor"))?;
let signature_data = match get_json_signature(activity) {
Ok(signature_data) => signature_data,
Err(JsonSignatureError::NoProof) => {
return Err(AuthenticationError::NoJsonSignature);
},
Err(other_error) => return Err(other_error.into()),
};
let signer = match signature_data.signer {
JsonSigner::ActorKeyId(ref key_id) => {
if signature_data.signature_type != SignatureType::JcsRsaSignature {
return Err(AuthenticationError::InvalidJsonSignatureType);
};
let signer_id = key_id_to_actor_id(key_id)?;
let signer = match get_or_import_profile_by_actor_id(
let actor_profile = match get_or_import_profile_by_actor_id(
db_client,
&config.instance(),
&config.media_dir(),
&signer_id,
actor_id,
).await {
Ok(profile) => profile,
Err(HandlerError::DatabaseError(error)) => {
@ -153,33 +140,33 @@ pub async fn verify_signed_activity(
return Err(AuthenticationError::ImportError(other_error.to_string()));
},
};
let signer_actor = signer.actor_json.as_ref()
let signature_data = match get_json_signature(activity) {
Ok(signature_data) => signature_data,
Err(JsonSignatureError::NoProof) => {
return Err(AuthenticationError::NoJsonSignature);
},
Err(other_error) => return Err(other_error.into()),
};
match signature_data.signer {
JsonSigner::ActorKeyId(ref key_id) => {
if signature_data.signature_type != SignatureType::JcsRsaSignature {
return Err(AuthenticationError::InvalidJsonSignatureType);
};
let signer_id = key_id_to_actor_id(key_id)?;
if signer_id != actor_id {
return Err(AuthenticationError::UnexpectedSigner);
};
let signer_actor = actor_profile.actor_json.as_ref()
.expect("activity should be signed by remote actor");
let signer_key =
deserialize_public_key(&signer_actor.public_key.public_key_pem)?;
verify_rsa_json_signature(&signature_data, &signer_key)?;
signer
},
JsonSigner::Did(did) => {
let profiles: Vec<_> = search_profiles_by_did_only(db_client, &did)
.await?.into_iter()
// Exclude local profiles
.filter(|profile| !profile.is_local())
.collect();
if profiles.len() > 1 {
log::info!(
"signer with multiple profiles ({})",
profiles.len(),
);
if !actor_profile.identity_proofs.any(&did) {
return Err(AuthenticationError::UnexpectedSigner);
};
let signer = profiles.iter()
.find(|profile| profile.actor_id(&config.instance_url()) == actor_id)
// Use first profile with a given DID
// if none of them matches actor
.or(profiles.first())
.ok_or(AuthenticationError::ActorError("unknown signer"))?
.clone();
match signature_data.signature_type {
SignatureType::JcsEd25519Signature => {
let did_key = match did {
@ -205,12 +192,10 @@ pub async fn verify_signed_activity(
},
_ => return Err(AuthenticationError::InvalidJsonSignatureType),
};
signer
},
};
Ok(signer)
// Signer is actor
Ok(actor_profile)
}
#[cfg(test)]