fixed hostname regex

manfred-kaiser · manfred-kaiser · commit 14ae61baef17 · 2021-11-04T18:00:35.000+01:00
diff --git a/ssh_proxy_server/authentication.py b/ssh_proxy_server/authentication.py
@@ -63,15 +63,15 @@ def parse_service_accept(self, m):
 
 
 def validate_remote_host(remote_host):
-    if re.match(r"^[\w.]+(:[0-9]+)?$", remote_host):
+    if re.match(r"^[^\:]+(:[0-9]{5})?$", remote_host):
         return remote_host
     raise argparse.ArgumentTypeError('remot host must be in format hostname:port')
 
 
 def validate_honeypot(remote_host):
-    if re.match(r"^[\S]+:[\S]+@[\w.]+(:[0-9]+)?$", remote_host):
+    if re.match(r"^[^\:]+:[^@]+@[^\:]+:([0-9]{5})?$", remote_host):
         return remote_host
-    raise argparse.ArgumentTypeError('honeypot address must be in format username_password@hostname:port')
+    raise argparse.ArgumentTypeError('honeypot address must be in format username:password@hostname:port')
 
 
 class Authenticator(BaseModule):
