Merge pull request calebstewart#232 from calebstewart/fix/231/ssl-par…

…sing Fixed ssl parsing in entrypoint/connect command
Mohamed-A-Ragab · Jan 9, 2022 · 3a48308 · 3a48308
2 parents a53fe8f + 7376c87
commit 3a48308
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,9 @@ and simply didn't have the time to go back and retroactively create one.
 
 ## [Unreleased]
 
+### Changed
+- Fixed parsing of `--ssl` argument ([#231](https://github.com/calebstewart/pwncat/issues/231)).
+
 ## [0.5.2] - 2021-12-31
 Bug fixes for argument parsing and improved SSH key support thanks to
 `paramiko-ng`. Moved to a prettier theme for ReadTheDocs documentation.

diff --git a/pwncat/__main__.py b/pwncat/__main__.py
@@ -233,16 +233,20 @@ def main():
             if query_args["certfile"] is not None or query_args["keyfile"] is not None:
                 query_args["ssl"] = True
 
-            if query_args["protocol"] not in [
-                None,
-                "bind",
-                "connect",
-            ] and query_args.get("ssl"):
+            if (
+                query_args["protocol"]
+                not in [
+                    None,
+                    "bind",
+                    "connect",
+                ]
+                and query_args.get("ssl")
+            ):
                 console.log(
                     f"[red]error[/red]: --ssl is incompatible with an [yellow]{query_args['protocol']}[/yellow] protocol"
                 )
                 return
-            elif query_args["protocol"] is not None:
+            elif query_args["protocol"] is not None and query_args.get("ssl"):
                 query_args["protocol"] = "ssl-" + query_args["protocol"]
 
             if (

diff --git a/pwncat/commands/connect.py b/pwncat/commands/connect.py
@@ -202,7 +202,7 @@ def run(self, manager: "pwncat.manager.Manager", args):
                 f"[red]error[/red]: --ssl is incompatible with an [yellow]{query_args['protocol']}[/yellow] protocol"
             )
             return
-        elif query_args["protocol"] is not None:
+        elif query_args["protocol"] is not None and query_args.get("ssl"):
             query_args["protocol"] = "ssl-" + query_args["protocol"]
 
         if (