sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Both requested key IDs and master/self/user keys

Browse source
This commit is contained in:
Neil Alexander 2022-04-26 10:00:35 +01:00
parent 4d62ef650a
commit f87064d1fb
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
keyserver/internal/cross_signing.go
View file

@ -552,6 +552,35 @@ func (a *KeyInternalAPI) QuerySignatures(ctx context.Context, req *api.QuerySign
} }
} }
for _, targetSection := range []map[string]gomatrixserverlib.CrossSigningKey{
res.MasterKeys,
res.SelfSigningKeys,
res.UserSigningKeys,
} {
for targetKeyID, section := range targetSection {
// Get own signatures only.
sigMap, err := a.DB.CrossSigningSigsForTarget(ctx, targetUserID, targetUserID, gomatrixserverlib.KeyID(targetKeyID))
if err != nil && err != sql.ErrNoRows {
res.Error = &api.KeyError{
Err: fmt.Sprintf("a.DB.CrossSigningSigsForTarget: %s", err),
}
return
}
for sourceUserID, forSourceUser := range sigMap {
for sourceKeyID, sourceSig := range forSourceUser {
if section.Signatures == nil {
section.Signatures = map[string]map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes{}
}
if _, ok := res.Signatures[sourceUserID]; !ok {
section.Signatures[sourceUserID] = map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes{}
}
section.Signatures[sourceUserID][sourceKeyID] = sourceSig
}
}
}
}
for _, targetKeyID := range forTargetUser { for _, targetKeyID := range forTargetUser {
// Get own signatures only. // Get own signatures only.
sigMap, err := a.DB.CrossSigningSigsForTarget(ctx, targetUserID, targetUserID, targetKeyID) sigMap, err := a.DB.CrossSigningSigsForTarget(ctx, targetUserID, targetUserID, targetKeyID)