mirror of
https://github.com/1f349/dendrite.git
synced 2024-12-28 19:16:29 +00:00
7d6461dd3c
* Server key API (works for monolith but not for polylith yet) * Re-enable caching on server key API component * Groundwork for HTTP APIs for server key API * Hopefully implement HTTP for server key API * Simplify public key request marshalling from map keys * Update gomatrixserverlib * go mod tidy * Common -> internal * remove keyring.go * Update Docker Hub for server key API * YAML is funny about indentation * Wire in new server key API into hybrid monolith mode * Create maps * Route server key API endpoints on internal API mux * Fix server key API URLs * Add fetcher behaviour into server key API implementation * Return error if we failed to fetch some keys * Return results anyway * Move things about a bit * Remove unused code * Fix comments, don't use federation sender URL in polylith mode * Add server_key_api to sample config * Review comments * HTTP API to cache keys that have been requested * Overwrite server_key_api listen in monolith hybrid mode
69 lines
1.8 KiB
Go
69 lines
1.8 KiB
Go
package cache
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
|
|
"github.com/matrix-org/dendrite/internal/caching"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
)
|
|
|
|
// A Database implements gomatrixserverlib.KeyDatabase and is used to store
|
|
// the public keys for other matrix servers.
|
|
type KeyDatabase struct {
|
|
inner gomatrixserverlib.KeyDatabase
|
|
cache caching.ImmutableCache
|
|
}
|
|
|
|
func NewKeyDatabase(inner gomatrixserverlib.KeyDatabase, cache caching.ImmutableCache) (*KeyDatabase, error) {
|
|
if inner == nil {
|
|
return nil, errors.New("inner database can't be nil")
|
|
}
|
|
if cache == nil {
|
|
return nil, errors.New("cache can't be nil")
|
|
}
|
|
return &KeyDatabase{
|
|
inner: inner,
|
|
cache: cache,
|
|
}, nil
|
|
}
|
|
|
|
// FetcherName implements KeyFetcher
|
|
func (d KeyDatabase) FetcherName() string {
|
|
return "InMemoryKeyCache"
|
|
}
|
|
|
|
// FetchKeys implements gomatrixserverlib.KeyDatabase
|
|
func (d *KeyDatabase) FetchKeys(
|
|
ctx context.Context,
|
|
requests map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.Timestamp,
|
|
) (map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult, error) {
|
|
results := make(map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult)
|
|
for req := range requests {
|
|
if res, cached := d.cache.GetServerKey(req); cached {
|
|
results[req] = res
|
|
delete(requests, req)
|
|
}
|
|
}
|
|
fromDB, err := d.inner.FetchKeys(ctx, requests)
|
|
if err != nil {
|
|
return results, err
|
|
}
|
|
for req, res := range fromDB {
|
|
results[req] = res
|
|
d.cache.StoreServerKey(req, res)
|
|
}
|
|
return results, nil
|
|
}
|
|
|
|
// StoreKeys implements gomatrixserverlib.KeyDatabase
|
|
func (d *KeyDatabase) StoreKeys(
|
|
ctx context.Context,
|
|
keyMap map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult,
|
|
) error {
|
|
for req, res := range keyMap {
|
|
d.cache.StoreServerKey(req, res)
|
|
}
|
|
return d.inner.StoreKeys(ctx, keyMap)
|
|
}
|