pyntcli 0.1.97__py3-none-any.whl → 0.1.99__py3-none-any.whl

pyntcli/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.97"
+__version__ = "0.1.99"
 
 try:
     from logzio import sender

pyntcli/commands/burp.py

@@ -228,6 +228,7 @@ class BurpCommand(sub_command.PyntSubCommand):
 
     def run_cmd(self, args: argparse.Namespace):
         container = pynt_container.get_container_with_arguments(
+            "proxy",
             args,
             pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PORT, args.port, "--port"),
             pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PROXY_PORT, args.proxy_port, "--proxy-port"),
@@ -287,7 +288,7 @@ class BurpCommand(sub_command.PyntSubCommand):
 
         proxy_docker = pynt_container.PyntContainer(
             image_name=pynt_container.PYNT_DOCKER_IMAGE,
-            tag="proxy-latest",
+            tag="v1-latest",
             detach=True,
             base_container=container,
             use_native=args.use_docker_native)

pyntcli/commands/command.py

@@ -146,6 +146,7 @@ class CommandSubCommand(sub_command.PyntSubCommand):
 
     def run_cmd(self, args: argparse.Namespace):
         container = pynt_container.get_container_with_arguments(
+            "proxy",
             args,
             pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PORT, args.port, "--port"),
             pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PROXY_PORT, args.proxy_port, "--proxy-port"),
@@ -178,7 +179,7 @@ class CommandSubCommand(sub_command.PyntSubCommand):
 
         proxy_docker = pynt_container.PyntContainer(
             image_name=pynt_container.PYNT_DOCKER_IMAGE,
-            tag="proxy-latest",
+            tag="v1-latest",
             detach=True,
             base_container=container,
             use_native=args.use_docker_native)

pyntcli/commands/har.py

@@ -59,7 +59,7 @@ class HarSubCommand(sub_command.PyntSubCommand):
         ui_thread.print_verbose("Building container")
         port = util.find_open_port()
         container = pynt_container.get_container_with_arguments(
-            args, pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, dest=port, name="--port")
+            "har", args, pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, dest=port, name="--port")
         )
 
         if not os.path.isfile(args.har):
@@ -88,7 +88,7 @@ class HarSubCommand(sub_command.PyntSubCommand):
 
             har_docker = pynt_container.PyntContainer(
                 image_name=pynt_container.PYNT_DOCKER_IMAGE,
-                tag="har-latest",
+                tag="v1-latest",
                 detach=True,
                 base_container=container,
                 use_native=args.use_docker_native)

pyntcli/commands/listen.py

@@ -107,6 +107,7 @@ class ListenSubCommand(sub_command.PyntSubCommand):
 
     def run_cmd(self, args: argparse.Namespace):
         container = pynt_container.get_container_with_arguments(
+            "proxy",
             args,
             pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PORT, args.port, "--port"),
             pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PROXY_PORT, args.proxy_port, "--proxy-port"))
@@ -137,7 +138,7 @@ class ListenSubCommand(sub_command.PyntSubCommand):
 
         proxy_docker = pynt_container.PyntContainer(
             image_name=pynt_container.PYNT_DOCKER_IMAGE,
-            tag="proxy-latest",
+            tag="v1-latest",
             detach=True,
             base_container=container)
 

pyntcli/commands/newman.py

@@ -58,7 +58,7 @@ class NewmanSubCommand(sub_command.PyntSubCommand):
 
         port = util.find_open_port()
         container = pynt_container.get_container_with_arguments(
-            args, pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, dest=port, name="--port")
+            "newman", args, pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, dest=port, name="--port")
         )
 
         if not os.path.isfile(args.collection):
@@ -102,7 +102,7 @@ class NewmanSubCommand(sub_command.PyntSubCommand):
             container.mounts += m
             newman_docker = pynt_container.PyntContainer(
                 image_name=pynt_container.PYNT_DOCKER_IMAGE,
-                tag="newman-latest",
+                tag="v1-latest",
                 detach=True,
                 base_container=container,
                 use_native=args.use_docker_native)

pyntcli/commands/postman.py

@@ -95,10 +95,10 @@ class PostmanSubCommand(sub_command.PyntSubCommand):
             ui_thread.print("application-id is not supported in postman integration, use the collection variables to set application id.")
             args.application_id = ""
 
