Merge branch 'hotfix/hostnameregex' into develop

Author: manfred-kaiser

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.6.2
+current_version = 0.6.3
 
 [bumpversion:file:snapcraft.yaml]
 

AppImageBuilder.yml

@@ -17,7 +17,7 @@ AppDir:
     id: at.ssh-mitm.server
     name: ssh-mitm
     icon: ssh-mitm
-    version: 0.6.2
+    version: 0.6.3
     # Set the python executable as entry point
     exec: usr/bin/python3
     # Set the application main script path as argument. Use '$@' to forward CLI parameters

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.6.3] - 2021-11-04
+
+- fixed hostname regex (error in regex)
+
 ## [0.6.2] - 2021-11-04
 
 ### Fixed
@@ -216,7 +220,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - fixed pseudo terminal on exec command
 
-[Unreleased]: https://github.com/ssh-mitm/ssh-mitm/compare/0.6.2...develop
+[Unreleased]: https://github.com/ssh-mitm/ssh-mitm/compare/0.6.3...develop
+[0.6.3]: https://github.com/ssh-mitm/ssh-mitm/compare/0.6.2...0.6.3
 [0.6.2]: https://github.com/ssh-mitm/ssh-mitm/compare/0.6.1...0.6.2
 [0.6.1]: https://github.com/ssh-mitm/ssh-mitm/compare/0.6.0...0.6.1
 [0.6.0]: https://github.com/ssh-mitm/ssh-mitm/compare/0.5.13...0.6.0

snapcraft.yaml

@@ -1,6 +1,6 @@
 name: ssh-mitm # you probably want to 'snapcraft register <name>'
 base: core18 # the base snap is the execution environment for this snap
-version: '0.6.2' # just for humans, typically '1.2+git' or '1.3.2'
+version: '0.6.3' # just for humans, typically '1.2+git' or '1.3.2'
 summary: ssh mitm server for security audits # 79 char long summary
 description: |
   ssh mitm server for security audits supporting

ssh_proxy_server/__version__.py

@@ -1 +1 @@
-version: str = '0.6.2'
+version: str = '0.6.3'

ssh_proxy_server/authentication.py

@@ -69,13 +69,13 @@ def parse_service_accept(self, m):
 
 
 def validate_remote_host(remote_host):
-    if re.match(r"^[^\:]+(:[0-9]{5})?$", 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"^[^\:]+:[^@]+@[^\:]+:([0-9]{5})?$", 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')