pyntcli 0.1.107__py3-none-any.whl → 0.1.109__py3-none-any.whl

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.107"
+__version__ = "0.1.109"

pyntcli/commands/burp.py

@@ -10,6 +10,9 @@ from subprocess import Popen, PIPE
 from functools import partial
 import xmltodict
 import base64
+
+from pyntcli.store import store
+
 import pyntcli.log.log as log
 from xml.parsers.expat import ExpatError
 
@@ -19,9 +22,6 @@ from pyntcli.commands import util, sub_command
 from pyntcli.ui import report as cli_reporter
 from pyntcli.transport import pynt_requests
 
-PYNT_CONTAINER_INTERNAL_PORT = "5001"
-PYNT_CONTAINER_INTERNAL_PROXY_PORT = "6666"
-
 methods = [
     "get",
     "post",
@@ -140,9 +140,8 @@ def burp_usage():
         .with_line("Options:", style=ui_thread.PrinterText.HEADER)
         .with_line("\t--xml - Path to the xml to run tests on")
         .with_line('\t--captured-domains - Pynt will scan only these domains and subdomains. For all domains write "*"')
-        .with_line("\t--port - Set the port pynt will listen to (DEFAULT: 5001)")
+        .with_line("\t--port - Set the port pynt will listen to (DEFAULT: random)")
         .with_line("\t--ca-path - The path to the CA file in PEM format")
-        .with_line("\t--proxy-port - Set the port proxied traffic should be routed to (DEFAULT: 6666)")
         .with_line("\t--report - If present will save the generated report in this path.")
         .with_line("\t--insecure - Use when target uses self signed certificates")
         .with_line("\t--application-id - Attach the scan to an application, you can find the ID in your applications area at app.pynt.io")
@@ -165,23 +164,23 @@ class BurpCommand(sub_command.PyntSubCommand):
 
     def add_cmd(self, parent: argparse._SubParsersAction) -> argparse.ArgumentParser:
         burp_cmd = parent.add_parser(self.name)
-        burp_cmd.add_argument("--port", "-p", help="", type=int, default=5001)
-        burp_cmd.add_argument("--proxy-port", help="", type=int, default=6666)
+        burp_cmd.add_argument("--port", "-p", help="", type=int, default=util.find_open_port())
         burp_cmd.add_argument("--xml", help="", default="", required=True)
         burp_cmd.add_argument("--ca-path", type=str, default="")
         burp_cmd.add_argument("--report", type=str, default="")
+        burp_cmd.add_argument("--save-collection", action="store_true", help="Get postman collection")
         burp_cmd.add_argument("--captured-domains", nargs="+", help="", default="")
         burp_cmd.add_argument("--severity-level", choices=["all", "medium", "high", "critical", "none"], default="none")
         burp_cmd.print_usage = self.print_usage
         burp_cmd.print_help = self.print_usage
         return burp_cmd
 
-    def _updated_environment(self, args):
+    def _updated_environment(self, proxy_port: int):
         env_copy = deepcopy(os.environ)
         return env_copy.update(
             {
-                "HTTP_PROXY": "http://localhost:{}".format(args.proxy_port),
-                "HTTPS_PROXY": "http://localhost:{}".format(args.proxy_port),
+                "HTTP_PROXY": "http://localhost:{}".format(proxy_port),
+                "HTTPS_PROXY": "http://localhost:{}".format(proxy_port),
             }
         )
 
@@ -226,12 +225,43 @@ class BurpCommand(sub_command.PyntSubCommand):
             ui_thread.print("Error in polling for scan report: {}".format(res.text))
             return
 
+    def _get_postman_collection(self, args):
+        while True:
+            res = pynt_requests.get(
+                self.proxy_server_base_url.format(args.port)
+                + "/collection",
+                params={"scanId": self.scan_id},
+            )
+            if res.status_code == HTTPStatus.OK:
+                return res.text
+            if res.status_code == HTTPStatus.ACCEPTED:
+                time.sleep(self.proxy_sleep_interval)
+                continue
+            if res.status_code == 517:  # pynt did not recieve any requests
+                ui_thread.print(
+                    ui_thread.PrinterText(
+                        res.json()["message"], ui_thread.PrinterText.WARNING
+                    )
+                )
+                return
+            if res.status_code == 404:
+                ui_thread.print(
+                    ui_thread.PrinterText(
+                        "No collection found", ui_thread.PrinterText.WARNING
+                    )
+                )
+                return
+            ui_thread.print("Error in polling for scan report: {}".format(res.text))
+            return
+
     def run_cmd(self, args: argparse.Namespace):
+        proxy_port = util.find_open_port()
+
         container_config = pynt_container.DockerContainerConfig(
             args,
             "proxy",
-            pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PORT, args.port, "--port"),
-            pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PROXY_PORT, args.proxy_port, "--proxy-port"),
+            pynt_container.api_port(args.port),
+            pynt_container.proxy_port(proxy_port),
         )
 
         for host in args.captured_domains:
