hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2025-04-20 18:53:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Hopefully get keys from remote query

Browse source
This commit is contained in:
Neil Alexander 2021-07-30 09:55:05 +01:00
parent a00ea5f1d1
commit d459ef5b16
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
keyserver/internal/internal.go
View file

@ -228,8 +228,7 @@ func (a *KeyInternalAPI) QueryKeys(ctx context.Context, req *api.QueryKeysReques
// get cross-signing keys from the database // get cross-signing keys from the database
if err := a.crossSigningKeys(ctx, req, res); err != nil { if err := a.crossSigningKeys(ctx, req, res); err != nil {
// TODO: handle this util.GetLogger(ctx).WithError(err).Error("Failed to retrieve cross-signing keys from database")
util.GetLogger(ctx).WithError(err).Error("Failed to retrieve cross-signing keys")
} }
// make a map from domain to device keys // make a map from domain to device keys
@ -354,6 +353,23 @@ func (a *KeyInternalAPI) queryRemoteKeys(
res.DeviceKeys[userID][deviceID] = keyJSON res.DeviceKeys[userID][deviceID] = keyJSON
} }
} }
for userID, body := range result.MasterKeys {
switch b := body.CrossSigningBody.(type) {
case *gomatrixserverlib.CrossSigningForKey:
res.MasterKeys[userID] = *b
}
}
for userID, body := range result.SelfSigningKeys {
switch b := body.CrossSigningBody.(type) {
case *gomatrixserverlib.CrossSigningForKey:
res.SelfSigningKeys[userID] = *b
}
}
// TODO: do we want to persist these somewhere now
// that we have fetched them?
} }
} }