mirror of
https://github.com/element-hq/synapse
synced 2024-08-19 09:10:52 +00:00
Remember also to UTF-8 decode bytes in room alias names in directory server URLs
This commit is contained in:
parent
3bfc3dd45b
commit
572a1ca42a
1 changed files with 9 additions and 3 deletions
|
@ -36,7 +36,9 @@ class ClientDirectoryServer(RestServlet):
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def on_GET(self, request, room_alias):
|
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
|
dir_handler = self.handlers.directory_handler
|
||||||
res = yield dir_handler.get_association(room_alias)
|
res = yield dir_handler.get_association(room_alias)
|
||||||
|
@ -54,7 +56,9 @@ class ClientDirectoryServer(RestServlet):
|
||||||
|
|
||||||
logger.debug("Got content: %s", content)
|
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())
|
logger.debug("Got room name: %s", room_alias.to_string())
|
||||||
|
|
||||||
|
@ -93,7 +97,9 @@ class ClientDirectoryServer(RestServlet):
|
||||||
|
|
||||||
dir_handler = self.handlers.directory_handler
|
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(
|
yield dir_handler.delete_association(
|
||||||
user.to_string(), room_alias
|
user.to_string(), room_alias
|
||||||
|
|
Loading…
Reference in a new issue