mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-14 11:57:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remember also to UTF-8 decode bytes in room alias names in directory server URLs

Browse source
This commit is contained in:
Paul "LeoNerd" Evans 2014-11-18 18:06:35 +00:00
parent 3bfc3dd45b
commit 572a1ca42a
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
synapse/rest/directory.py
View file

@ -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