Merge pull request #447 from GoSecure/fix-mitm-hostip-logs

Add listenAddress, listenPort and hostIp to JSON logs on MITM start

CHANGELOG.adoc

@@ -13,6 +13,7 @@ For a detailed view of what has changed, refer to the {uri-repo}/commits/master[
 
 * Support for RDP version 10.11 ({uri-issue}433[#433])
 * Support for Python 3.11 by updating PyAV to get pre-built binary wheels ({uri-issue}437[#437], {uri-issue}438[#438])
+* MITM start and termination log messages are now part of the JSON logs ({uri-issue}447[#447])
 
 === Bug fixes
 

bin/pyrdp-mitm.py

@@ -27,7 +27,7 @@
 
 def main():
     config = configure()
-    logger = logging.getLogger(LOGGER_NAMES.PYRDP)
+    logger = logging.getLogger(LOGGER_NAMES.MITM_CONNECTIONS)
 
     # Create a listening socket to accept connections.
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -50,8 +50,8 @@ def main():
     params = {"address": config.listenAddress, "port": config.listenPort}
 
     if "HOST_IP" in os.environ:
-        message += ". Host IP: %(host_ip)s"
-        params["host_ip"] = os.environ["HOST_IP"]
+        message += ". Host IP: %(hostIp)s"
+        params["hostIp"] = os.environ["HOST_IP"]
 
     logger.info(message, params)