From 3c94028251051a397f1c8822777665e49e184378 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Thu, 5 Aug 2021 16:03:46 +0100 Subject: [PATCH] Fix logic error in QuerySignatures --- federationapi/routing/devices.go | 3 --- keyserver/internal/cross_signing.go | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/federationapi/routing/devices.go b/federationapi/routing/devices.go index d942083ec..593551e6f 100644 --- a/federationapi/routing/devices.go +++ b/federationapi/routing/devices.go @@ -20,7 +20,6 @@ import ( keyapi "github.com/matrix-org/dendrite/keyserver/api" "github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/util" - "github.com/sirupsen/logrus" ) // GetUserDevices for the given user id @@ -45,8 +44,6 @@ func GetUserDevices( for _, dev := range res.Devices { sigReq.TargetIDs[userID] = append(sigReq.TargetIDs[userID], gomatrixserverlib.KeyID(dev.DeviceID)) } - logrus.Infof("Signatures request: %+v", sigReq) - logrus.Infof("Signatures response: %+v", sigRes) keyAPI.QuerySignatures(req.Context(), sigReq, sigRes) response := gomatrixserverlib.RespUserDevices{ diff --git a/keyserver/internal/cross_signing.go b/keyserver/internal/cross_signing.go index cc4b45727..a7a893820 100644 --- a/keyserver/internal/cross_signing.go +++ b/keyserver/internal/cross_signing.go @@ -473,7 +473,7 @@ func (a *KeyInternalAPI) QuerySignatures(ctx context.Context, req *api.QuerySign } for sourceUserID, forSourceUser := range keyMap { - for targetKeyID, targetSig := range forSourceUser { + for sourceKeyID, sourceSig := range forSourceUser { if res.Signatures == nil { res.Signatures = map[string]map[gomatrixserverlib.KeyID]types.CrossSigningSigMap{} } @@ -486,7 +486,7 @@ func (a *KeyInternalAPI) QuerySignatures(ctx context.Context, req *api.QuerySign if _, ok := res.Signatures[targetUserID][targetKeyID][sourceUserID]; !ok { res.Signatures[targetUserID][targetKeyID][sourceUserID] = map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes{} } - res.Signatures[targetUserID][targetKeyID][sourceUserID][targetKeyID] = targetSig + res.Signatures[targetUserID][targetKeyID][sourceUserID][sourceKeyID] = sourceSig } } }