@@ -303,7 +333,7 @@ class BurpCommand(sub_command.PyntSubCommand):
 
         self._start_proxy(args)
 
-        run_burp_xml(doc, args.proxy_port)
+        run_burp_xml(doc, proxy_port)
 
         self._stop_proxy(args)
 
@@ -315,10 +345,10 @@ class BurpCommand(sub_command.PyntSubCommand):
         )
 
         with ui_thread.progress(
-            "ws://localhost:{}/progress?scanId={}".format(args.port, self.scan_id),
-            partial(lambda *args: None),
-            "scan in progress...",
-            100,
+                "ws://localhost:{}/progress?scanId={}".format(args.port, self.scan_id),
+                partial(lambda *args: None),
+                "scan in progress...",
+                100,
         ):
             html_report = self._get_report(args, "html")
             html_report_path = os.path.join(
@@ -330,6 +360,11 @@ class BurpCommand(sub_command.PyntSubCommand):
                 tempfile.gettempdir(), "pynt_report_{}.json".format(int(time.time()))
             )
 
+            collection = self._get_postman_collection(args) if args.save_collection else None
+            collection_path = os.path.join(
+                store.get_default_store_dir(), "postman_collection_{}.json".format(int(time.time()))
+            )
+
             if "report" in args and args.report:
                 full_path = os.path.abspath(args.report)
                 html_report_path = util.get_user_report_path(full_path, "html")
@@ -346,6 +381,16 @@ class BurpCommand(sub_command.PyntSubCommand):
                 reporter = cli_reporter.PyntReporter(json_report_path)
                 reporter.print_summary()
 
+            if collection:
+                with open(collection_path, "w", encoding="utf-8") as collection_file:
+                    collection_file.write(collection)
+                ui_thread.print(
+                    ui_thread.PrinterText(
+                        "Postman collection saved at: {}".format(collection_path),
+                        ui_thread.PrinterText.INFO,
+                    )
+                )
+
             if json_report:
                 json_obj = json.loads(json_report)
                 if json_obj:

pyntcli/commands/command.py

@@ -15,9 +15,6 @@ from pyntcli.commands import util, sub_command
 from pyntcli.ui import report as cli_reporter
 from pyntcli.transport import pynt_requests
 
-PYNT_CONTAINER_INTERNAL_PORT = "5001"
-PYNT_CONTAINER_INTERNAL_PROXY_PORT = "6666"
-
 
 def command_usage():
     return (
@@ -32,7 +29,7 @@ def command_usage():
         .with_line("\t--cmd - The command that runs the functional tests")
         .with_line('\t--captured-domains - Pynt will scan only these domains and subdomains. For all domains write "*"')
         .with_line('\t--test-name - A name for your Pynt scan')
-        .with_line("\t--port - Set the port pynt will listen to (DEFAULT: 5001)")
+        .with_line("\t--port - Set the port pynt will listen to (DEFAULT: random)")
         .with_line("\t--allow-errors - If present will allow command to fail and continue execution")
         .with_line("\t--ca-path - The path to the CA file in PEM format")
         .with_line("\t--proxy-port - Set the port proxied traffic should be routed to (DEFAULT: 6666)")
@@ -60,7 +57,7 @@ class CommandSubCommand(sub_command.PyntSubCommand):
 
     def add_cmd(self, parent: argparse._SubParsersAction) -> argparse.ArgumentParser:
         proxy_cmd = parent.add_parser(self.name)
-        proxy_cmd.add_argument("--port", "-p", help="", type=int, default=5001)
+        proxy_cmd.add_argument("--port", "-p", help="", type=int, default=util.find_open_port())
         proxy_cmd.add_argument("--proxy-port", help="", type=int, default=6666)
         proxy_cmd.add_argument("--cmd", help="", default="", required=True)
         proxy_cmd.add_argument("--captured-domains", nargs="+", help="", default="", required=False)
@@ -148,8 +145,8 @@ class CommandSubCommand(sub_command.PyntSubCommand):
         container_config = pynt_container.DockerContainerConfig(
             args,
             "proxy",
-            pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PORT, args.port, "--port"),
-            pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PROXY_PORT, args.proxy_port, "--proxy-port"),
+            pynt_container.api_port(args.port),
+            pynt_container.proxy_port(args.proxy_port),
         )
 
         if args.captured_domains:

pyntcli/commands/har.py

@@ -8,8 +8,6 @@ from pyntcli.ui import ui_thread
 from pyntcli.ui.progress import PyntProgress
 from pyntcli.commands import sub_command, util
 
