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

…arsing Issue 225 ssl parsing
Mohamed-A-Ragab · Dec 26, 2021 · 7c1eb98 · 7c1eb98
2 parents f8f9598 + b931f94
commit 7c1eb98
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 72 deletions.
diff --git a/CHANGELOG.md b/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.
 

diff --git a/pwncat/__main__.py b/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,41 +296,31 @@ 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 (
-                            query_args["user"] is not None
-                            and implant_user.name != query_args["user"]
-                        ):
-                            continue
-                        # Check correct platform
-                        if (
-                            query_args["platform"] is not None
-                            and target.platform != query_args["platform"]
-                        ):
-                            continue
-
-                        progress.update(
-                            task, status=f"trying [cyan]{implant.source}[/cyan]"
-                        )
+                for target, implant_user, implant in implants:
+                    # Check correct query_args["user"]
+                    if (
+                        query_args["user"] is not None
+                        and implant_user.name != query_args["user"]
+                    ):
+                        continue
+                    # Check correct platform
+                    if (
+                        query_args["platform"] is not None
+                        and target.platform != query_args["platform"]
+                    ):
+                        continue
 
-                        # Attempt to trigger a new session
-                        try:
-                            session = implant.trigger(manager, target)
-                            manager.target = session
-                            used_implant = implant
-                            break
-                        except ModuleFailed:
-                            db.transaction_manager.commit()
-                            continue
+                    manager.log(f"trigger implant: [cyan]{implant.source}[/cyan]")
+
+                    # Attempt to trigger a new session
+                    try:
+                        session = implant.trigger(manager, target)
+                        manager.target = session
+                        used_implant = implant
+                        break
+                    except ModuleFailed:
+                        db.transaction_manager.commit()
+                        continue
 
             if manager.target is not None:
                 manager.target.log(

diff --git a/pwncat/commands/connect.py b/pwncat/commands/connect.py
@@ -4,7 +4,6 @@
 
 from rich import box
 from rich.table import Table
-from rich.progress import Progress
 
 import pwncat
 from pwncat.util import console
@@ -255,41 +254,31 @@ def run(self, manager: "pwncat.manager.Manager", args):
                     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 (
-                        query_args["user"] is not None
-                        and implant_user.name != query_args["user"]
-                    ):
-                        continue
-                    # Check correct platform
-                    if (
-                        query_args["platform"] is not None
-                        and target.platform != query_args["platform"]
-                    ):
-                        continue
-
-                    progress.update(
-                        task, status=f"trying [cyan]{implant.source}[/cyan]"
-                    )
-
-                    # Attempt to trigger a new session
-                    try:
-                        session = implant.trigger(manager, target)
-                        manager.target = session
-                        used_implant = implant
-                        break
-                    except (ChannelError, PlatformError, ModuleFailed):
-                        db.transaction_manager.commit()
-                        continue
+            for target, implant_user, implant in implants:
+                # Check correct query_args["user"]
+                if (
+                    query_args["user"] is not None
+                    and implant_user.name != query_args["user"]
+                ):
+                    continue
+                # Check correct platform
+                if (
+                    query_args["platform"] is not None
+                    and target.platform != query_args["platform"]
+                ):
+                    continue
+
+                manager.log(f"trigger implant: [cyan]{implant.source}[/cyan]")
+
+                # Attempt to trigger a new session
+                try:
+                    session = implant.trigger(manager, target)
+                    manager.target = session
+                    used_implant = implant
+                    break
+                except (ChannelError, PlatformError, ModuleFailed):
+                    db.transaction_manager.commit()
+                    continue
 
         if used_implant is not None:
             manager.target.log(f"connected via {used_implant.title(manager.target)}")