This commit is contained in:
Neil Alexander 2021-07-30 11:06:17 +01:00
parent 8630960141
commit 3939d54cc2
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944

View file

@ -288,19 +288,15 @@ func (a *KeyInternalAPI) QueryKeys(ctx context.Context, req *api.QueryKeysReques
if _, ok := domainToCrossSigningKeys[domain]; !ok {
domainToCrossSigningKeys[domain] = make(map[string]struct{})
}
if _, ok := domainToCrossSigningKeys[domain][userID]; !ok {
domainToCrossSigningKeys[domain][userID] = struct{}{}
}
}
if _, ok := res.SelfSigningKeys[userID]; !ok {
if _, ok := domainToCrossSigningKeys[domain]; !ok {
domainToCrossSigningKeys[domain] = make(map[string]struct{})
}
if _, ok := domainToCrossSigningKeys[domain][userID]; !ok {
domainToCrossSigningKeys[domain][userID] = struct{}{}
}
}
}
// attempt to satisfy key queries from the local database first as we should get device updates pushed to us
domainToDeviceKeys = a.remoteKeysFromDatabase(ctx, res, domainToDeviceKeys)
@ -320,6 +316,9 @@ func (a *KeyInternalAPI) QueryKeys(ctx context.Context, req *api.QueryKeysReques
}
}
util.GetLogger(ctx).Infof("Domain to cross-signing keys: %+v", domainToCrossSigningKeys)
util.GetLogger(ctx).Infof("Domain to device keys: %+v", domainToDeviceKeys)
// perform key queries for remote devices
a.queryRemoteKeys(ctx, req.Timeout, res, domainToDeviceKeys)
}