sigb.us/dendrite
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity

Tweak /key/v2/server

Browse source
This commit is contained in:
Neil Alexander 2022-11-16 09:16:07 +00:00
parent 9b8bb55430
commit deddf686b9
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
federationapi/routing/keys.go
View file

@ -146,10 +146,10 @@ func localKeys(cfg *config.FederationAPI, serverName gomatrixserverlib.ServerNam
var keys gomatrixserverlib.ServerKeys var keys gomatrixserverlib.ServerKeys
var virtualHost *config.VirtualHost var virtualHost *config.VirtualHost
for _, v := range cfg.Matrix.VirtualHosts { for _, v := range cfg.Matrix.VirtualHosts {
if v.ServerName != serverName { if v.ServerName == serverName {
continue virtualHost = v
break
} }
virtualHost = v
} }
if virtualHost == nil { if virtualHost == nil {
@ -188,14 +188,15 @@ func localKeys(cfg *config.FederationAPI, serverName gomatrixserverlib.ServerNam
return nil, err return nil, err
} }
keys.Raw, err = gomatrixserverlib.SignJSON( identity, err := cfg.Matrix.SigningIdentityFor(serverName)
string(serverName), cfg.Matrix.KeyID, cfg.Matrix.PrivateKey, toSign,
)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &keys, nil keys.Raw, err = gomatrixserverlib.SignJSON(
string(identity.ServerName), identity.KeyID, identity.PrivateKey, toSign,
)
return &keys, err
} }
func NotaryKeys( func NotaryKeys(