-PYNT_CONTAINER_INTERNAL_PORT = "5001"
-
 
 def har_usage():
     return (
@@ -61,7 +59,7 @@ class HarSubCommand(sub_command.PyntSubCommand):
         container_config = pynt_container.DockerContainerConfig(
             args,
             "har",
-            pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, dest=port, name="--port")
+            pynt_container.api_port(port),
         )
 
         if not os.path.isfile(args.har):

pyntcli/commands/listen.py

@@ -15,9 +15,6 @@ from pyntcli.commands import util, sub_command
 from pyntcli.ui import report as cli_reporter
 from pyntcli.transport import pynt_requests
 
-PYNT_CONTAINER_INTERNAL_PORT = "5001"
-PYNT_CONTAINER_INTERNAL_PROXY_PORT = "6666"
-
 
 def listen_usage():
     return (
@@ -29,7 +26,7 @@ def listen_usage():
         .with_line("Options:", style=ui_thread.PrinterText.HEADER)
         .with_line('\t--captured-domains - Pynt will scan only these domains and subdomains. For all domains write "*"')
         .with_line('\t--test-name - A name for your Pynt scan')
-        .with_line("\t--port - Set the port pynt will listen to (DEFAULT: 5001)")
+        .with_line("\t--port - Set the port pynt will listen to (DEFAULT: random)")
         .with_line("\t--ca-path - The path to the CA file in PEM format")
         .with_line("\t--proxy-port - Set the port proxied traffic should be routed to (DEFAULT: 6666)")
         .with_line("\t--report - If present will save the generated report in this path.")
@@ -54,7 +51,7 @@ class ListenSubCommand(sub_command.PyntSubCommand):
 
     def add_cmd(self, parent: argparse._SubParsersAction) -> argparse.ArgumentParser:
         listen_cmd = parent.add_parser(self.name)
-        listen_cmd.add_argument("--port", "-p", help="", type=int, default=5001)
+        listen_cmd.add_argument("--port", "-p", help="", type=int, default=util.find_open_port())
         listen_cmd.add_argument("--proxy-port", help="", type=int, default=6666)
         listen_cmd.add_argument("--captured-domains", nargs="+", help="", default="", required=True)
         listen_cmd.add_argument("--test-name", help="", default="", required=False)
@@ -109,8 +106,9 @@ class ListenSubCommand(sub_command.PyntSubCommand):
         container_config = pynt_container.DockerContainerConfig(
             args,
             "proxy",
-            pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PORT, args.port, "--port"),
-            pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PROXY_PORT, args.proxy_port, "--proxy-port"))
+            pynt_container.api_port(args.port),
+            pynt_container.proxy_port(args.proxy_port),
+        )
 
         for host in args.captured_domains:
             container_config.docker_arguments += ["--host-targets", host]

pyntcli/commands/newman.py

@@ -8,8 +8,6 @@ from pyntcli.commands import sub_command, util
 from pyntcli.ui import ui_thread
 from pyntcli.ui.progress import PyntProgress
 
-PYNT_CONTAINER_INTERNAL_PORT = "5001"
-
 
 def newman_usage():
     return (
@@ -55,12 +53,11 @@ class NewmanSubCommand(sub_command.PyntSubCommand):
         return newman_cmd
 
     def run_cmd(self, args: argparse.Namespace):
-
         port = util.find_open_port()
         container_config = pynt_container.DockerContainerConfig(
             args,
             "newman",
-            pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, dest=port, name="--port")
+            pynt_container.api_port(port),
         )
 
         if not os.path.isfile(args.collection):
@@ -117,8 +114,8 @@ class NewmanSubCommand(sub_command.PyntSubCommand):
             ui_thread.print(ui_thread.PrinterText(
                 "Pynt docker is ready",
                 ui_thread.PrinterText.INFO,
-            ))    
-            
+            ))
+
             ui_thread.print_generator(newman_docker.stdout)
 
             with ui_thread.progress(

pyntcli/commands/postman.py

@@ -14,8 +14,6 @@ from pyntcli.pynt_docker import pynt_container
 from pyntcli.ui import ui_thread
 from pyntcli.transport import pynt_requests
 
-PYNT_CONTAINER_INTERNAL_PORT = "5001"
-
 
 class PyntPostmanException(Exception):
     pass
@@ -98,7 +96,8 @@ class PostmanSubCommand(sub_command.PyntSubCommand):
         container_config = pynt_container.DockerContainerConfig(
             args,
             "postman",
-            pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, dest=args.port, name="--port"))
+            pynt_container.api_port(args.port),
+        )
 
         postman_docker = pynt_container.PyntContainerNative(container_config)
         postman_docker.prepare_client()