-        container = pynt_container.get_container_with_arguments(args, pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PORT, args.port, name="--port"))
+        container = pynt_container.get_container_with_arguments("postman", args, pynt_container.PyntDockerPort(PYNT_CONTAINER_INTERNAL_PORT, args.port, name="--port"))
 
         postman_docker = pynt_container.PyntContainer(image_name=pynt_container.PYNT_DOCKER_IMAGE,
-                                                      tag="postman-latest",
+                                                      tag="v1-latest",
                                                       detach=True,
                                                       base_container=container,
                                                       use_native=args.use_docker_native)

pyntcli/main.py

@@ -35,9 +35,9 @@ def signal_handler(signal_number, frame):
 
 def get_docker_platform_name(use_docker_native: bool = False) -> str:
     if use_docker_native:
-        return pynt_container.get_docker_type_native()
+        return pynt_container.get_docker_platform_by_native_command()
 
-    return pynt_container.get_docker_type()
+    return pynt_container.get_docker_platform_by_sdk()
 
 
 def print_header():

pyntcli/pynt_docker/pynt_container.py

@@ -18,7 +18,7 @@ from pyntcli.store import CredStore
 from pyntcli.auth.login import PYNT_ID, PYNT_SAAS, PYNT_BUCKET_NAME, PYNT_PARAM1, PYNT_PARAM2
 
 PYNT_DOCKER_IMAGE = "ghcr.io/pynt-io/pynt"
-IMAGE_TAGS = ["postman-latest", "newman-latest", "har-latest", "proxy-latest"]
+IMAGE_TAGS = ["postman-latest", "newman-latest", "har-latest", "proxy-latest", "v1-latest"]
 
 PYNT_CONTAINER_INTERNAL_PORT = "5001"
 
@@ -46,17 +46,17 @@ class PortInUseException(Exception):
         super().__init__(self.message)
 
 
-def get_docker_type_native():
+def get_docker_platform_by_native_command():
     try:
         version_data = json.loads(subprocess.check_output(["docker", "version", "--format", "{{json .}}"], text=True))
-        platform = version_data.get("Client", {}).get("Platform", {})
+        platform = version_data.get("Server", {}).get("Platform", {})
         analytics.deferred_emit(analytics.DOCKER_PLATFORM, platform)
         return platform.get("Name", "")
     except Exception:
         raise DockerNotAvailableException()
 
 
-def get_docker_type():
+def get_docker_platform_by_sdk():
     try:
         c = docker.from_env()
         version_data = c.version()
@@ -88,20 +88,33 @@ class PyntDockerPort:
         self.name = name
 
 
-def get_container_with_arguments(args: argparse.Namespace, *port_args: PyntDockerPort) -> PyntBaseContainer:
-    docker_arguments = []
+def is_network_host(use_docker_sdk: bool) -> bool:
+    platform_sys_name = platform.system()
+    if platform_sys_name == "Windows" or platform_sys_name == "Darwin":
+        return False
+    else:
+        docker_platform_name = get_docker_platform_by_sdk().lower() if use_docker_sdk else get_docker_platform_by_native_command().lower()
+        if "desktop" in docker_platform_name:
+            return False
+        return True
+
+
+def get_container_with_arguments(integration: str, args: argparse.Namespace, *port_args: PyntDockerPort) \
+        -> PyntBaseContainer:
+    docker_arguments = [integration]
     ports = {}
+    create_network_host = is_network_host(args.use_docker_native)
     for p in port_args:
-        if "desktop" in get_docker_type().lower():
-            ports[str(p.src)] = int(p.dest)
-        else:
+        if create_network_host:
             docker_arguments.append(p.name)
             docker_arguments.append(str(p.dest))
+        else:
+            ports[str(p.src)] = int(p.dest)
 
-    if "desktop" in get_docker_type().lower():
-        docker_type = PyntDockerDesktopContainer(ports=ports)
-    else:
+    if create_network_host:
         docker_type = PyntNativeContainer(network="host")
+    else:
+        docker_type = PyntDockerDesktopContainer(ports=ports)
 
     if "insecure" in args and args.insecure:
         docker_arguments.append("--insecure")

{pyntcli-0.1.97.dist-info → pyntcli-0.1.99.dist-info}/METADATA

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

@@ -1,20 +1,20 @@
 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=QjBNfc6bD7TnuAFA80WKCRRgVLp7uFyw7NP6dPh14xY,402
