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

Tidy up

Browse source
This commit is contained in:
Neil Alexander 2020-05-22 10:26:32 +01:00
parent 5199cb5cee
commit a7ac34dad6
5 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/dendrite-demo-libp2p/main.go
View file

@ -178,13 +178,10 @@ func main() {
publicroomsapi.SetupPublicRoomsAPIComponent(&base.Base, deviceDB, publicRoomsDB, rsAPI, federation, nil) // Check this later publicroomsapi.SetupPublicRoomsAPIComponent(&base.Base, deviceDB, publicRoomsDB, rsAPI, federation, nil) // Check this later
syncapi.SetupSyncAPIComponent(&base.Base, deviceDB, accountDB, rsAPI, federation, &cfg) syncapi.SetupSyncAPIComponent(&base.Base, deviceDB, accountDB, rsAPI, federation, &cfg)
httpHandler := internal.WrapHandlerInCORS(base.Base.PublicAPIMux)
// Set up the API endpoints we handle. /metrics is for prometheus, and is // Set up the API endpoints we handle. /metrics is for prometheus, and is
// not wrapped by CORS, while everything else is // not wrapped by CORS, while everything else is
http.Handle("/metrics", promhttp.Handler()) http.Handle("/metrics", promhttp.Handler())
http.Handle("/_matrix", httpHandler) http.Handle("/_matrix", internal.WrapHandlerInCORS(base.Base.PublicAPIMux))
http.Handle("/_matrix", httpHandler)
if base.Base.EnableHTTPAPIs { if base.Base.EnableHTTPAPIs {
http.Handle("/api/", base.Base.InternalAPIMux) http.Handle("/api/", base.Base.InternalAPIMux)
} }

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

@ -91,14 +91,12 @@ func main() {
publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB, publicRoomsDB, rsAPI, federation, nil) publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB, publicRoomsDB, rsAPI, federation, nil)
syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, rsAPI, federation, cfg) syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, rsAPI, federation, cfg)
httpHandler := internal.WrapHandlerInCORS(base.PublicAPIMux)
// Set up the API endpoints we handle. /metrics is for prometheus, and is // Set up the API endpoints we handle. /metrics is for prometheus, and is
// not wrapped by CORS, while everything else is // not wrapped by CORS, while everything else is
if cfg.Metrics.Enabled { if cfg.Metrics.Enabled {
http.Handle("/metrics", internal.WrapHandlerInBasicAuth(promhttp.Handler(), cfg.Metrics.BasicAuth)) http.Handle("/metrics", internal.WrapHandlerInBasicAuth(promhttp.Handler(), cfg.Metrics.BasicAuth))
} }
http.Handle("/_matrix", httpHandler) http.Handle("/_matrix", internal.WrapHandlerInCORS(base.PublicAPIMux))
if base.EnableHTTPAPIs { if base.EnableHTTPAPIs {
http.Handle("/api/", base.InternalAPIMux) http.Handle("/api/", base.InternalAPIMux)
} }

3
cmd/dendritejs/main.go
View file

@ -227,8 +227,7 @@ func main() {
publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB, publicRoomsDB, rsAPI, federation, p2pPublicRoomProvider) publicroomsapi.SetupPublicRoomsAPIComponent(base, deviceDB, publicRoomsDB, rsAPI, federation, p2pPublicRoomProvider)
syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, rsAPI, federation, cfg) syncapi.SetupSyncAPIComponent(base, deviceDB, accountDB, rsAPI, federation, cfg)
httpHandler := internal.WrapHandlerInCORS(base.PublicAPIMux) http.Handle("/_matrix", internal.WrapHandlerInCORS(base.PublicAPIMux))
http.Handle("/_matrix", httpHandler)
if base.EnableHTTPAPIs { if base.EnableHTTPAPIs {
http.Handle("/api/", base.InternalAPIMux) http.Handle("/api/", base.InternalAPIMux)
} }

2
internal/basecomponent/base.go
View file

@ -225,7 +225,7 @@ func (b *BaseDendrite) SetupAndServeHTTP(bindaddr string, listenaddr string) {
internal.SetupHTTPAPI( internal.SetupHTTPAPI(
http.DefaultServeMux, http.DefaultServeMux,
internal.WrapHandlerInCORS(b.PublicAPIMux), b.PublicAPIMux,
b.InternalAPIMux, b.InternalAPIMux,
b.Cfg, b.Cfg,
b.EnableHTTPAPIs, b.EnableHTTPAPIs,

2
internal/httpapi.go
View file

@ -191,7 +191,7 @@ func SetupHTTPAPI(servMux *http.ServeMux, publicApiMux http.Handler, internalApi
if enableHTTPAPIs { if enableHTTPAPIs {
servMux.Handle("/api/", internalApiMux) servMux.Handle("/api/", internalApiMux)
} }
servMux.Handle("/_matrix", publicApiMux) servMux.Handle("/_matrix", WrapHandlerInCORS(publicApiMux))
} }
// WrapHandlerInBasicAuth adds basic auth to a handler. Only used for /metrics // WrapHandlerInBasicAuth adds basic auth to a handler. Only used for /metrics