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

Adding publicRooms endpoint to federation API (#626)

Browse source 
Signed-off-by: Anton Stuetz <opensource@ti-zero.com>
This commit is contained in:
Anton Stuetz 2019-10-02 20:53:44 +02:00
parent e959927d0a
commit 67d5c5d51e
7 changed files with 33 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/dendrite-federation-api-server/main.go
View file

@ -27,6 +27,7 @@ func main() {
accountDB := base.CreateAccountsDB()
deviceDB := base.CreateDeviceDB()
publicRoomsDB := base.CreatePublicRoomsDB()
keyDB := base.CreateKeyDB()
federation := base.CreateFederationClient()
keyRing := keydb.CreateKeyRing(federation.Client, keyDB)
@ -35,7 +36,7 @@ func main() {
asQuery := base.CreateHTTPAppServiceAPIs()
federationapi.SetupFederationAPIComponent(
base, accountDB, deviceDB, federation, &keyRing,
base, accountDB, deviceDB, publicRoomsDB, federation, &keyRing,
alias, input, query, asQuery,
)

5
cmd/dendrite-monolith-server/main.go
View file

@ -51,6 +51,7 @@ func main() {
accountDB := base.CreateAccountsDB()
deviceDB := base.CreateDeviceDB()
publicRoomsDB := base.CreatePublicRoomsDB()
keyDB := base.CreateKeyDB()
federation := base.CreateFederationClient()
keyRing := keydb.CreateKeyRing(federation.Client, keyDB)
@ -67,9 +68,9 @@ func main() {
federation, &keyRing, alias, input, query,
typingInputAPI, asQuery, transactions.New(), fedSenderAPI,
)
federationapi.SetupFederationAPIComponent(base, accountDB, deviceDB, federation, &keyRing, alias, input, query, asQuery)
federationapi.SetupFederationAPIComponent(base, accountDB, deviceDB, publicRoomsDB, federation, &keyRing, alias, input, query, asQuery)
mediaapi.SetupMediaAPIComponent(base, deviceDB)
publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB)
publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB, publicRoomsDB)
syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, query)
httpHandler := common.WrapHandlerInCORS(base.APIMux)

3
cmd/dendrite-public-rooms-api-server/main.go
View file

@ -25,8 +25,9 @@ func main() {
defer base.Close() // nolint: errcheck
deviceDB := base.CreateDeviceDB()
publicRoomsDB := base.CreatePublicRoomsDB()
publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB)
publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB, publicRoomsDB)
base.SetupAndServeHTTP(string(base.Cfg.Bind.PublicRoomsAPI), string(base.Cfg.Listen.PublicRoomsAPI))

12
common/basecomponent/base.go
View file

@ -19,6 +19,8 @@ import (
"io"
"net/http"
"github.com/matrix-org/dendrite/publicroomsapi/storage"
"github.com/matrix-org/dendrite/common/keydb"
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/naffka"
@ -28,7 +30,7 @@ import (
"github.com/matrix-org/dendrite/common"
"github.com/gorilla/mux"
sarama "gopkg.in/Shopify/sarama.v1"
"gopkg.in/Shopify/sarama.v1"
appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
"github.com/matrix-org/dendrite/common/config"
@ -136,6 +138,14 @@ func (b *BaseDendrite) CreateAccountsDB() *accounts.Database {
return db
}
func (b *BaseDendrite) CreatePublicRoomsDB() *storage.PublicRoomsServerDatabase {
db, err := storage.NewPublicRoomsServerDatabase(string(b.Cfg.Database.PublicRoomsAPI))
if err != nil {
logrus.WithError(err).Panicf("failed to connect to public rooms db")
}
return db
}
// CreateKeyDB creates a new instance of the key database. Should only be called
// once per component.
func (b *BaseDendrite) CreateKeyDB() *keydb.Database {

4
federationapi/federationapi.go
View file

@ -19,6 +19,7 @@ import (
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/dendrite/clientapi/auth/storage/devices"
"github.com/matrix-org/dendrite/common/basecomponent"
"github.com/matrix-org/dendrite/publicroomsapi/storage"
roomserverAPI "github.com/matrix-org/dendrite/roomserver/api"
// TODO: Are we really wanting to pull in the producer from clientapi
@ -33,6 +34,7 @@ func SetupFederationAPIComponent(
base *basecomponent.BaseDendrite,
accountsDB *accounts.Database,
deviceDB *devices.Database,
publicRoomsDB *storage.PublicRoomsServerDatabase,
federation *gomatrixserverlib.FederationClient,
keyRing *gomatrixserverlib.KeyRing,
aliasAPI roomserverAPI.RoomserverAliasAPI,
@ -44,6 +46,6 @@ func SetupFederationAPIComponent(
routing.Setup(
base.APIMux, *base.Cfg, queryAPI, aliasAPI, asAPI,
roomserverProducer, *keyRing, federation, accountsDB, deviceDB,
roomserverProducer, *keyRing, federation, accountsDB, deviceDB, publicRoomsDB,
)
}

11
federationapi/routing/routing.go
View file

@ -17,6 +17,9 @@ package routing
import (
"net/http"
"github.com/matrix-org/dendrite/publicroomsapi/directory"
"github.com/matrix-org/dendrite/publicroomsapi/storage"
"github.com/gorilla/mux"
appserviceAPI "github.com/matrix-org/dendrite/appservice/api"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
@ -50,6 +53,7 @@ func Setup(
federation *gomatrixserverlib.FederationClient,
accountDB *accounts.Database,
deviceDB *devices.Database,
publicRoomsDB *storage.PublicRoomsServerDatabase,
) {
v2keysmux := apiMux.PathPrefix(pathPrefixV2Keys).Subrouter()
v1fedmux := apiMux.PathPrefix(pathPrefixV1Federation).Subrouter()
@ -271,4 +275,11 @@ func Setup(
return Backfill(httpReq, request, query, vars["roomID"], cfg)
},
)).Methods(http.MethodGet)
v1fedmux.Handle("/publicRooms", common.MakeFedAPI(
"federation_publicRooms", cfg.Matrix.ServerName, keys,
func(httpReq *http.Request, request *gomatrixserverlib.FederationRequest) util.JSONResponse {
return directory.GetPostPublicRooms(httpReq, publicRoomsDB)
},
)).Methods(http.MethodGet, http.MethodPost)
}

6
publicroomsapi/publicroomsapi.go
View file

@ -19,7 +19,6 @@ import (
"github.com/matrix-org/dendrite/common/basecomponent"
"github.com/matrix-org/dendrite/publicroomsapi/routing"
"github.com/matrix-org/dendrite/publicroomsapi/storage"
"github.com/sirupsen/logrus"
)
// SetupPublicRoomsAPIComponent sets up and registers HTTP handlers for the PublicRoomsAPI
@ -27,11 +26,8 @@ import (
func SetupPublicRoomsAPIComponent(
base *basecomponent.BaseDendrite,
deviceDB *devices.Database,
publicRoomsDB *storage.PublicRoomsServerDatabase,
) {
publicRoomsDB, err := storage.NewPublicRoomsServerDatabase(string(base.Cfg.Database.PublicRoomsAPI))
if err != nil {
logrus.WithError(err).Panicf("failed to connect to public rooms db")
}
routing.Setup(base.APIMux, deviceDB, publicRoomsDB)
}