From 572a1ca42ade9d6fa1b50d994735fd3e000b403a Mon Sep 17 00:00:00 2001
From: "Paul \"LeoNerd\" Evans" <paul@matrix.org>
Date: Tue, 18 Nov 2014 18:06:35 +0000
Subject: [PATCH] Remember also to UTF-8 decode bytes in room alias names in
directory server URLs
---
synapse/rest/directory.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/synapse/rest/directory.py b/synapse/rest/directory.py
index 5aaac05e28..35300c6a6f 100644
--- a/synapse/rest/directory.py
+++ b/synapse/rest/directory.py
@@ -36,7 +36,9 @@ class ClientDirectoryServer(RestServlet):
@defer.inlineCallbacks
def on_GET(self, request, room_alias):
- room_alias = self.hs.parse_roomalias(urllib.unquote(room_alias))
+ room_alias = self.hs.parse_roomalias(
+ urllib.unquote(room_alias).decode("utf-8")
+ )
dir_handler = self.handlers.directory_handler
res = yield dir_handler.get_association(room_alias)
@@ -54,7 +56,9 @@ class ClientDirectoryServer(RestServlet):
logger.debug("Got content: %s", content)
- room_alias = self.hs.parse_roomalias(urllib.unquote(room_alias))
+ room_alias = self.hs.parse_roomalias(
+ urllib.unquote(room_alias).decode("utf-8")
+ )
logger.debug("Got room name: %s", room_alias.to_string())
@@ -93,7 +97,9 @@ class ClientDirectoryServer(RestServlet):
dir_handler = self.handlers.directory_handler
- room_alias = self.hs.parse_roomalias(urllib.unquote(room_alias))
+ room_alias = self.hs.parse_roomalias(
+ urllib.unquote(room_alias).decode("utf-8")
+ )
yield dir_handler.delete_association(
user.to_string(), room_alias
--
GitLab