pyntcli/commands/pynt_cmd.py

@@ -12,8 +12,7 @@ import pyntcli.log.log as log
 
 from requests.exceptions import SSLError, HTTPError
 
-
-from . import command, listen, postman, root, sub_command, id_command, newman, har, burp
+from . import command, listen, postman, root, sub_command, id_command, newman, har, burp, template
 
 logger = log.get_logger()
 
@@ -25,6 +24,7 @@ avail_sub_commands = [
     command.CommandSubCommand("command"),
     listen.ListenSubCommand("listen"),
     burp.BurpCommand("burp"),
+    template.TemplateSubCommand("template")
 ]
 
 commands_without_app_id = ["postman", "pynt-id"]
@@ -50,7 +50,6 @@ VERSION_CHECK_URL = "https://d1efigcr4c19qn.cloudfront.net/cli/version"
 
 
 def check_is_latest_version(current_version):
-
     try:
         res = pynt_requests.get(VERSION_CHECK_URL)
         res.raise_for_status()
@@ -175,9 +174,9 @@ class PyntCommand:
                     return True
 
             if prompt.confirmation_prompt_with_timeout("Application ID is missing. Use the '--application-id' flag to provide it.\n" +
-                                          "Without an Application ID, the scan will not be associated with your application.\n" +
-                                          "The Application ID can be fetched from https://app.pynt.io/dashboard/applications.\n" +
-                                          "Do you want to continue without associating the scan?", default="yes", timeout=15):
+                                                       "Without an Application ID, the scan will not be associated with your application.\n" +
+                                                       "The Application ID can be fetched from https://app.pynt.io/dashboard/applications.\n" +
+                                                       "Do you want to continue without associating the scan?", default="yes", timeout=15):
                 prompts_history["missing_app_id"] = {"last_confirmation": current_time.strftime("%Y-%m-%d %H:%M:%S")}
                 state_store.put_prompts_history(
                     prompts_history)

pyntcli/commands/template.py

