mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-29 01:33:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic error in QuerySignatures

Browse source
This commit is contained in:
Neil Alexander 2021-08-05 16:03:46 +01:00
parent f5ab879802
commit 3c94028251
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
federationapi/routing/devices.go
View file

@ -20,7 +20,6 @@ import (
keyapi "github.com/matrix-org/dendrite/keyserver/api" keyapi "github.com/matrix-org/dendrite/keyserver/api"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util" "github.com/matrix-org/util"
"github.com/sirupsen/logrus"
) )
// GetUserDevices for the given user id // GetUserDevices for the given user id
@ -45,8 +44,6 @@ func GetUserDevices(
for _, dev := range res.Devices { for _, dev := range res.Devices {
sigReq.TargetIDs[userID] = append(sigReq.TargetIDs[userID], gomatrixserverlib.KeyID(dev.DeviceID)) 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) keyAPI.QuerySignatures(req.Context(), sigReq, sigRes)
response := gomatrixserverlib.RespUserDevices{ response := gomatrixserverlib.RespUserDevices{

4
keyserver/internal/cross_signing.go
View file

@ -473,7 +473,7 @@ func (a *KeyInternalAPI) QuerySignatures(ctx context.Context, req *api.QuerySign
} }
for sourceUserID, forSourceUser := range keyMap { for sourceUserID, forSourceUser := range keyMap {
for targetKeyID, targetSig := range forSourceUser { for sourceKeyID, sourceSig := range forSourceUser {
if res.Signatures == nil { if res.Signatures == nil {
res.Signatures = map[string]map[gomatrixserverlib.KeyID]types.CrossSigningSigMap{} 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 { if _, ok := res.Signatures[targetUserID][targetKeyID][sourceUserID]; !ok {
res.Signatures[targetUserID][targetKeyID][sourceUserID] = map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes{} res.Signatures[targetUserID][targetKeyID][sourceUserID] = map[gomatrixserverlib.KeyID]gomatrixserverlib.Base64Bytes{}
} }
res.Signatures[targetUserID][targetKeyID][sourceUserID][targetKeyID] = targetSig res.Signatures[targetUserID][targetKeyID][sourceUserID][sourceKeyID] = sourceSig
} }
} }
} }