mirror of
https://github.com/matrix-org/dendrite
synced 2024-12-14 20:03:52 +01:00
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
96 lines
3 KiB
Go
96 lines
3 KiB
Go
package serverkeyapi
|
|
|
|
import (
|
|
"crypto/ed25519"
|
|
"encoding/base64"
|
|
|
|
"github.com/gorilla/mux"
|
|
"github.com/matrix-org/dendrite/internal/caching"
|
|
"github.com/matrix-org/dendrite/internal/config"
|
|
"github.com/matrix-org/dendrite/serverkeyapi/api"
|
|
"github.com/matrix-org/dendrite/serverkeyapi/internal"
|
|
"github.com/matrix-org/dendrite/serverkeyapi/inthttp"
|
|
"github.com/matrix-org/dendrite/serverkeyapi/storage"
|
|
"github.com/matrix-org/dendrite/serverkeyapi/storage/cache"
|
|
"github.com/matrix-org/gomatrixserverlib"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
// AddInternalRoutes registers HTTP handlers for the internal API. Invokes functions
|
|
// on the given input API.
|
|
func AddInternalRoutes(router *mux.Router, intAPI api.ServerKeyInternalAPI, caches *caching.Caches) {
|
|
inthttp.AddRoutes(intAPI, router, caches)
|
|
}
|
|
|
|
// NewInternalAPI returns a concerete implementation of the internal API. Callers
|
|
// can call functions directly on the returned API or via an HTTP interface using AddInternalRoutes.
|
|
func NewInternalAPI(
|
|
cfg *config.Dendrite,
|
|
fedClient *gomatrixserverlib.FederationClient,
|
|
caches *caching.Caches,
|
|
) api.ServerKeyInternalAPI {
|
|
innerDB, err := storage.NewDatabase(
|
|
string(cfg.Database.ServerKey),
|
|
cfg.DbProperties(),
|
|
cfg.Matrix.ServerName,
|
|
cfg.Matrix.PrivateKey.Public().(ed25519.PublicKey),
|
|
cfg.Matrix.KeyID,
|
|
)
|
|
if err != nil {
|
|
logrus.WithError(err).Panicf("failed to connect to server key database")
|
|
}
|
|
|
|
serverKeyDB, err := cache.NewKeyDatabase(innerDB, caches)
|
|
if err != nil {
|
|
logrus.WithError(err).Panicf("failed to set up caching wrapper for server key database")
|
|
}
|
|
|
|
internalAPI := internal.ServerKeyAPI{
|
|
ServerName: cfg.Matrix.ServerName,
|
|
ServerPublicKey: cfg.Matrix.PrivateKey.Public().(ed25519.PublicKey),
|
|
ServerKeyID: cfg.Matrix.KeyID,
|
|
ServerKeyValidity: cfg.Matrix.KeyValidityPeriod,
|
|
FedClient: fedClient,
|
|
OurKeyRing: gomatrixserverlib.KeyRing{
|
|
KeyFetchers: []gomatrixserverlib.KeyFetcher{
|
|
&gomatrixserverlib.DirectKeyFetcher{
|
|
Client: fedClient.Client,
|
|
},
|
|
},
|
|
KeyDatabase: serverKeyDB,
|
|
},
|
|
}
|
|
|
|
var b64e = base64.StdEncoding.WithPadding(base64.NoPadding)
|
|
for _, ps := range cfg.Matrix.KeyPerspectives {
|
|
perspective := &gomatrixserverlib.PerspectiveKeyFetcher{
|
|
PerspectiveServerName: ps.ServerName,
|
|
PerspectiveServerKeys: map[gomatrixserverlib.KeyID]ed25519.PublicKey{},
|
|
Client: fedClient.Client,
|
|
}
|
|
|
|
for _, key := range ps.Keys {
|
|
rawkey, err := b64e.DecodeString(key.PublicKey)
|
|
if err != nil {
|
|
logrus.WithError(err).WithFields(logrus.Fields{
|
|
"server_name": ps.ServerName,
|
|
"public_key": key.PublicKey,
|
|
}).Warn("Couldn't parse perspective key")
|
|
continue
|
|
}
|
|
perspective.PerspectiveServerKeys[key.KeyID] = rawkey
|
|
}
|
|
|
|
internalAPI.OurKeyRing.KeyFetchers = append(
|
|
internalAPI.OurKeyRing.KeyFetchers,
|
|
perspective,
|
|
)
|
|
|
|
logrus.WithFields(logrus.Fields{
|
|
"server_name": ps.ServerName,
|
|
"num_public_keys": len(ps.Keys),
|
|
}).Info("Enabled perspective key fetcher")
|
|
}
|
|
|
|
return &internalAPI
|
|
}
|