57b7fa3db8
* More key tweaks
* Start testing stuff
* Move responsibility for generating local keys into server key API, don't register prom in caches unless needed, start tests
* Don't store our own keys in the database
* Don't store our own keys in the database
* Don't run tests for now
* Tweak caching behaviour, update tests
* Update comments, add fixes from forward-merge
* Debug logging
* Debug logging
* Perform final comparison against original set of requests
* oops
* Fetcher timeouts
* Fetcher timeouts
* missing func
* Tweaks
* Update gomatrixserverlib
* Fix Federation API test
* Break up FetchKeys
* Add comments to caching
* Add URL check in test
* Partially revert "Move responsibility for generating local keys into server key API, don't register prom in caches unless needed, start tests"
This reverts commit d7eb54c5b3.
* Fix federation API test
* Fix internal cache stuff again
* Fix server key API test
* Update comments
* Update comments from review
* Fix lint
57 lines
2.1 KiB
Go
57 lines
2.1 KiB
Go
package caching
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
)
|
|
|
|
const (
|
|
ServerKeyCacheName = "server_key"
|
|
ServerKeyCacheMaxEntries = 4096
|
|
ServerKeyCacheMutable = true
|
|
)
|
|
|
|
// ServerKeyCache contains the subset of functions needed for
|
|
// a server key cache.
|
|
type ServerKeyCache interface {
|
|
// request -> timestamp is emulating gomatrixserverlib.FetchKeys:
|
|
// https://github.com/matrix-org/gomatrixserverlib/blob/f69539c86ea55d1e2cc76fd8e944e2d82d30397c/keyring.go#L95
|
|
// The timestamp should be the timestamp of the event that is being
|
|
// verified. We will not return keys from the cache that are not valid
|
|
// at this timestamp.
|
|
GetServerKey(request gomatrixserverlib.PublicKeyLookupRequest, timestamp gomatrixserverlib.Timestamp) (response gomatrixserverlib.PublicKeyLookupResult, ok bool)
|
|
|
|
// request -> result is emulating gomatrixserverlib.StoreKeys:
|
|
// https://github.com/matrix-org/gomatrixserverlib/blob/f69539c86ea55d1e2cc76fd8e944e2d82d30397c/keyring.go#L112
|
|
StoreServerKey(request gomatrixserverlib.PublicKeyLookupRequest, response gomatrixserverlib.PublicKeyLookupResult)
|
|
}
|
|
|
|
func (c Caches) GetServerKey(
|
|
request gomatrixserverlib.PublicKeyLookupRequest,
|
|
timestamp gomatrixserverlib.Timestamp,
|
|
) (gomatrixserverlib.PublicKeyLookupResult, bool) {
|
|
key := fmt.Sprintf("%s/%s", request.ServerName, request.KeyID)
|
|
val, found := c.ServerKeys.Get(key)
|
|
if found && val != nil {
|
|
if keyLookupResult, ok := val.(gomatrixserverlib.PublicKeyLookupResult); ok {
|
|
if !keyLookupResult.WasValidAt(timestamp, true) {
|
|
// The key wasn't valid at the requested timestamp so don't
|
|
// return it. The caller will have to work out what to do.
|
|
c.ServerKeys.Unset(key)
|
|
return gomatrixserverlib.PublicKeyLookupResult{}, false
|
|
}
|
|
return keyLookupResult, true
|
|
}
|
|
}
|
|
return gomatrixserverlib.PublicKeyLookupResult{}, false
|
|
}
|
|
|
|
func (c Caches) StoreServerKey(
|
|
request gomatrixserverlib.PublicKeyLookupRequest,
|
|
response gomatrixserverlib.PublicKeyLookupResult,
|
|
) {
|
|
key := fmt.Sprintf("%s/%s", request.ServerName, request.KeyID)
|
|
c.ServerKeys.Set(key, response)
|
|
}
|