From 7facc5bceeffbc15d91d0039af52cd3ed640c779 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 2 Mar 2021 09:35:36 +0000 Subject: [PATCH] Review comments --- keyserver/internal/internal.go | 5 +++++ sytest-blacklist | 5 ++++- sytest-whitelist | 1 - 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/keyserver/internal/internal.go b/keyserver/internal/internal.go index beb165f4e..330d2c2a0 100644 --- a/keyserver/internal/internal.go +++ b/keyserver/internal/internal.go @@ -513,6 +513,11 @@ func (a *KeyInternalAPI) uploadLocalDeviceKeys(ctx context.Context, req *api.Per } func (a *KeyInternalAPI) uploadOneTimeKeys(ctx context.Context, req *api.PerformUploadKeysRequest, res *api.PerformUploadKeysResponse) { + if req.UserID == "" || req.DeviceID == "" { + res.Error = &api.KeyError{ + Err: fmt.Sprintf("user ID or device ID missing") + } + } if len(req.OneTimeKeys) == 0 { counts, err := a.DB.OneTimeKeysCount(ctx, req.UserID, req.DeviceID) if err != nil { diff --git a/sytest-blacklist b/sytest-blacklist index 601a3f705..b635c9f0e 100644 --- a/sytest-blacklist +++ b/sytest-blacklist @@ -66,4 +66,7 @@ A prev_batch token from incremental sync can be used in the v1 messages API Forgotten room messages cannot be paginated # Blacklisted due to flakiness -Can re-join room if re-invited \ No newline at end of file +Can re-join room if re-invited + +# Blacklisted due to flakiness after #1774 +Local device key changes get to remote servers with correct prev_id \ No newline at end of file diff --git a/sytest-whitelist b/sytest-whitelist index d53fa899d..1e4442a09 100644 --- a/sytest-whitelist +++ b/sytest-whitelist @@ -143,7 +143,6 @@ Local new device changes appear in v2 /sync Local update device changes appear in v2 /sync Get left notifs for other users in sync and /keys/changes when user leaves Local device key changes get to remote servers -Local device key changes get to remote servers with correct prev_id Server correctly handles incoming m.device_list_update If remote user leaves room, changes device and rejoins we see update in sync If remote user leaves room, changes device and rejoins we see update in /keys/changes