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

Revert "Add missing file"

Browse source 
This reverts commit 955f949d22.
This commit is contained in:
Till Faelligen 2024-01-06 21:38:50 +01:00
parent 955f949d22
commit 705a5cfb74
No known key found for this signature in database
GPG key ID: 3DF82D8AB9211D4E
1 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
federationapi/routing/keys.go
View file

@ -17,7 +17,6 @@ package routing
import ( import (
"encoding/json" "encoding/json"
"net/http" "net/http"
"strings"
"time" "time"
clienthttputil "github.com/matrix-org/dendrite/clientapi/httputil" clienthttputil "github.com/matrix-org/dendrite/clientapi/httputil"
@ -203,13 +202,7 @@ func NotaryKeys(
fsAPI federationAPI.FederationInternalAPI, fsAPI federationAPI.FederationInternalAPI,
req *gomatrixserverlib.PublicKeyNotaryLookupRequest, req *gomatrixserverlib.PublicKeyNotaryLookupRequest,
) util.JSONResponse { ) util.JSONResponse {
// strip any additional :PORT from httpReq.Host serverName := spec.ServerName(httpReq.Host) // TODO: this is not ideal
s := httpReq.Host
if i := strings.Index(s, ":"); i > 0 {
s = httpReq.Host[:i]
}
serverName := spec.ServerName(s)
if !cfg.Matrix.IsLocalServerName(serverName) { if !cfg.Matrix.IsLocalServerName(serverName) {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusNotFound, Code: http.StatusNotFound,
@ -231,7 +224,6 @@ func NotaryKeys(
for serverName, kidToCriteria := range req.ServerKeys { for serverName, kidToCriteria := range req.ServerKeys {
var keyList []gomatrixserverlib.ServerKeys var keyList []gomatrixserverlib.ServerKeys
// Returns _all_ of our keys, incl. old keys, no matter what was requested.
if serverName == cfg.Matrix.ServerName { if serverName == cfg.Matrix.ServerName {
if k, err := localKeys(cfg, serverName); err == nil { if k, err := localKeys(cfg, serverName); err == nil {
keyList = append(keyList, *k) keyList = append(keyList, *k)