From f2ef3ee15ad411fa12343addd905540eb3f8c2a9 Mon Sep 17 00:00:00 2001
From: Gero Gerke <11deutron11@gmail.com>
Date: Sun, 8 Jul 2018 20:18:45 +0200
Subject: [PATCH] [#489] Trim room alias when receiving a directory request

---
 .../matrix-org/dendrite/clientapi/routing/routing.go        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go b/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
index 40f50d2bd..32007a13d 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/routing/routing.go
@@ -140,21 +140,21 @@ func Setup(
 	r0mux.Handle("/directory/room/{roomAlias}",
 		common.MakeAuthAPI("directory_room", deviceDB, func(req *http.Request, device *authtypes.Device) util.JSONResponse {
 			vars := mux.Vars(req)
-			return DirectoryRoom(req, vars["roomAlias"], federation, &cfg, aliasAPI)
+			return DirectoryRoom(req, strings.TrimSpace(vars["roomAlias"]), federation, &cfg, aliasAPI)
 		}),
 	).Methods(http.MethodGet, http.MethodOptions)
 
 	r0mux.Handle("/directory/room/{roomAlias}",
 		common.MakeAuthAPI("directory_room", deviceDB, func(req *http.Request, device *authtypes.Device) util.JSONResponse {
 			vars := mux.Vars(req)
-			return SetLocalAlias(req, device, vars["roomAlias"], &cfg, aliasAPI)
+			return SetLocalAlias(req, device, strings.TrimSpace(vars["roomAlias"]), &cfg, aliasAPI)
 		}),
 	).Methods(http.MethodPut, http.MethodOptions)
 
 	r0mux.Handle("/directory/room/{roomAlias}",
 		common.MakeAuthAPI("directory_room", deviceDB, func(req *http.Request, device *authtypes.Device) util.JSONResponse {
 			vars := mux.Vars(req)
-			return RemoveLocalAlias(req, device, vars["roomAlias"], aliasAPI)
+			return RemoveLocalAlias(req, device, strings.TrimSpace(vars["roomAlias"]), aliasAPI)
 		}),
 	).Methods(http.MethodDelete, http.MethodOptions)