gitea/mcstatus
1
0
Fork 0
mirror of https://github.com/Dinnerbone/mcstatus.git synced 2026-04-06 03:51:23 +08:00
Code Issues Projects Releases Wiki Activity

Remove validity check for hostname

Browse Source 
Because of how complex this check needs to be (IPv4, IPv6, hostnames,
DNS names, or whatever else the connection software stack is capable
of), removing this regex verifier until a better solution is in place.

Fixes #200
This commit is contained in:
Kevin Tindall
2022-02-05 09:17:15 -06:00
parent b06ec24563
commit 90ce360051
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mcstatus/server.py
View File

@@ -15,22 +15,17 @@ from mcstatus.utils import retry
import dns.resolver import dns.resolver
from dns.exception import DNSException from dns.exception import DNSException
VALID_HOSTNAME_REGEX = re.compile(
r"(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])"
)
__all__ = ["MinecraftServer", "MinecraftBedrockServer"] __all__ = ["MinecraftServer", "MinecraftBedrockServer"]
def ensure_valid_ip(host: object, port: object): def ensure_valid(host: object, port: object):
if not isinstance(host, str): if not isinstance(host, str):
raise TypeError(f"Host must be a string address, got {type(host)} ({host!r})") raise TypeError(f"Host must be a string address, got {type(host)} ({host!r})")
if not isinstance(port, int): if not isinstance(port, int):
raise TypeError(f"Port must be an integer port number, got {type(port)} ({port})") raise TypeError(f"Port must be an integer port number, got {type(port)} ({port})")
if port > 65535 or port < 0: if port > 65535 or port < 0:
raise ValueError(f"Port must be within the allowed range (0-2^16), got {port}") raise ValueError(f"Port must be within the allowed range (0-2^16), got {port}")
if not VALID_HOSTNAME_REGEX.fullmatch(host):
raise ValueError(f"Invalid host address, {host!r} (doesn't match the required pattern)")
class MinecraftServer: class MinecraftServer:
@@ -44,7 +39,7 @@ class MinecraftServer:
""" """
def __init__(self, host: str, port: int = 25565, timeout: float = 3): def __init__(self, host: str, port: int = 25565, timeout: float = 3):
ensure_valid_ip(host, port) ensure_valid(host, port)
self.host = host self.host = host
self.port = port self.port = port
self.timeout = timeout self.timeout = timeout
@@ -209,7 +204,7 @@ class MinecraftBedrockServer:
""" """
def __init__(self, host: str, port: int = 19132, timeout: float = 3): def __init__(self, host: str, port: int = 19132, timeout: float = 3):
ensure_valid_ip(host, port) ensure_valid(host, port)
self.host = host self.host = host
self.port = port self.port = port
self.timeout = timeout self.timeout = timeout