@@ -0,0 +1,182 @@
+import argparse
+import os
+import json
+import tempfile
+import time
+from functools import partial
+
+from pyntcli.pynt_docker import pynt_container
+from pyntcli.ui import ui_thread
+from pyntcli.commands import sub_command, util
+
+PYNT_CONTAINER_INTERNAL_PORT = "5001"
+
+
+def template_usage():
+    return (
+        ui_thread.PrinterText("Integration with template testing")
+        .with_line("")
+        .with_line("Usage:", style=ui_thread.PrinterText.HEADER)
+        .with_line("\tpynt template [OPTIONS]")
+        .with_line("")
+        .with_line("Options:", style=ui_thread.PrinterText.HEADER)
+        .with_line("\t--template-file / -tf - Path to the template file")
+        .with_line("\t--template-paths-file / -tpf - Path to the file containing the template paths (with new line separator) for the attacks")
+        .with_line("\t--url - Base URL for the attacks")
+        .with_line("\t--urls - Path to the file containing the base URLs (with new line separator) for the attacks")
+        .with_line("\t--reporters - Output results to json")
+        .with_line("\t--severity-level - 'all', 'medium', 'high', 'critical', 'none' (default)")
+        .with_line("\t--verbose - Use to get more detailed information about the run")
+        .with_line("")
+    )
+
+
+class TemplateSubCommand(sub_command.PyntSubCommand):
+    def __init__(self, name) -> None:
+        super().__init__(name)
+
+    def usage(self, *args):
+        ui_thread.print(template_usage())
+
+    def add_cmd(self, parent: argparse._SubParsersAction) -> argparse.ArgumentParser:
+        template_cmd = parent.add_parser(self.name)
+        template_cmd.add_argument("--template-file", "-tf", type=str, help="Path to the template file")
+        template_cmd.add_argument("--template-paths-file", "-tpf", type=str, help="Path to the file containing the template paths (with new line separator) for the attacks")
+        template_cmd.add_argument("--url", "-u", type=str, help="Base URL for the attacks")
+        template_cmd.add_argument("--urls", type=str, help="Path to the file containing the base URLs (with new line separator) for the attacks")
+        template_cmd.add_argument("--reporters", action="store_true")
+        template_cmd.add_argument("--severity-level", choices=["all", "medium", "high", "critical", "none"], default="none")
+        template_cmd.print_usage = self.usage
+        template_cmd.print_help = self.usage
+        return template_cmd
+
+    def run_cmd(self, args: argparse.Namespace):
+        pynt_folder_path = "/etc/pynt"
+        templates_folder_path = f"{pynt_folder_path}/templates"
+        ui_thread.print_verbose("Building container")
+        port = util.find_open_port()
+        container_config = pynt_container.DockerContainerConfig(
+            args,
+            "template",
+            pynt_container._PyntDockerPort(port=port, name="--port")
+        )
+
+        try:
+            validate_args(args)
+        except ValueError as e:
+            ui_thread.print(
+                ui_thread.PrinterText(
+                    str(e),
+                    ui_thread.PrinterText.WARNING,
+                )
+            )
+            return
+
+        if args.template_file:
+            if not os.path.isfile(args.template_file):
+                ui_thread.print(
+                    ui_thread.PrinterText(
+                        "Could not find the provided path, please provide a valid path",
+                        ui_thread.PrinterText.WARNING,
+                    )
+                )
+                return
+            template_name = os.path.basename(args.template_file)
+            full_template_path = f"{templates_folder_path}/{template_name}"
+            container_config.mounts.append(
+                pynt_container.create_mount(
+                    os.path.abspath(args.template_file), full_template_path
+                )
+            )
+            container_config.docker_arguments += ["--template-file", full_template_path]
+
+        if args.template_paths_file:
+            if not os.path.isfile(args.template_paths_file):
+                ui_thread.print(
+                    ui_thread.PrinterText(
+                        "Could not find the provided paths file, please provide a valid paths file",
+                        ui_thread.PrinterText.WARNING,
+                    )
+                )
+                return
+
+            # read the file, mount each uncommented file to /etc/pynt/templates, create a temp file with the paths as they are in the container (in /etc/pynt) and mount it to /etc/pynt/paths.txt
+            with open(args.template_paths_file, "r") as f:
+                paths = [line.strip() for line in f if not (line.strip().startswith("#") or line.startswith("//"))]
+                for path in paths:
+                    container_config.mounts.append(
+                        pynt_container.create_mount(
+                            os.path.abspath(path), f"{templates_folder_path}/{os.path.basename(path)}"
+                        )
+                    )
+
+            container_config.docker_arguments += ["--templates-folder", templates_folder_path]
+
+        if args.url:
+            container_config.docker_arguments += ["--url", args.url]
+
+        if args.urls and not os.path.isfile(args.urls):
+            ui_thread.print(
+                ui_thread.PrinterText(
+                    "Could not find the provided urls file, please provide a valid urls file",
+                    ui_thread.PrinterText.WARNING,
+                )
+            )
+            return
+
+        if args.urls:
+            base_urls_path = f"{pynt_folder_path}/base_urls.txt"
+            container_config.docker_arguments += ["--urls", base_urls_path]
+            container_config.mounts.append(
+                pynt_container.create_mount(
+                    os.path.abspath(args.urls), base_urls_path
+                )
+            )
+
+        with util.create_default_file_mounts(args) as m:
+            container_config.mounts += m
+
+            template_docker = pynt_container.PyntContainerNative(container_config)
+
+            template_docker.prepare_client()
+            template_docker.pre_run_validation(port)
+            template_docker.run()
+
+            healthcheck = partial(
+                util.wait_for_healthcheck, "http://localhost:{}".format(port)
+            )
+
+            healthcheck()
+            ui_thread.print_verbose(util.GOT_INITIAL_HEALTHCHECK_MESSAGE)
+            ui_thread.print(ui_thread.PrinterText(
+                "Pynt docker is ready",
+                ui_thread.PrinterText.INFO,
+            ))
+
+            ui_thread.print_generator(template_docker.stdout)
+
+            with ui_thread.progress(
+                    "ws://localhost:{}/progress".format(port),
+                    healthcheck,
+                    "scan in progress...",
+                    100,
+            ):
+                while template_docker.is_alive():
+                    time.sleep(1)
+
+
+def validate_args(args: argparse.Namespace):
+    if not args.template_file and not args.template_paths_file:
+        raise ValueError("Please provide either a template file or a template paths file")
+    if args.template_file and args.template_paths_file:
+        raise ValueError("Please provide either a template file or a template paths file, not both")
+    if not args.url and not args.urls:
+        raise ValueError("Please provide either a url or a urls file")
+    if args.url and args.urls:
+        raise ValueError("Please provide either a url or a urls file, not both")
+    if args.urls and not os.path.isfile(args.urls):
+        raise ValueError("Could not find the provided urls file, please provide a valid urls file")
+    if args.template_file and not os.path.isfile(args.template_file):
+        raise ValueError("Could not find the provided path, please provide a valid path")
+    if args.template_paths_file and not os.path.isfile(args.template_paths_file):
+        raise ValueError("Could not find the provided paths file, please provide a valid paths file")

pyntcli/pynt_docker/pynt_container.py

