Merge pull request #226 from calebstewart/issue-225-ssl-parsing

Issue 225 ssl parsing

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 The Changelog starts with v0.4.1, because we did not keep one before that,
 and simply didn't have the time to go back and retroactively create one.
 
+## [Unreleased]
+
+### Changed
+- Fixed parsing of `--ssl` argument in main entrypoint ([#225](https://github.com/calebstewart/pwncat/issues/225))
+
 ## [0.5.1] - 2021-12-07
 Minor bug fixes. Mainly typos from changing the package name.
 

pwncat/__main__.py

@@ -233,9 +233,9 @@ def main():
             if query_args["certfile"] is not None or query_args["keyfile"] is not None:
                 query_args["ssl"] = True
 
-            if query_args["protocol"] is not None and args.ssl:
+            if query_args["protocol"] not in [None, "bind", "connect"] and args.ssl:
                 console.log(
-                    "[red]error[/red]: --ssl is incompatible with an explicit protocol"
+                    f"[red]error[/red]: --ssl is incompatible with an [yellow]{query_args['protocol']}[/yellow] protocol"
                 )
                 return
 
@@ -296,14 +296,6 @@ def main():
                         if "implant.remote" in fact.types:
                             implants.append((target, users[fact.uid], fact))
 
-                with Progress(
-                    "triggering implant",
-                    "•",
-                    "{task.fields[status]}",
-                    transient=True,
-                    console=console,
-                ) as progress:
-                    task = progress.add_task("", status="...")
                 for target, implant_user, implant in implants:
                     # Check correct query_args["user"]
                     if (
@@ -318,9 +310,7 @@ def main():
                     ):
                         continue
 
-                        progress.update(
+                    manager.log(f"trigger implant: [cyan]{implant.source}[/cyan]")
-                            task, status=f"trying [cyan]{implant.source}[/cyan]"
-                        )
 
                     # Attempt to trigger a new session
                     try:

pwncat/commands/connect.py

@@ -4,7 +4,6 @@ import sys
 
 from rich import box
 from rich.table import Table
-from rich.progress import Progress
 
 import pwncat
 from pwncat.util import console
@@ -255,14 +254,6 @@ class Command(CommandDefinition):
                     if "implant.remote" in fact.types:
                         implants.append((target, users[fact.uid], fact))
 
-            with Progress(
-                "triggering implant",
-                "•",
-                "{task.fields[status]}",
-                transient=True,
-                console=console,
-            ) as progress:
-                task = progress.add_task("", status="...")
             for target, implant_user, implant in implants:
                 # Check correct query_args["user"]
                 if (
@@ -277,9 +268,7 @@ class Command(CommandDefinition):
                 ):
                     continue
 
-                    progress.update(
+                manager.log(f"trigger implant: [cyan]{implant.source}[/cyan]")
-                        task, status=f"trying [cyan]{implant.source}[/cyan]"
-                    )
 
                 # Attempt to trigger a new session
                 try: