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

Fix /user/keys/query bug, review comments, update sytest-whitelist

Browse source
This commit is contained in:
Neil Alexander 2021-08-06 15:50:52 +01:00
parent 6cc888289e
commit d57c39ce7f
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
federationapi/routing/keys.go
View file

@ -71,8 +71,14 @@ func QueryDeviceKeys(
return util.JSONResponse{ return util.JSONResponse{
Code: 200, Code: 200,
JSON: struct { JSON: struct {
DeviceKeys interface{} `json:"device_keys"` DeviceKeys interface{} `json:"device_keys"`
}{queryRes.DeviceKeys}, MasterKeys interface{} `json:"master_keys"`
SelfSigningKeys interface{} `json:"self_signing_keys"`
}{
queryRes.DeviceKeys,
queryRes.MasterKeys,
queryRes.SelfSigningKeys,
},
} }
} }

13
keyserver/internal/cross_signing.go
View file

@ -436,16 +436,16 @@ func (a *KeyInternalAPI) processOtherSignatures(
// actually be. // actually be.
localKeyData, lok := masterKey.Keys[targetKeyID] localKeyData, lok := masterKey.Keys[targetKeyID]
if !lok { if !lok {
return fmt.Errorf("uploaded master key for user %q doesn't match local copy", targetUserID) return fmt.Errorf("uploaded master key %q for user %q doesn't match local copy", targetKeyID, targetUserID)
} else if !bytes.Equal(suppliedKeyData, localKeyData) { } else if !bytes.Equal(suppliedKeyData, localKeyData) {
return fmt.Errorf("uploaded master key for user %q doesn't match local copy", targetUserID) return fmt.Errorf("uploaded master key %q for user %q doesn't match local copy", targetKeyID, targetUserID)
} }
// We only care about the signatures from the uploading user, so // We only care about the signatures from the uploading user, so
// we will ignore anything that didn't originate from them. // we will ignore anything that didn't originate from them.
userSigs, ok := sig.Signatures[userID] userSigs, ok := sig.Signatures[userID]
if !ok { if !ok {
return fmt.Errorf("there are no signatures from uploading user %q", userID) return fmt.Errorf("there are no signatures on master key %q from uploading user %q", targetKeyID, userID)
} }
for originKeyID, originSig := range userSigs { for originKeyID, originSig := range userSigs {
@ -458,8 +458,9 @@ func (a *KeyInternalAPI) processOtherSignatures(
} }
default: default:
// Users shouldn't be signing anything other people's devices, // Users should only be signing another person's master key,
// so we'll just do nothing with it if that's the case. // so if we're here, it's probably because it's actually a
// gomatrixserverlib.DeviceKeys, which doesn't make sense.
} }
} }
} }
@ -485,7 +486,7 @@ func (a *KeyInternalAPI) crossSigningKeysFromDatabase(
} }
sigMap, err := a.DB.CrossSigningSigsForTarget(ctx, userID, keyID) sigMap, err := a.DB.CrossSigningSigsForTarget(ctx, userID, keyID)
if err != nil { if err != nil && err != sql.ErrNoRows {
logrus.WithError(err).Errorf("Failed to get cross-signing signatures for user %q key %q", userID, keyID) logrus.WithError(err).Errorf("Failed to get cross-signing signatures for user %q key %q", userID, keyID)
continue continue
} }

1
sytest-whitelist
View file

@ -553,3 +553,4 @@ Deleted & recreated backups are empty
Can upload self-signing keys Can upload self-signing keys
Fails to upload self-signing keys with no auth Fails to upload self-signing keys with no auth
Fails to upload self-signing key without master key Fails to upload self-signing key without master key
can fetch self-signing keys over federation