@@ -17,8 +17,6 @@ from pyntcli.auth.login import PYNT_ID, PYNT_SAAS, PYNT_BUCKET_NAME, PYNT_PARAM1
 PYNT_DOCKER_IMAGE = "ghcr.io/pynt-io/pynt"
 IMAGE_TAGS = ["postman-latest", "newman-latest", "har-latest", "proxy-latest", "v1-latest"]
 
-PYNT_CONTAINER_INTERNAL_PORT = "5001"
-
 
 def create_mount(src, destination, mount_type="bind"):
     return {
@@ -67,13 +65,20 @@ class PyntBaseContainer():
         self.environment = environment
 
 
-class PyntDockerPort:
-    def __init__(self, src, dest, name) -> None:
-        self.src = src
-        self.dest = dest
+class _PyntDockerPort:
+    def __init__(self, port: int, name: str) -> None:
+        self.port = port
         self.name = name
 
 
+def api_port(port: int) -> _PyntDockerPort:
+    return _PyntDockerPort(port=port, name="--port")
+
+
+def proxy_port(port: int) -> _PyntDockerPort:
+    return _PyntDockerPort(port=port, name="--proxy-port")
+
+
 class PyntDockerImage:
     def __init__(self, name, is_self_managed) -> None:
         self.name = name
@@ -81,31 +86,16 @@ class PyntDockerImage:
 
 
 class DockerContainerConfig:
-    def __init__(self, args: argparse.Namespace, integration_name: str, *port_args: PyntDockerPort):
+    def __init__(self, args: argparse.Namespace, integration_name: str, *port_args: _PyntDockerPort):
         self.image = get_image_config(args)
         self.is_detach = True
-        self.ports = port_args
-        self.docker_arguments = build_docker_args(integration_name, args)
+        self.ports: List[int] = [port_arg.port for port_arg in port_args]
+        self.docker_arguments = build_docker_args(integration_name, args, port_args)
         self.mounts = get_docker_mounts(args)
         self.env_vars = {PYNT_ID: CredStore().get_tokens(), "PYNT_SAAS_URL": PYNT_SAAS}
         if user_set_all_variables():
             add_env_variables(self.env_vars)
 
-        ports = {}
-        create_network_host = is_network_host()
-        for p in port_args:
-            if create_network_host:
-                self.docker_arguments.append(p.name)
-                self.docker_arguments.append(str(p.dest))
-            else:
-                # `dest` is the host port, `src` is in the container
-                ports[str(p.dest)] = int(p.src)
-
-        if create_network_host:
-            self.docker_type = PyntNativeHost(network="host")
-        else:
-            self.docker_type = PyntDockerDesktopContainer(ports=ports)
-
 
 def get_image_config(args: argparse.Namespace) -> PyntDockerImage:
     default_image = f'{PYNT_DOCKER_IMAGE}:v1-latest'
@@ -136,8 +126,8 @@ def user_set_all_variables():
 
 def add_env_variables(env: dict):
     env["PYNT_BUCKET_NAME"] = PYNT_BUCKET_NAME
-    env["PYNT_PARAM1"] = base64.b64encode(PYNT_PARAM1.encode('utf-8'))
-    env["PYNT_PARAM2"] = base64.b64encode(PYNT_PARAM2.encode('utf-8'))
+    env["PYNT_PARAM1"] = base64.b64encode(PYNT_PARAM1.encode('utf-8')).decode('utf-8')
+    env["PYNT_PARAM2"] = base64.b64encode(PYNT_PARAM2.encode('utf-8')).decode('utf-8')
 
 
 def value_from_environment_variable(key):
@@ -150,7 +140,7 @@ def value_from_environment_variable(key):
     return None
 
 
-def build_docker_args(integration_name:str, args: argparse.Namespace) -> list[str]:
+def build_docker_args(integration_name: str, args: argparse.Namespace, port_args: List[_PyntDockerPort]) -> List[str]:
     docker_arguments = [integration_name]
 
     if "insecure" in args and args.insecure:
@@ -176,6 +166,9 @@ def build_docker_args(integration_name:str, args: argparse.Namespace) -> list[st
     if "verbose" in args and args.verbose:
         docker_arguments.append("--verbose")
 
+    for port_arg in port_args:
+        docker_arguments += [port_arg.name, str(port_arg.port)]
+
     return docker_arguments
 
 
@@ -233,22 +226,21 @@ class PyntContainerNative:
         for key, value in self.config.env_vars.items():
             env_vars.extend(self.adapt_environment_variable_partial(key, value))
 
-        docker_type_options = []
-        for key, value in self.config.docker_type.get_arguments().items():
-            if key == "ports" and isinstance(value, dict):
-                for host_port, container_port in value.items():
-                    # --publish HOST_PORT:CONTAINER_PORT for each port
-                    docker_type_options.extend(["-p", f"{host_port}:{container_port}"])
-            else:
-                docker_type_options.extend([f"--{key}={value}"])
+        if is_network_host():
+            ports_exposure = ["--network=host"]
+        else:
+            ports_exposure = []
+            for port in self.config.ports:
+                ports_exposure.extend(["-p", f"{port}:{port}"])
 
         docker_command += mounts
         docker_command += env_vars
-        docker_command += docker_type_options
+        docker_command += ports_exposure
         docker_command += [f"{self.config.image.name}"]
         docker_command += args
 
         command = self.adapt_run_command(docker_command)
+        
         PyntContainerRegistry.instance().register_container(self)
         process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
         stdout, stderr = process.communicate()
@@ -297,7 +289,7 @@ class PyntContainerNative:
                 for container_id in container_ids:
                     kill_command = ["docker", "kill", container_id]
                     remove_command = ["docker", "remove", container_id]
-                    subprocess.run(kill_command,stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                    subprocess.run(kill_command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
                     subprocess.run(remove_command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
                     if report_to_user:
                         ui_thread.print(
@@ -355,22 +347,6 @@ class PyntContainerNative:
             raise PortInUseException(port)
 
 
-class PyntDockerDesktopContainer:
-    def __init__(self, ports) -> None:
-        self.ports = ports
-
-    def get_arguments(self):
-        return {"ports": self.ports} if self.ports else {}
-
-
-class PyntNativeHost:
-    def __init__(self, network) -> None:
-        self.network = network
-
-    def get_arguments(self):
-        return {"network": self.network} if self.network else {}
-
-
 class PyntContainerRegistry:
     _instance = None
 

{pyntcli-0.1.107.dist-info → pyntcli-0.1.109.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyntcli
-Version: 0.1.107
+Version: 0.1.109
 Summary: Command line utility to handle all of Pynt's different integrations
 Author-email: Pynt-io <support@pynt.io>
 Project-URL: Homepage, https://pynt.io

{pyntcli-0.1.107.dist-info → pyntcli-0.1.109.dist-info}/RECORD

@@ -1,30 +1,31 @@
 ignoreTests/conftest.py,sha256=gToq5K74GtgeGQXjFvXSzMaE6axBYxAzcFG5XJPOXjI,427
 ignoreTests/auth/login.py,sha256=KFlzWhXBAuwdi7GXf16gCB3ya94LQG2wjcSChE149rQ,3798
 ignoreTests/store/cred_store.py,sha256=_7-917EtNC9eKEumO2_lt-7KuDmCwOZFaowCm7DbA_A,254
-pyntcli/__init__.py,sha256=EOCfjhl8tpnOQpcbCZSBKM0i_FvcprayX3DIVt2CxZY,24
+pyntcli/__init__.py,sha256=Cd4SdQA_B1lvL3flAA4RSH333OefFegLyvOlQ3QX7IA,24
 pyntcli/main.py,sha256=RD0W2_0ogYBCXubo-YewxHYkiIXxNv6NkZOh3n1VujE,5964
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/analytics/send.py,sha256=0hJ0WJNFHLqyohtRr_xOg5WEXzxHrUOlcePPg-k65Hk,3846
 pyntcli/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/auth/login.py,sha256=TljsRXbEkNI1YUrKm5mlTw4YiecYScYUsit8Z8vstss,5228
 pyntcli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyntcli/commands/burp.py,sha256=5lZKSDHJvmVNvxEkQPKQ4lNx8pSzEK-rTHhSvn-ZBtY,12253
-pyntcli/commands/command.py,sha256=7x5eGXGz1rHtAy-Shdh3KLIqQ7TVAZEKd5DiKaCLOSQ,10998
-pyntcli/commands/har.py,sha256=oZXqYphNuFD_9jbCfHTmc8RfNziuR7PMKMETYmQIM0g,4300
+pyntcli/commands/burp.py,sha256=sR5D2vlOXj9Qae3c1-VWfIXMouXoEv2Ik3O-C-Wqqkc,13891
+pyntcli/commands/command.py,sha256=mMf1_bU7IFbE54FN3S3FuPODjHSSSu8aHzHJX-MgEFA,10832
+pyntcli/commands/har.py,sha256=v6yWTuxPpXLlEi3yJ7gUDhFFGJZSpNQ3ehl2oaZJ-wc,4202
 pyntcli/commands/id_command.py,sha256=UBEgMIpm4vauTCsKyixltiGUolNg_OfHEJvJ_i5BpJY,943
-pyntcli/commands/listen.py,sha256=oxgMvJYpPEu6h8qRFoueGF3a_nmwzaWMPL8ucfy7yxE,8983
-pyntcli/commands/newman.py,sha256=e6SF9nwncGsuTfIB05daFHln-njCYSXeR51-JZcMZBE,5160
-pyntcli/commands/postman.py,sha256=gV7Y_NM6oUQl1b7mLiGKnzityCuCE9RYMLFfeHFD-Gc,4980
-pyntcli/commands/pynt_cmd.py,sha256=T7jee0yw67Zth3lTkSDInCLnbu_IhpNqb7GqnTiTceQ,7012
+pyntcli/commands/listen.py,sha256=bsO7c3cHmZyxUTXspCcq_O9BR8tI2qYqOpHtJDb8hZY,8827
+pyntcli/commands/newman.py,sha256=68P1bCjSSjTWrzOwKN_-fGQC4j484KlVpMbezMJOCMo,5045
+pyntcli/commands/postman.py,sha256=ExfvG0iLRmK_rHcqIj8itcd3mh2-BdPuQEDm8viLP6Q,4891
+pyntcli/commands/pynt_cmd.py,sha256=AeXxKy8dtZTdwWhTirHVvkPkeFUSoZNb3FRyuwkL6kg,7103
 pyntcli/commands/root.py,sha256=UtGky7LfbfQ6mELHoNJcdHznFrUVBlhXI47_8QdApfc,4068
 pyntcli/commands/static_file_extensions.py,sha256=PZJb02BI-64tbU-j3rdCNsXzTh7gkIDGxGKbKNw3h5k,1995
 pyntcli/commands/sub_command.py,sha256=GF3-rE_qk2L4jGPFqHLm9SdGINmu3EakhjJTFyWjRms,374
+pyntcli/commands/template.py,sha256=KocIH1T7occrrjaWJQaKKGgGWrU1bieTKEJbhFw3KLI,7976
 pyntcli/commands/util.py,sha256=FGtuXLxMAL0b9sbsrJaQR_-5sEu-PwZOJonMwuCjO2U,4450
 pyntcli/log/__init__.py,sha256=cOGwOYzMoshEbZiiasBGkj6wF0SBu3Jdpl-AuakDesw,19
 pyntcli/log/log.py,sha256=YXCvcCzuhQ5QUT2L02uQEdN_lTCzLEuet4OnLuEnjlM,112
 pyntcli/pynt_docker/__init__.py,sha256=PQIOVxc7XXtMLfEX7ojgwf_Z3mmTllO3ZvzUZTPOxQY,30
 pyntcli/pynt_docker/container_utils.py,sha256=_Onn7loInzyJAG2-Uk6CGpsuRyelmUFHOvtJj4Uzi9A,175
-pyntcli/pynt_docker/pynt_container.py,sha256=oItp-NK4eu08DfpTtyBXrjHOE7jHZjffwe8Ox9ae770,14042
+pyntcli/pynt_docker/pynt_container.py,sha256=42Qgwcd5EgtF0RKa2e9O2AjGSngAz9rZveCMOHGZaS8,13233
 pyntcli/store/__init__.py,sha256=1fP8cEAQCF_myja3gnhHH9FEqtBiOJ-2aBmUXSKBdFA,41
 pyntcli/store/json_connector.py,sha256=UGs3uORw3iyn0YJ8kzab-veEZToA6d-ByXYuqEleWsA,560
 pyntcli/store/store.py,sha256=Kl_HT9FJFdKlAH7SwAt3g4-bW-r-1ve_u13OPggQai0,2529
@@ -39,8 +40,8 @@ pyntcli/ui/report.py,sha256=W-icPSZrGLOubXgam0LpOvHLl_aZg9Zx9qIkL8Ym5PE,1930
 pyntcli/ui/ui_thread.py,sha256=XUBgLpYQjVhrilU-ofw7VSXgTiwneSdTxm61EvC3x4Q,5091
 tests/test_utils.py,sha256=t5fTQUk1U_Js6iMxcGYGqt4C-crzOJ0CqCKtLkRtUi0,2050
 tests/commands/test_pynt_cmd.py,sha256=BjGFCFACcSziLrNA6_27t6TjSmvdu54wx9njwLpRSJY,8379
-pyntcli-0.1.107.dist-info/METADATA,sha256=IntbbJxOYoQBlP7_awa0DmVxHubkTuY67D5buGUn5HA,428
-pyntcli-0.1.107.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-pyntcli-0.1.107.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.107.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
-pyntcli-0.1.107.dist-info/RECORD,,
+pyntcli-0.1.109.dist-info/METADATA,sha256=fHnwDHSJvgjpR3B2PBXIdU9t3WVMl6bLFbD2p1mz9PU,428
+pyntcli-0.1.109.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+pyntcli-0.1.109.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.109.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
+pyntcli-0.1.109.dist-info/RECORD,,

{pyntcli-0.1.107.dist-info → pyntcli-0.1.109.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any