forge/Vervis
1
0
Fork 0
Code Pull requests Activity

When we fetch a stand-alone personal key, make sure AP-Actor matches key owner

Browse source 
If the key we fetched is a shared key, the only way to determine the actor to
which the signature applies is to read the HTTP header ActivityPub-Actor. But
if it's a personal key, we can detect the actor by checking the key's owner
field. Still, if that actor header is provided, we now compare it to the key
owner and make sure they're identical.

When fetching a key that is embedded in the actor document, we were already
comparing the actor ID with the actor header, so that part didn't require
changes.
This commit is contained in:
fr33domlover 2019-02-17 00:14:05 +00:00
parent bf56ebf158
commit fa5c509a25
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Web/ActivityPub.hs
View file

@ -54,6 +54,7 @@ import Data.Aeson.Types (Parser)
import Data.Bifunctor (bimap, first) import Data.Bifunctor (bimap, first)
import Data.Bitraversable (bitraverse) import Data.Bitraversable (bitraverse)
import Data.ByteString (ByteString) import Data.ByteString (ByteString)
import Data.Foldable (for_)
import Data.List.NonEmpty (NonEmpty) import Data.List.NonEmpty (NonEmpty)
import Data.PEM import Data.PEM
import Data.Semigroup (Endo) import Data.Semigroup (Endo)
@ -429,7 +430,13 @@ fetchKey manager sigAlgo muActor uKey = runExceptT $ do
then case muActor of then case muActor of
Nothing -> throwE "Key is shared but actor header not specified!" Nothing -> throwE "Key is shared but actor header not specified!"
Just u -> return u Just u -> return u
else return $ publicKeyOwner pkey else do
let owner = publicKeyOwner pkey
for_ muActor $ \ u ->
if owner == u
then return ()
else throwE "Key's owner doesn't match actor header"
return owner
actor <- fetch uActor actor <- fetch uActor
let PublicKeySet k1 mk2 = actorPublicKeys actor let PublicKeySet k1 mk2 = actorPublicKeys actor
match (Left uri) = uri == uKey match (Left uri) = uri == uKey
@ -441,12 +448,10 @@ fetchKey manager sigAlgo muActor uKey = runExceptT $ do
if actorId actor == uKey { furiFragment = "" } if actorId actor == uKey { furiFragment = "" }
then return () then return ()
else throwE "Actor ID doesn't match the keyid URI we fetched" else throwE "Actor ID doesn't match the keyid URI we fetched"
case muActor of for_ muActor $ \ u ->
Nothing -> return () if actorId actor == u
Just u -> then return ()
if actorId actor == u else throwE "Key's owner doesn't match actor header"
then return ()
else throwE "Key's owner doesn't match actor header"
let PublicKeySet k1 mk2 = actorPublicKeys actor let PublicKeySet k1 mk2 = actorPublicKeys actor
match (Left _) = Nothing match (Left _) = Nothing
match (Right pk) = match (Right pk) =