Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Commit de0073f

Browse files
committed
Use parse_strings_from_args in more places.
1 parent b9fee28 commit de0073f

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

synapse/federation/transport/server.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -525,10 +525,8 @@ async def on_GET(self, origin, _content, query, room_id, user_id):
525525
Returns:
526526
Tuple[int, object]: (response code, response object)
527527
"""
528-
versions = query.get(b"ver")
529-
if versions is not None:
530-
supported_versions = [v.decode("utf-8") for v in versions]
531-
else:
528+
supported_versions = parse_strings_from_args(query, "ver", encoding="utf-8")
529+
if supported_versions is None:
532530
supported_versions = ["1"]
533531

534532
content = await self.handler.on_make_join_request(
@@ -759,14 +757,14 @@ class OpenIdUserInfo(BaseFederationServerServlet):
759757
REQUIRE_AUTH = False
760758

761759
async def on_GET(self, origin, content, query):
762-
token = query.get(b"access_token", [None])[0]
760+
token = parse_string_from_args(query, "access_token")
763761
if token is None:
764762
return (
765763
401,
766764
{"errcode": "M_MISSING_TOKEN", "error": "Access Token required"},
767765
)
768766

769-
user_id = await self.handler.on_openid_userinfo(token.decode("ascii"))
767+
user_id = await self.handler.on_openid_userinfo(token)
770768

771769
if user_id is None:
772770
return (

0 commit comments

Comments
 (0)