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

Check for empty alias parameter and fix route URL

Browse source 
Signed-off-by: Ross Schulman <ross@rbs.io>
This commit is contained in:
Ross Schulman 2017-11-18 21:48:54 -05:00
parent 4fd5aaf93d
commit 47e05f20b7
2 changed files with 50 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/github.com/matrix-org/dendrite/federationapi/routing/query.go
View file

@ -15,27 +15,33 @@
package routing package routing
import ( import (
"net/http"
"fmt" "fmt"
"net/http"
"github.com/matrix-org/util"
"github.com/matrix-org/dendrite/clientapi/httputil" "github.com/matrix-org/dendrite/clientapi/httputil"
"github.com/matrix-org/dendrite/clientapi/jsonerror" "github.com/matrix-org/dendrite/clientapi/jsonerror"
"github.com/matrix-org/dendrite/common/config" "github.com/matrix-org/dendrite/common/config"
"github.com/matrix-org/dendrite/roomserver/api" "github.com/matrix-org/dendrite/roomserver/api"
"github.com/matrix-org/gomatrix" "github.com/matrix-org/gomatrix"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/util"
) )
// RoomAliasToID converts the queried alias into a room ID and returns it // RoomAliasToID converts the queried alias into a room ID and returns it
func RoomAliasToID ( func RoomAliasToID(
httpReq *http.Request, httpReq *http.Request,
federation *gomatrixserverlib.FederationClient, federation *gomatrixserverlib.FederationClient,
cfg config.Dendrite, cfg config.Dendrite,
aliasAPI api.RoomserverAliasAPI, aliasAPI api.RoomserverAliasAPI,
roomAlias string,
) util.JSONResponse { ) util.JSONResponse {
_, domain, err := gomatrixserverlib.SplitID('#', httpReq.FormValue("alias")) roomAlias := httpReq.FormValue("alias")
if roomAlias == "" {
return util.JSONResponse{
Code: 400,
JSON: jsonerror.BadJSON("Must supply room alias parameter."),
}
}
_, domain, err := gomatrixserverlib.SplitID('#', roomAlias)
if err != nil { if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: 400, Code: 400,
@ -43,7 +49,7 @@ func RoomAliasToID (
} }
} }
var resp gomatrixserverlib.RespDirectory var resp gomatrixserverlib.RespDirectory
if domain == cfg.Matrix.ServerName { if domain == cfg.Matrix.ServerName {
queryReq := api.GetAliasRoomIDRequest{Alias: roomAlias} queryReq := api.GetAliasRoomIDRequest{Alias: roomAlias}
@ -52,7 +58,7 @@ var resp gomatrixserverlib.RespDirectory
return httputil.LogThenError(httpReq, err) return httputil.LogThenError(httpReq, err)
} }
if (queryRes.RoomID == "") { if queryRes.RoomID == "" {
// TODO: List servers that are aware of this room alias // TODO: List servers that are aware of this room alias
resp = gomatrixserverlib.RespDirectory{ resp = gomatrixserverlib.RespDirectory{
RoomID: queryRes.RoomID, RoomID: queryRes.RoomID,

19
src/github.com/matrix-org/dendrite/federationapi/routing/routing.go
View file

@ -86,7 +86,7 @@ func Setup(
}, },
)).Methods("POST", "OPTIONS") )).Methods("POST", "OPTIONS")
v1fedmux.Handle("/exchange_third_party_invite/{roomID}", common.MakeFedAPI( v1fedmux.Handle("/exchange_third_party_invite/{roomID}", common.MakeFedAPI(
"exchange_third_party_invite", cfg.Matrix.ServerName, keys, "exchange_third_party_invite", cfg.Matrix.ServerName, keys,
func(httpReq *http.Request, request *gomatrixserverlib.FederationRequest) util.JSONResponse { func(httpReq *http.Request, request *gomatrixserverlib.FederationRequest) util.JSONResponse {
vars := mux.Vars(httpReq) vars := mux.Vars(httpReq)
@ -94,9 +94,9 @@ v1fedmux.Handle("/exchange_third_party_invite/{roomID}", common.MakeFedAPI(
httpReq, request, vars["roomID"], query, cfg, federation, producer, httpReq, request, vars["roomID"], query, cfg, federation, producer,
) )
}, },
)).Methods("PUT", "OPTIONS") )).Methods("PUT", "OPTIONS")
v1fedmux.Handle("/event/{eventID}", common.MakeFedAPI( v1fedmux.Handle("/event/{eventID}", common.MakeFedAPI(
"federation_get_event", cfg.Matrix.ServerName, keys, "federation_get_event", cfg.Matrix.ServerName, keys,
func(httpReq *http.Request, request *gomatrixserverlib.FederationRequest) util.JSONResponse { func(httpReq *http.Request, request *gomatrixserverlib.FederationRequest) util.JSONResponse {
vars := mux.Vars(httpReq) vars := mux.Vars(httpReq)
@ -104,22 +104,21 @@ v1fedmux.Handle("/event/{eventID}", common.MakeFedAPI(
httpReq.Context(), request, cfg, query, time.Now(), keys, vars["eventID"], httpReq.Context(), request, cfg, query, time.Now(), keys, vars["eventID"],
) )
}, },
)).Methods("GET") )).Methods("GET")
v1fedmux.Handle("/version", common.MakeExternalAPI( v1fedmux.Handle("/version", common.MakeExternalAPI(
"federation_version", "federation_version",
func(httpReq *http.Request) util.JSONResponse { func(httpReq *http.Request) util.JSONResponse {
return Version() return Version()
}, },
)).Methods("GET") )).Methods("GET")
v1fedmux.Handle("/query/directory/?room_alias={alias}", common.MakeFedAPI( v1fedmux.Handle("/query/directory/", common.MakeFedAPI(
"federation_query_room_alias", cfg.Matrix.ServerName, keys, "federation_query_room_alias", cfg.Matrix.ServerName, keys,
func(httpReq *http.Request, request *gomatrixserverlib.FederationRequest) util.JSONResponse { func(httpReq *http.Request, request *gomatrixserverlib.FederationRequest) util.JSONResponse {
vars := mux.Vars(httpReq)
return RoomAliasToID( return RoomAliasToID(
httpReq, federation, cfg, aliasAPI, vars["alias"], httpReq, federation, cfg, aliasAPI,
) )
}, },
)).Methods("Get") )).Methods("Get")
} }