-pyntcli/main.py,sha256=HORWY5AEK5xmEQybUZBW9ZEDIga8vSnqDfmAR3TY9F0,6502
+pyntcli/__init__.py,sha256=96CSieH-K5R3B_CG2Gfc3dNu3WA01VqXDKUfJ__2Pdg,402
+pyntcli/main.py,sha256=-INlAS5ks6ofT38Nap0FylRYjCdrLZLuTn5-Pea5UXY,6528
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/analytics/send.py,sha256=9TRAEoPbv4rWOZfcNaGanrRJAFvNs39P-uKSl49GcQE,3679
 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=TYUspSLhubtKEL4ShUOvT7Fnq3MFsFo-HyrPXiZboZ4,12380
-pyntcli/commands/command.py,sha256=cMVrlxMZgx0jFrlpMTKPEYfsSv2RhN6XuPrRqqqYB6k,11125
-pyntcli/commands/har.py,sha256=yUuLvxlAoq2dQotJe8PV02sZD-WgYSefzGc6bhdroSo,4464
+pyntcli/commands/burp.py,sha256=z6_kYEL6cXNg5yFFR4d8UAgJGTLn3XgUNWsqCBhsJoE,12398
+pyntcli/commands/command.py,sha256=Aw2wb4pV99r9ot6gC2ckqg_1379PZLfudQZ3Igx8Lds,11143
+pyntcli/commands/har.py,sha256=YekPhsbIuuw_lNby97CPDNkEJysFycr_cx-8nPTX6Co,4470
 pyntcli/commands/id_command.py,sha256=UBEgMIpm4vauTCsKyixltiGUolNg_OfHEJvJ_i5BpJY,943
-pyntcli/commands/listen.py,sha256=b_ES6VRmPFkIkCCQ6MuP6KOeUlf5vT1e7AafnDqJVak,9063
-pyntcli/commands/newman.py,sha256=o3kobgUFoC3jw2XmbYEsQNdYpGO5suFA92lxHw71dzw,5301
-pyntcli/commands/postman.py,sha256=VNARuyCDaDYlrzRMmJk4oM4YTCExOQUDziOS8NpU-KA,5256
+pyntcli/commands/listen.py,sha256=UERWRArlJQGbM9-bZzG4OlDD7r73UxdwHFWWzxkNObE,9081
+pyntcli/commands/newman.py,sha256=n1eNjeE6dEPjq9Sax9MXcZCJLzn29MidLjV2GeVYmPU,5307
+pyntcli/commands/postman.py,sha256=b_nF-ryleENUrr1RzqmzhJmhWR4IWPw0ehS9y_11m4U,5262
 pyntcli/commands/pynt_cmd.py,sha256=T7jee0yw67Zth3lTkSDInCLnbu_IhpNqb7GqnTiTceQ,7012
 pyntcli/commands/root.py,sha256=4yeGlTeL3Xu2xlSbMYhhaDwUnP29sF2Y2sxq8E1P3lo,3986
 pyntcli/commands/static_file_extensions.py,sha256=PZJb02BI-64tbU-j3rdCNsXzTh7gkIDGxGKbKNw3h5k,1995
@@ -24,7 +24,7 @@ pyntcli/log/__init__.py,sha256=cOGwOYzMoshEbZiiasBGkj6wF0SBu3Jdpl-AuakDesw,19
 pyntcli/log/log.py,sha256=cWCdWmUaAwePwdhYDcgNMEG9d9RM34sGahxBCYEdv2Y,1069
 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=R2iq4Gbbkxg3OEJfJwUp-vroHf9-pJ6HWFqvWucPsGA,18965
+pyntcli/pynt_docker/pynt_container.py,sha256=Fbm03hofQR7F5_wQaJ2NgEjBE8TvYE7_fv5K_ps4y7M,19499
 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
@@ -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.97.dist-info/METADATA,sha256=GKs3vMPAJ9Bq6ngQ0Cue1T2sSIYwZmfFTy7Rzj02fR0,493
-pyntcli-0.1.97.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-pyntcli-0.1.97.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.97.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
-pyntcli-0.1.97.dist-info/RECORD,,
+pyntcli-0.1.99.dist-info/METADATA,sha256=6jNnyPGykzIJa0hDpAMadLZYm3FznLEz5g8Th7n2wF0,493
+pyntcli-0.1.99.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+pyntcli-0.1.99.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.99.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
+pyntcli-0.1.99.dist-info/RECORD,,

{pyntcli-0.1.97.dist-info → pyntcli-0.1.99.dist-info}/WHEEL

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