pyntcli 0.1.106__py3-none-any.whl → 0.1.108__py3-none-any.whl

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.106"
+__version__ = "0.1.108"

pyntcli/commands/burp.py

@@ -19,8 +19,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",
@@ -230,8 +228,8 @@ class BurpCommand(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:

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 (
@@ -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 (
@@ -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 (
@@ -60,7 +58,7 @@ class NewmanSubCommand(sub_command.PyntSubCommand):
         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):

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/util.py

@@ -1,12 +1,12 @@
 import time
 import socket
 import os
-import tempfile
 from contextlib import contextmanager
 from pathlib import Path
 import webbrowser
 import json
 import pyntcli.log.log as log
+import pyntcli.store.store as store
 
 from pyntcli.commands.static_file_extensions import STATIC_FILE_EXTENSIONS
 from pyntcli.pynt_docker import pynt_container
@@ -74,8 +74,8 @@ class SeverityException(Exception):
 
 @contextmanager
 def create_default_file_mounts(args):
-    html_report_path = os.path.join(tempfile.gettempdir(), "results.html")
-    json_report_path = os.path.join(tempfile.gettempdir(), "results.json")
+    html_report_path = os.path.join(store.get_default_store_dir(), "results.html")
+    json_report_path = os.path.join(store.get_default_store_dir(), "results.json")
 
     if "reporters" in args and args.reporters:
         html_report_path = os.path.join(os.getcwd(), "pynt_results.html")

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,18 +226,16 @@ 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
 
@@ -288,15 +279,17 @@ class PyntContainerNative:
         ui_thread.print_verbose("Killing other pynt containers if such exist")
         try:
             for _ in IMAGE_TAGS:
-                command = ["docker", "ps", "-q", "-f", f"name={self.container_name}"]
+                command = ["docker", "ps", "-a", "-q", "-f", f"name={self.container_name}"]
                 containers_output = subprocess.check_output(command, text=True)
                 if not containers_output:
                     continue
 
                 container_ids = containers_output.splitlines()
                 for container_id in container_ids:
-                    command = ["docker", "kill", container_id]
-                    subprocess.run(command,stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+                    kill_command = ["docker", "kill", container_id]
+                    remove_command = ["docker", "remove", container_id]
+                    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(
                             ui_thread.PrinterText("Another Pynt container was running, killed it", ui_thread.PrinterText))
@@ -353,22 +346,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/store/store.py

@@ -5,6 +5,10 @@ from .json_connector import JsonStoreConnector
 from .store_connector import StoreConnector
 
 
+def get_default_store_dir():
+    return os.path.join(os.path.expanduser("~"), ".pynt")
+
+
 class Store():
     def __init__(self, file_location: str, connector_type: Type[StoreConnector]) -> None:
         self.file_location = file_location
@@ -40,9 +44,6 @@ class Store():
     def get_path(self):
         return self.file_location
 
-    def _get_default_store_dir(self):
-        return os.path.join(os.path.expanduser("~"), ".pynt")
-
     def __enter__(self):
         self._get_file_data()
         return self
@@ -54,7 +55,7 @@ class Store():
 
 class CredStore(Store):
     def __init__(self) -> None:
-        pynt_dir = super()._get_default_store_dir()
+        pynt_dir = get_default_store_dir()
         super().__init__(file_location=os.path.join(pynt_dir, "creds.json"),
                          connector_type=JsonStoreConnector)
 
@@ -73,7 +74,7 @@ class CredStore(Store):
 
 class StateStore(Store):
     def __init__(self) -> None:
-        pynt_dir = super()._get_default_store_dir()
+        pynt_dir = get_default_store_dir()
         super().__init__(file_location=os.path.join(pynt_dir, "state.json"),
                          connector_type=JsonStoreConnector)
 

{pyntcli-0.1.106.dist-info → pyntcli-0.1.108.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyntcli
-Version: 0.1.106
+Version: 0.1.108
 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.106.dist-info → pyntcli-0.1.108.dist-info}/RECORD

@@ -1,33 +1,33 @@
 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=LmXcDdihVpyvQpTXoatgAItrW56sl-TqZAlSwrMEouU,24
+pyntcli/__init__.py,sha256=6cTRzL-kb_pCk9korlDDW2gMuTXde7EJUm69qZX7iTg,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=kbFFSm5YDrF9CR6u291IpONcfTuEkIfmY4bDgM-lKhk,12069
+pyntcli/commands/command.py,sha256=9GtL-GGLzC6N6ioPztisw3Ce1Sz6lVhlpDJ9k9m3Sbg,10813
+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/listen.py,sha256=3zhzSnoWKbNOcbI117F965MhQz_sHYWJhsrsFp6NP3M,8808
+pyntcli/commands/newman.py,sha256=9FWeYMa9XJOipSQ5Kj5RbkkXkh5mS2VH4UrMQIZXduk,5062
+pyntcli/commands/postman.py,sha256=ExfvG0iLRmK_rHcqIj8itcd3mh2-BdPuQEDm8viLP6Q,4891
 pyntcli/commands/pynt_cmd.py,sha256=T7jee0yw67Zth3lTkSDInCLnbu_IhpNqb7GqnTiTceQ,7012
 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/util.py,sha256=csZHQ2Xbdh-_KX-yIVrnaeNsT0NbuS-ej6kND3CxD_w,4414
+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=AnfIPwu0NVTBH4_9F1pjJb9oIietebOBTzJ8ssNf-ro,13849
+pyntcli/pynt_docker/pynt_container.py,sha256=FIO-AnLiKyuVRg-hGBgAbBRMdjXkuL98aufQkDzfTaQ,13223
 pyntcli/store/__init__.py,sha256=1fP8cEAQCF_myja3gnhHH9FEqtBiOJ-2aBmUXSKBdFA,41
 pyntcli/store/json_connector.py,sha256=UGs3uORw3iyn0YJ8kzab-veEZToA6d-ByXYuqEleWsA,560
-pyntcli/store/store.py,sha256=ZLSe0WAjHDp8cSt4BBFDkPGRux4cgOo5UfF7V4naM7U,2559
+pyntcli/store/store.py,sha256=Kl_HT9FJFdKlAH7SwAt3g4-bW-r-1ve_u13OPggQai0,2529
 pyntcli/store/store_connector.py,sha256=w4LzcpRZesUZL1f63RmLlWEFRtJ6Y6rcS6PkkGtO4MA,357
 pyntcli/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/transport/pynt_requests.py,sha256=C7OPvcKkRTcxSYuyiWKE59KgA9sRX0d6fm1wnopAmPo,1719
@@ -39,8 +39,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.106.dist-info/METADATA,sha256=nPVZLD9-2pZHB59DlsLjZlhpALF6O-zrqDnQ1bYIU0c,428
-pyntcli-0.1.106.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-pyntcli-0.1.106.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.106.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
-pyntcli-0.1.106.dist-info/RECORD,,
+pyntcli-0.1.108.dist-info/METADATA,sha256=g3fwRDelY_rAH-1pwHtwod5k09ZqQVelmyWg6FOpNV8,428
+pyntcli-0.1.108.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+pyntcli-0.1.108.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.108.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
+pyntcli-0.1.108.dist-info/RECORD,,

{pyntcli-0.1.106.dist-info → pyntcli-0.1.108.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