diff options
Diffstat (limited to 'serverkeyapi')
| -rw-r--r-- | serverkeyapi/inthttp/client.go | 12 | ||||
| -rw-r--r-- | serverkeyapi/inthttp/server.go | 2 | ||||
| -rw-r--r-- | serverkeyapi/serverkeyapi.go | 4 | ||||
| -rw-r--r-- | serverkeyapi/storage/cache/keydb.go | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/serverkeyapi/inthttp/client.go b/serverkeyapi/inthttp/client.go index f986634b..f22b0e31 100644 --- a/serverkeyapi/inthttp/client.go +++ b/serverkeyapi/inthttp/client.go @@ -24,7 +24,7 @@ const ( func NewServerKeyClient( serverKeyAPIURL string, httpClient *http.Client, - immutableCache caching.ImmutableCache, + cache caching.ServerKeyCache, ) (api.ServerKeyInternalAPI, error) { if httpClient == nil { return nil, errors.New("NewRoomserverInternalAPIHTTP: httpClient is <nil>") @@ -32,14 +32,14 @@ func NewServerKeyClient( return &httpServerKeyInternalAPI{ serverKeyAPIURL: serverKeyAPIURL, httpClient: httpClient, - immutableCache: immutableCache, + cache: cache, }, nil } type httpServerKeyInternalAPI struct { serverKeyAPIURL string httpClient *http.Client - immutableCache caching.ImmutableCache + cache caching.ServerKeyCache } func (s *httpServerKeyInternalAPI) KeyRing() *gomatrixserverlib.KeyRing { @@ -71,7 +71,7 @@ func (s *httpServerKeyInternalAPI) StoreKeys( response := api.InputPublicKeysResponse{} for req, res := range results { request.Keys[req] = res - s.immutableCache.StoreServerKey(req, res) + s.cache.StoreServerKey(req, res) } return s.InputPublicKeys(ctx, &request, &response) } @@ -92,7 +92,7 @@ func (s *httpServerKeyInternalAPI) FetchKeys( } now := gomatrixserverlib.AsTimestamp(time.Now()) for req, ts := range requests { - if res, ok := s.immutableCache.GetServerKey(req); ok { + if res, ok := s.cache.GetServerKey(req); ok { if now > res.ValidUntilTS && res.ExpiredTS == gomatrixserverlib.PublicKeyNotExpired { continue } @@ -107,7 +107,7 @@ func (s *httpServerKeyInternalAPI) FetchKeys( } for req, res := range response.Results { result[req] = res - s.immutableCache.StoreServerKey(req, res) + s.cache.StoreServerKey(req, res) } return result, nil } diff --git a/serverkeyapi/inthttp/server.go b/serverkeyapi/inthttp/server.go index d5517e14..9efe7d9d 100644 --- a/serverkeyapi/inthttp/server.go +++ b/serverkeyapi/inthttp/server.go @@ -12,7 +12,7 @@ import ( "github.com/matrix-org/util" ) -func AddRoutes(s api.ServerKeyInternalAPI, internalAPIMux *mux.Router, cache caching.ImmutableCache) { +func AddRoutes(s api.ServerKeyInternalAPI, internalAPIMux *mux.Router, cache caching.ServerKeyCache) { internalAPIMux.Handle(ServerKeyQueryPublicKeyPath, internal.MakeInternalAPI("queryPublicKeys", func(req *http.Request) util.JSONResponse { request := api.QueryPublicKeysRequest{} diff --git a/serverkeyapi/serverkeyapi.go b/serverkeyapi/serverkeyapi.go index 5bf8f67d..ad885270 100644 --- a/serverkeyapi/serverkeyapi.go +++ b/serverkeyapi/serverkeyapi.go @@ -29,7 +29,7 @@ func SetupServerKeyAPIComponent( logrus.WithError(err).Panicf("failed to connect to server key database") } - serverKeyDB, err := cache.NewKeyDatabase(innerDB, base.ImmutableCache) + serverKeyDB, err := cache.NewKeyDatabase(innerDB, base.Caches) if err != nil { logrus.WithError(err).Panicf("failed to set up caching wrapper for server key database") } @@ -77,7 +77,7 @@ func SetupServerKeyAPIComponent( }).Info("Enabled perspective key fetcher") } - inthttp.AddRoutes(&internalAPI, base.InternalAPIMux, base.ImmutableCache) + inthttp.AddRoutes(&internalAPI, base.InternalAPIMux, base.Caches) return &internalAPI } diff --git a/serverkeyapi/storage/cache/keydb.go b/serverkeyapi/storage/cache/keydb.go index a0cdb900..b662e4fd 100644 --- a/serverkeyapi/storage/cache/keydb.go +++ b/serverkeyapi/storage/cache/keydb.go @@ -12,10 +12,10 @@ import ( // the public keys for other matrix servers. type KeyDatabase struct { inner gomatrixserverlib.KeyDatabase - cache caching.ImmutableCache + cache caching.ServerKeyCache } -func NewKeyDatabase(inner gomatrixserverlib.KeyDatabase, cache caching.ImmutableCache) (*KeyDatabase, error) { +func NewKeyDatabase(inner gomatrixserverlib.KeyDatabase, cache caching.ServerKeyCache) (*KeyDatabase, error) { if inner == nil { return nil, errors.New("inner database can't be nil") } |