mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-29 01:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Try to verify when a key signs a device

Browse source
This commit is contained in:
Neil Alexander 2021-08-05 14:24:34 +01:00
parent a135fcecb8
commit 58ba7dcc46
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
keyserver/internal/cross_signing.go
View file

@ -305,7 +305,7 @@ func (a *KeyInternalAPI) processSelfSignatures(
for originUserID, forOriginUserID := range sig.Signatures { for originUserID, forOriginUserID := range sig.Signatures {
originDeviceKeys, ok := queryRes.DeviceKeys[originUserID] originDeviceKeys, ok := queryRes.DeviceKeys[originUserID]
if !ok { if !ok {
continue return fmt.Errorf("missing device keys for user %q", originUserID)
} }
for originKeyID, originSig := range forOriginUserID { for originKeyID, originSig := range forOriginUserID {
@ -336,9 +336,33 @@ func (a *KeyInternalAPI) processSelfSignatures(
case *gomatrixserverlib.DeviceKeys: case *gomatrixserverlib.DeviceKeys:
// The user is signing one of their devices with their self-signing key // The user is signing one of their devices with their self-signing key
// The QueryKeys response should contain the master key hopefully.
// First we need to marshal the blob back into JSON so we can verify
// it.
j, err := json.Marshal(sig)
if err != nil {
return fmt.Errorf("json.Marshal: %w", err)
}
for originUserID, forOriginUserID := range sig.Signatures { for originUserID, forOriginUserID := range sig.Signatures {
for originKeyID, originSig := range forOriginUserID { for originKeyID, originSig := range forOriginUserID {
originMasterKeys, ok := queryRes.MasterKeys[originUserID]
if !ok {
return fmt.Errorf("missing master key for user %q", originUserID)
}
var originMasterKeyID gomatrixserverlib.KeyID
var originMasterKey gomatrixserverlib.Base64Bytes
for keyID, key := range originMasterKeys.Keys {
originMasterKeyID, originMasterKey = keyID, key
break
}
originMasterKeyPublic := ed25519.PublicKey(originMasterKey)
if err := gomatrixserverlib.VerifyJSON(originUserID, originMasterKeyID, originMasterKeyPublic, j); err != nil {
return fmt.Errorf("gomatrixserverlib.VerifyJSON: %w", err)
}
if err := a.DB.StoreCrossSigningSigsForTarget( if err := a.DB.StoreCrossSigningSigsForTarget(
ctx, originUserID, originKeyID, targetUserID, targetKeyID, originSig, ctx, originUserID, originKeyID, targetUserID, targetKeyID, originSig,