mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-28 17:23:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Process self-signing key too

Browse source
This commit is contained in:
Neil Alexander 2021-08-04 10:21:13 +01:00
parent 184b9c21f6
commit 8215384d23
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
keyserver/internal/cross_signing.go
View file

@ -137,7 +137,7 @@ func (a *KeyInternalAPI) PerformUploadDeviceKeys(ctx context.Context, req *api.P
case *gomatrixserverlib.CrossSigningKey: case *gomatrixserverlib.CrossSigningKey:
if err := sanityCheckKey(*k, req.UserID, gomatrixserverlib.CrossSigningKeyPurposeMaster); err != nil { if err := sanityCheckKey(*k, req.UserID, gomatrixserverlib.CrossSigningKeyPurposeMaster); err != nil {
res.Error = &api.KeyError{ res.Error = &api.KeyError{
Err: "User-signing key sanity check failed: " + err.Error(), Err: "Master key sanity check failed: " + err.Error(),
} }
return return
} }
@ -147,6 +147,20 @@ func (a *KeyInternalAPI) PerformUploadDeviceKeys(ctx context.Context, req *api.P
} }
return return
} }
switch k := keys.SelfSigningKeys[req.UserID].CrossSigningBody.(type) {
case *gomatrixserverlib.CrossSigningKey:
if err := sanityCheckKey(*k, req.UserID, gomatrixserverlib.CrossSigningKeyPurposeSelfSigning); err != nil {
res.Error = &api.KeyError{
Err: "Self-signing key sanity check failed: " + err.Error(),
}
return
}
default:
res.Error = &api.KeyError{
Err: "Unexpected type for self-signing key retrieved from federation",
}
return
}
} }
// If we still don't have a master key at this point then there's nothing else // If we still don't have a master key at this point then there's nothing else