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

pyntcli/__init__.py

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

pyntcli/commands/burp.py

@@ -51,9 +51,11 @@ def decode_request(item) -> str:
             return base64.b64decode(item["request"]["#text"]).decode(encoding)
         except UnicodeDecodeError as e:
             error = e
+            ui_thread.print_verbose(f"Error decoding request: {e}, skipping...")
             continue
         except Exception as e:
             error = e
+            ui_thread.print_verbose(f"Error decoding request: {e}, breaking...")
             break
 
     ui_thread.print(
@@ -94,6 +96,8 @@ def replay_req(item, proxy_port):
         headers[key] = value
 
     body = decoded_req.split("\r\n\r\n")[1]
+    if body:
+        body = body.encode("utf-8")
     resp = pynt_requests.request_from_xml(
         method=method,
         url=url,

pyntcli/commands/util.py

@@ -10,7 +10,7 @@ import pyntcli.store.store as store
 
 from pyntcli.commands.static_file_extensions import STATIC_FILE_EXTENSIONS
 from pyntcli.pynt_docker import pynt_container
-from pyntcli.ui import report
+from pyntcli.ui import report, ui_thread
 from pyntcli.transport import pynt_requests
 
 logger = log.get_logger()
@@ -37,6 +37,7 @@ GOT_INITIAL_HEALTHCHECK_MESSAGE = "Got initial pynt server health check"
 
 
 def wait_for_healthcheck(address):
+    ui_thread.print_verbose("Waiting for healthcheck...")
     start = time.time()
     while start + HEALTHCHECK_TIMEOUT > time.time():
         try:
@@ -49,6 +50,7 @@ def wait_for_healthcheck(address):
             time.sleep(HEALTHCHECK_INTERVAL)
 
     logger.debug("Health check timed out!")
+    ui_thread.print_verbose(f"Request to {address}/healthcheck timed out")
     raise TimeoutError()
 
 

pyntcli/pynt_docker/pynt_container.py

@@ -1,4 +1,5 @@
 import platform
+import shutil
 import subprocess
 import os
 import json
@@ -216,7 +217,8 @@ class PyntContainerNative:
 
         self.fetch_and_validate_image()
         args = self.config.docker_arguments if self.config.docker_arguments else None
-        docker_command = ["docker", "run", "--rm", "-d", "--name", self.container_name]
+        docker_exec = shutil.which("docker")
+        docker_command = [docker_exec, "run", "--rm", "-d", "--name", self.container_name]
 
         mounts = []
         for mount in self.config.mounts:
@@ -224,7 +226,7 @@ class PyntContainerNative:
 
         env_vars = []
         for key, value in self.config.env_vars.items():
-            env_vars.extend(self.adapt_environment_variable_partial(key, value))
+            env_vars.extend(["-e", f"{key}={value}"])
 
         if is_network_host():
             ports_exposure = ["--network=host"]
@@ -239,10 +241,11 @@ class PyntContainerNative:
         docker_command += [f"{self.config.image.name}"]
         docker_command += args
 
-        command = self.adapt_run_command(docker_command)
-        
+        ui_thread.print_verbose(f"Running command (contains sensitive user secrets, do not paste outside this machine!):\n"
+                                f"#########################\n {' '.join(docker_command)}\n#########################\n")
+
         PyntContainerRegistry.instance().register_container(self)
-        process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
+        process = subprocess.Popen(docker_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
         stdout, stderr = process.communicate()
 
         if stderr:
@@ -251,6 +254,7 @@ class PyntContainerNative:
         container_id = stdout.strip()
 
         if process.returncode and process.returncode != 0:
+            ui_thread.print_verbose(f"Unable to perform docker run command, return code: {process.returncode}")
             raise DockerNativeUnavailableException(f"Unable to perform docker run command, return code: {process.returncode}")
 
         # Start log streaming in a separate thread
@@ -304,12 +308,14 @@ class PyntContainerNative:
             ui_thread.print(ui_thread.PrinterText("Pulling latest docker image", ui_thread.PrinterText.INFO))
             pull_command = ['docker', 'pull', self.config.image.name]
             get_image_command = ['docker', 'images', '-q', f'{self.config.image.name}']
+            ui_thread.print_verbose(f"Docker pull command:\n{' '.join(pull_command)}")
             pull_process = subprocess.Popen(pull_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             _, pull_stderr = pull_process.communicate()
             get_process = subprocess.Popen(get_image_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             get_stdout, _ = get_process.communicate()
             local_image_id = get_stdout.decode('utf-8')
             if self.config.image.is_self_managed and local_image_id:
+                ui_thread.print_verbose(f"Using local image {local_image_id}")
                 return local_image_id.strip()
             elif local_image_id == "":
                 ui_thread.print(ui_thread.PrinterText(f"Error: the image {self.config.image.name} not found",
@@ -321,6 +327,9 @@ class PyntContainerNative:
 
             if pull_process.returncode != 0:
                 raise ImageUnavailableException("Failed to pull image")
+
+            ui_thread.print_verbose("Image pulled successfully")
+
         except Exception as e:
             raise ImageUnavailableException(f"An error occurred: {str(e)}")
 
@@ -330,22 +339,16 @@ class PyntContainerNative:
         self.kill_other_instances(report_to_user=False)
         self.running = False
 
-    def adapt_run_command(self, docker_command=[]):
-        if self.system == "windows":
-            return ' '.join(docker_command)
-        return docker_command
-
-    def adapt_environment_variable_partial(self, key, value):
-        if self.system == "windows":
-            return ["-e", f"{key}={json.dumps(value)}"]
-        return ["-e", f"{key}={value}"]
-
     def pre_run_validation(self, port):
         self.kill_other_instances()
 
+        ui_thread.print_verbose("Checking if port is in use")
         if container_utils.is_port_in_use(int(port)):
+            ui_thread.print_verbose(f"Port {port} is in use")
             raise PortInUseException(port)
 
+        ui_thread.print_verbose("Port is not in use")
+
 
 class PyntContainerRegistry:
     _instance = None
@@ -361,8 +364,10 @@ class PyntContainerRegistry:
         return PyntContainerRegistry._instance
 
     def register_container(self, c: PyntContainerNative):
+        ui_thread.print_verbose("Registering container")
         self.containers.append(c)
 
     def stop_all_containers(self):
+        ui_thread.print_verbose("Stopping all containers")
         for c in self.containers:
             c.stop()

pyntcli/transport/pynt_requests.py

@@ -5,6 +5,8 @@ import pem
 import certifi
 import tempfile
 
+from pyntcli.ui import ui_thread
+
 
 class HostCaException(Exception):
     pass
@@ -71,3 +73,6 @@ def request_from_xml(method, url, proxies=None, data=None, **kwargs):
         return url
     except requests.exceptions.TooManyRedirects as e:
         return "Too many redirects for {}".format(url)
+    except Exception as e:
+        ui_thread.print_verbose(f"Failed to send request to {url} - {e}")
+        raise e

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyntcli
-Version: 0.1.109
+Version: 0.1.111
 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
@@ -12,4 +12,3 @@ Requires-Dist: certifi>=2017.4.17
 Requires-Dist: websocket-client
 Requires-Dist: xmltodict
 Requires-Dist: timedinput==0.1.1
-

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

@@ -1,14 +1,14 @@
 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=Cd4SdQA_B1lvL3flAA4RSH333OefFegLyvOlQ3QX7IA,24
+pyntcli/__init__.py,sha256=lrG5YEJvZGvdRdN0nHdBVYBbeJk9t0y5VzK8HCgSUHk,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=sR5D2vlOXj9Qae3c1-VWfIXMouXoEv2Ik3O-C-Wqqkc,13891
+pyntcli/commands/burp.py,sha256=c3bqAAbrXdiy5aZlUQCWk3qhF_UjuZI_EOfWXJZzjgc,14102
 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
@@ -20,18 +20,18 @@ 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/commands/util.py,sha256=ev06aUlJ9tCSw1eAGVIsGlVVY4u0H6AJG9b5MB_bAzs,4594
 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=42Qgwcd5EgtF0RKa2e9O2AjGSngAz9rZveCMOHGZaS8,13233
+pyntcli/pynt_docker/pynt_container.py,sha256=3rp9Z9q6pAM6RYuhVIn5f6l0G9tz4j4LRr616-kzLTE,13734
 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
 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
+pyntcli/transport/pynt_requests.py,sha256=gOPwBpPj6qIymDRFNgcQmwoI5Rqs4GMk4pfBvaCBeTo,1870
 pyntcli/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/ui/progress.py,sha256=RrnO_jJNunoyupylakmWmHOEPw3lh99OHpKBzL6OBiE,1008
 pyntcli/ui/prompt.py,sha256=tK3BFYvgT7ZgSrsN5ASkltcsbhy8tOdNfEjRyCjOk6Q,1570
@@ -40,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.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.111.dist-info/METADATA,sha256=UFWXUEgPkYiQljEHLS2poC0J19AjL9W-GFFDkibWJoE,427
+pyntcli-0.1.111.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pyntcli-0.1.111.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.111.dist-info/top_level.txt,sha256=64XSgBzSpgwjYjEKHZE7q3JH2a816zEeyZBXfJi3AKI,42
+pyntcli-0.1.111.dist-info/RECORD,,

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

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