From 64647a4f87474b7c1cf3617631c5269a53e7dc08 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 28 Jul 2021 16:09:24 +0100 Subject: [PATCH] Fix QueryKeys ordering --- keyserver/internal/internal.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyserver/internal/internal.go b/keyserver/internal/internal.go index 90b0f949..ec21f65a 100644 --- a/keyserver/internal/internal.go +++ b/keyserver/internal/internal.go @@ -220,6 +220,12 @@ func (a *KeyInternalAPI) QueryDeviceMessages(ctx context.Context, req *api.Query } func (a *KeyInternalAPI) QueryKeys(ctx context.Context, req *api.QueryKeysRequest, res *api.QueryKeysResponse) { + // get cross-signing keys from the database + if err := a.crossSigningKeys(ctx, req, res); err != nil { + // TODO: handle this + util.GetLogger(ctx).WithError(err).Error("Failed to retrieve cross-signing keys") + } + res.DeviceKeys = make(map[string]map[string]json.RawMessage) res.Failures = make(map[string]interface{}) // make a map from domain to device keys @@ -282,12 +288,6 @@ func (a *KeyInternalAPI) QueryKeys(ctx context.Context, req *api.QueryKeysReques return // nothing to query } - // get cross-signing keys from the database - if err := a.crossSigningKeys(ctx, req, res); err != nil { - // TODO: handle this - util.GetLogger(ctx).WithError(err).Error("Failed to retrieve cross-signing keys") - } - // perform key queries for remote devices a.queryRemoteKeys(ctx, req.Timeout, res, domainToDeviceKeys) }