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

Remove delete() so we also query signingkeys

Browse source
This commit is contained in:
Till Faelligen 2022-02-09 11:11:59 +01:00
parent b505ea2b65
commit e24c415fa8
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
keyserver/internal/internal.go
View file

@ -19,7 +19,6 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"strings"
"sync" "sync"
"time" "time"
@ -284,14 +283,8 @@ func (a *KeyInternalAPI) QueryKeys(ctx context.Context, req *api.QueryKeysReques
res.DeviceKeys[userID][dk.DeviceID] = dk.KeyJSON res.DeviceKeys[userID][dk.DeviceID] = dk.KeyJSON
} }
} else { } else {
// this makes "uploading signed devices gets propagated over federation" pass (well..) domainToDeviceKeys[domain] = make(map[string][]string)
// removing the domainToDeviceKeys completely makes two different devicelist tests fail. domainToDeviceKeys[domain][userID] = append(domainToDeviceKeys[domain][userID], deviceIDs...)
// figure out a way to make all three tests happy
if !strings.Contains(userID, "13:localhost") {
logrus.Debugf("adding %s for %s to domainToDeviceKeys", domain, userID)
domainToDeviceKeys[domain] = make(map[string][]string)
domainToDeviceKeys[domain][userID] = append(domainToDeviceKeys[domain][userID], deviceIDs...)
}
} }
// work out if our cross-signing request for this user was // work out if our cross-signing request for this user was
// satisfied, if not add them to the list of things to fetch // satisfied, if not add them to the list of things to fetch
@ -374,7 +367,6 @@ func (a *KeyInternalAPI) remoteKeysFromDatabase(
} }
} }
logrus.Debugf("fetchRemote: %+v", fetchRemote)
return fetchRemote return fetchRemote
} }
@ -461,7 +453,6 @@ func (a *KeyInternalAPI) queryRemoteKeysOnServer(
for userID, deviceIDs := range devKeys { for userID, deviceIDs := range devKeys {
if len(deviceIDs) == 0 { if len(deviceIDs) == 0 {
userIDsForAllDevices[userID] = struct{}{} userIDsForAllDevices[userID] = struct{}{}
delete(devKeys, userID)
} }
} }
// for cross-signing keys, it's probably easier just to hit /keys/query if we aren't already doing // for cross-signing keys, it's probably easier just to hit /keys/query if we aren't already doing