Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-06 01:44:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Making parse_server_name more consistent (#14007)

Browse source 
Fixes #12122
This commit is contained in:
Abdullah Osama 2022-10-11 14:42:11 +02:00 • committed by GitHub
parent 17c031b251
commit a9934d48c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
synapse/util/stringutils.py
View file

@ -86,7 +86,7 @@ def parse_server_name(server_name: str) -> Tuple[str, Optional[int]]:
ValueError if the server name could not be parsed.
"""
try:
if server_name[-1] == "]":
if server_name and server_name[-1] == "]":
# ipv6 literal, hopefully
return server_name, None
@ -123,7 +123,7 @@ def parse_and_validate_server_name(server_name: str) -> Tuple[str, Optional[int]
# that nobody is sneaking IP literals in that look like hostnames, etc.
# look for ipv6 literals
if host[0] == "[":
if host and host[0] == "[":
if host[-1] != "]":
raise ValueError("Mismatched [...] in server name '%s'" % (server_name,))