mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 18:43:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Check user ID matches

Browse source
This commit is contained in:
Neil Alexander 2022-09-29 15:28:20 +01:00
parent 7dbd4b6448
commit 8a8da6bf77
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
keyserver/internal/device_list_update.go
View file

@ -468,10 +468,14 @@ func (u *DeviceListUpdater) processServerUser(ctx context.Context, serverName go
} }
default: default:
// Something else failed // Something else failed
logger.WithError(err).WithField("user_id", userID).Debugf("GetUserDevices returned unknown error type: %T", err) logger.WithError(err).Debugf("GetUserDevices returned unknown error type: %T", err)
return time.Minute * 10, err return time.Minute * 10, err
} }
} }
if res.UserID != userID {
logger.WithError(err).Warnf("User ID %q in device list update response doesn't match expected %q", res.UserID, userID)
return defaultWaitTime, nil
}
if res.MasterKey != nil || res.SelfSigningKey != nil { if res.MasterKey != nil || res.SelfSigningKey != nil {
uploadReq := &api.PerformUploadDeviceKeysRequest{ uploadReq := &api.PerformUploadDeviceKeysRequest{
UserID: userID, UserID: userID,
@ -491,7 +495,7 @@ func (u *DeviceListUpdater) processServerUser(ctx context.Context, serverName go
} }
err = u.updateDeviceList(&res) err = u.updateDeviceList(&res)
if err != nil { if err != nil {
logger.WithError(err).WithField("user_id", userID).Error("Fetched device list but failed to store/emit it") logger.WithError(err).Error("Fetched device list but failed to store/emit it")
return defaultWaitTime, err return defaultWaitTime, err
} }
return defaultWaitTime, nil return defaultWaitTime, nil