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

Extract integrity proof before fetching actor

Browse source
This commit is contained in:
silverpill 2022-12-12 22:49:52 +00:00
parent 87bd8facc9
commit 8c14b18d5b
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/activitypub/authentication.rs
View file

@ -133,13 +133,6 @@ pub async fn verify_signed_activity(
activity: &Value, activity: &Value,
no_fetch: bool, no_fetch: bool,
) -> Result<DbActorProfile, AuthenticationError> { ) -> 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 actor_profile = get_signer(config, db_client, actor_id, no_fetch).await?;
let signature_data = match get_json_signature(activity) { let signature_data = match get_json_signature(activity) {
Ok(signature_data) => signature_data, Ok(signature_data) => signature_data,
Err(JsonSignatureError::NoProof) => { Err(JsonSignatureError::NoProof) => {
@ -147,6 +140,12 @@ pub async fn verify_signed_activity(
}, },
Err(other_error) => return Err(other_error.into()), Err(other_error) => return Err(other_error.into()),
}; };
// 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 actor_profile = get_signer(config, db_client, actor_id, no_fetch).await?;
match signature_data.signer { match signature_data.signer {
JsonSigner::ActorKeyId(ref key_id) => { JsonSigner::ActorKeyId(ref key_id) => {