Don't skip devices that don't have signatures

This commit is contained in:
Neil Alexander 2021-08-05 15:57:44 +01:00
parent f4637932b6
commit 1c30fd9c97
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944

View file

@ -66,20 +66,16 @@ func GetUserDevices(
Keys: key, Keys: key,
} }
targetUser, ok := sigRes.Signatures[dev.UserID] if targetUser, ok := sigRes.Signatures[dev.UserID]; ok {
if !ok { if targetKey, ok := targetUser[gomatrixserverlib.KeyID(dev.DeviceID)]; !ok {
continue for sourceUserID, forSourceUser := range targetKey {
} for sourceKeyID, sourceKey := range forSourceUser {
targetKey, ok := targetUser[gomatrixserverlib.KeyID(dev.DeviceID)] if _, ok := device.Keys.Signatures[sourceUserID]; !ok {
if !ok { device.Keys.Signatures[sourceUserID] = map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes{}
continue }
} device.Keys.Signatures[sourceUserID][sourceKeyID] = sourceKey
for sourceUserID, forSourceUser := range targetKey { }
for sourceKeyID, sourceKey := range forSourceUser {
if _, ok := device.Keys.Signatures[sourceUserID]; !ok {
device.Keys.Signatures[sourceUserID] = map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes{}
} }
device.Keys.Signatures[sourceUserID][sourceKeyID] = sourceKey
} }
} }