pyntcli 0.1.74__py3-none-any.whl → 0.1.75__py3-none-any.whl

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.74"
+__version__ = "0.1.75"

pyntcli/commands/har.py

@@ -51,9 +51,9 @@ class HarSubCommand(sub_command.PyntSubCommand):
         return har_cmd
 
     def run_cmd(self, args: argparse.Namespace):
-        port = str(util.find_open_port())
+        port = util.find_open_port()
         container = pynt_container.get_container_with_arguments(
-            args, pynt_container.PyntDockerPort(src=port, dest=port, name="--port")
+            args, pynt_container.PyntDockerPort(src=str(port), dest=port, name="--port")
         )
 
         if not os.path.isfile(args.har):

pyntcli/commands/newman.py

@@ -59,9 +59,9 @@ class NewmanSubCommand(sub_command.PyntSubCommand):
         return newman_cmd
 
     def run_cmd(self, args: argparse.Namespace):
-        port = str(util.find_open_port())
+        port = util.find_open_port()
         container = pynt_container.get_container_with_arguments(
-            args, pynt_container.PyntDockerPort(src=port, dest=port, name="--port")
+            args, pynt_container.PyntDockerPort(src=str(port), dest=port, name="--port")
         )
 
         if not os.path.isfile(args.collection):

pyntcli/commands/postman.py

@@ -94,9 +94,6 @@ class PostmanSubCommand(sub_command.PyntSubCommand):
 
         container = pynt_container.get_container_with_arguments(args, pynt_container.PyntDockerPort("5001", args.port, name="--port"))
 
-        if util.is_port_in_use(args.port):
-            ui_thread.print(ui_thread.PrinterText("Port: {} already in use, please use a different one".format(args.port), ui_thread.PrinterText.WARNING))
-            return
 
         postman_docker = pynt_container.PyntContainer(image_name=pynt_container.PYNT_DOCKER_IMAGE,
                                                       tag="postman-latest",

pyntcli/commands/util.py

@@ -15,79 +15,81 @@ from pyntcli.transport import pynt_requests
 
 logger = log.get_logger()
 
-def is_port_in_use(port: int) -> bool:
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-        return s.connect_ex(('localhost', port)) == 0
 
 def find_open_port() -> int:
     with socket.socket() as s:
-        s.bind(('', 0))            
-        return s.getsockname()[1] 
+        s.bind(('', 0))
+        return s.getsockname()[1]
+
 
 HEALTHCHECK_TIMEOUT = 60
 HEALTHCHECK_INTERVAL = 0.1
 
-def wait_for_healthcheck(address): 
+
+def wait_for_healthcheck(address):
     start = time.time()
-    while start + HEALTHCHECK_TIMEOUT > time.time(): 
+    while start + HEALTHCHECK_TIMEOUT > time.time():
         try:
             res = pynt_requests.get(address + "/healthcheck")
             if res.status_code == 418:
-                return 
-        except: 
+                return
+        except:
             time.sleep(HEALTHCHECK_INTERVAL)
 
     logger.debug("Health check timed out!")
     raise TimeoutError()
 
-def get_user_report_path(path,file_type):
+
+def get_user_report_path(path, file_type):
     path = Path(path)
     if path.is_dir():
-        return os.path.join(path, "pynt_results_{}.{}".format(int(time.time()),file_type))
-    
+        return os.path.join(path, "pynt_results_{}.{}".format(int(time.time()), file_type))
+
     return os.path.join(str(path.parent), path.stem + ".{}".format(file_type))
-    
+
 
 class HtmlReportNotCreatedException(Exception):
     pass
 
-class SomeFoundingsOrWargningsException(Exception):
+
+class SomeFindingsOrWarningsException(Exception):
     pass
 
+
 @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")
 
-    if "reporters" in args and args.reporters: 
+    if "reporters" in args and args.reporters:
         html_report_path = os.path.join(os.getcwd(), "pynt_results.html")
         json_report_path = os.path.join(os.getcwd(), "pynt_results.json")
 
     mounts = []
-    with open(html_report_path, "w"), open(json_report_path, "w"):    
+    with open(html_report_path, "w"), open(json_report_path, "w"):
         mounts.append(pynt_container.create_mount(json_report_path, "/etc/pynt/results/results.json"))
         mounts.append(pynt_container.create_mount(html_report_path, "/etc/pynt/results/results.html"))
-    
+
     yield mounts
-    
+
     if os.stat(html_report_path).st_size == 0:
         raise HtmlReportNotCreatedException()
-    
+
     webbrowser.open("file://{}".format(html_report_path))
 
     if os.stat(html_report_path).st_size > 0:
         report.PyntReporter(json_report_path).print_summary()
-    
+
     check_for_findings_or_warnings(args, json.load(open(json_report_path)))
 
+
 def check_for_findings_or_warnings(args, json_report):
-    security_tests = json_report.get("securityTests",{})
+    security_tests = json_report.get("securityTests", {})
     findings = security_tests.get("Findings", 0)
     warnings = security_tests.get("Warnings", 0)
 
     if "return_error" in args and args.return_error != "never" and findings != 0:
-        raise SomeFoundingsOrWargningsException()
+        raise SomeFindingsOrWarningsException()
 
     if "return_error" in args and args.return_error == "all-findings" and warnings != 0:
-        raise SomeFoundingsOrWargningsException()
-
+        raise SomeFindingsOrWarningsException()

pyntcli/main.py

@@ -10,9 +10,10 @@ from pyntcli.ui import ui_thread
 from pyntcli.auth import login
 from pyntcli.analytics import send as analytics
 from requests.exceptions import SSLError
+from requests.exceptions import ProxyError
 from pyntcli.transport.pynt_requests import InvalidPathException, InvalidCertFormat
 from pyntcli.commands.util import HtmlReportNotCreatedException
-from pyntcli.commands.util import SomeFoundingsOrWargningsException
+from pyntcli.commands.util import SomeFindingsOrWarningsException
 from pyntcli.commands.postman import PyntWebSocketException
 from pyntcli import __version__
 
@@ -58,35 +59,41 @@ def main():
         cli = pynt_cmd.PyntCommand()
         cli.run_cmd(cli.parse_args(argv[1:]))
         analytics.stop()
-    except pynt_cmd.PyntCommandException:
+    except pynt_cmd.PyntCommandException as e:
         pynt_cmd.root.usage()
-    except pynt_container.DockerNotAvailableException:
+    except pynt_container.DockerNotAvailableException as e:
         ui_thread.print(ui_thread.PrinterText("Docker was unavailable, please make sure docker is installed and running.", ui_thread.PrinterText.WARNING))
-        analytics.emit(analytics.ERROR, {"error": "docker unavailable"})
-    except SSLError:
+        analytics.emit(analytics.ERROR, {"error": "docker unavailable. e: {}".format(e)})
+    except SSLError as e:
         ui_thread.print(ui_thread.PrinterText("We encountered SSL issues and could not proceed, this may be the cause of a VPN or a Firewall in place. Run again with --insecure", ui_thread.PrinterText.WARNING))
-    except login.Timeout:
+        analytics.emit(analytics.ERROR, {"error": "ssl error. e: {}".format(e)})
+    except login.Timeout as e:
         ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to incomplete registration, please try again.", ui_thread.PrinterText.WARNING))
-        analytics.emit(analytics.ERROR, {"error": "login timeout"})
-    except login.InvalidTokenInEnvVarsException:
+        analytics.emit(analytics.ERROR, {"error": "login timeout. e: {}".format(e)})
+    except login.InvalidTokenInEnvVarsException as e:
         ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to malformed credentials provided in env vars.", ui_thread.PrinterText.WARNING))
-        analytics.emit(analytics.ERROR, {"error": "invalid pynt cli credentials in env vars"})
-    except pynt_container.ImageUnavailableException:
-        analytics.emit(analytics.ERROR, {"error": "Couldn't pull pynt image and no local image found"})
-        ui_thread.print(ui_thread.PrinterText("Error: Couldn't pull pynt image and no local image found.",ui_thread.PrinterText.WARNING))
-    except HtmlReportNotCreatedException:
-        analytics.emit(analytics.ERROR, {"error": "Html report was not created"})
-        pynt_errors.unexpected_error()
+        analytics.emit(analytics.ERROR, {"error": "invalid pynt cli credentials in env vars. e: {}".format(e)})
+    except pynt_container.ImageUnavailableException as e:
+        analytics.emit(analytics.ERROR, {"error": "Couldn't pull pynt image and no local image found. e: {}".format(e)})
+        ui_thread.print(ui_thread.PrinterText("Error: Couldn't pull pynt image and no local image found.", ui_thread.PrinterText.WARNING))
+    except HtmlReportNotCreatedException as e:
+        analytics.emit(analytics.ERROR, {"error": "Html report was not created. e: {}".format(e)})
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited: Html report was not created.", ui_thread.PrinterText.WARNING))
     except InvalidPathException as e:
         ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to invalid host-CA path: {}".format(e), ui_thread.PrinterText.WARNING))
-        analytics.emit(analytics.ERROR, {"error": "Host CA path provided was invalid"})
+        analytics.emit(analytics.ERROR, {"error": "Host CA path provided was invalid. e: {}".format(e)})
     except InvalidCertFormat as e:
         ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to invalid host-CA. Please provide a file in PEM format: {}".format(e), ui_thread.PrinterText.WARNING))
-        analytics.emit(analytics.ERROR, {"error": "Host CA provided was not in valid pem format"})
-    except PyntWebSocketException:
-        analytics.emit(analytics.ERROR, {"error": "postman websocket failed to connect"})
-        pynt_errors.unexpected_error()
-    except SomeFoundingsOrWargningsException as e:
+        analytics.emit(analytics.ERROR, {"error": "Host CA provided was not in valid pem format. e: {}".format(e)})
+    except PyntWebSocketException as e:
+        analytics.emit(analytics.ERROR, {"error": "postman websocket failed to connect. e: {}".format(e)})
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited: postman websocket failed to connect", ui_thread.PrinterText.WARNING))
+    except ProxyError as e:
+        ui_thread.print(ui_thread.PrinterText("Pynt CLI exited due to a proxy error. check if your proxy is up", ui_thread.PrinterText.WARNING))
+        analytics.emit(analytics.ERROR, {"error": "there was a proxy error. e: {}".format(e)})
+    except pynt_container.PortInUseException as e:
+        analytics.emit(analytics.ERROR, {"error": "port in use. e: {}".format(e)})
+    except SomeFindingsOrWarningsException as e:
         exit(1)
     except Exception as e:
         analytics.emit(analytics.ERROR, {"error": "{}".format(e)})

pyntcli/pynt_docker/container_utils.py

@@ -0,0 +1,7 @@
+
+import socket
+
+
+def is_port_in_use(port: int) -> bool:
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        return s.connect_ex(('localhost', port)) == 0

pyntcli/pynt_docker/pynt_container.py

@@ -6,6 +6,8 @@ import argparse
 from typing import List
 import base64
 
+from . import container_utils
+
 from pyntcli.ui import ui_thread
 from pyntcli.analytics import send as analytics
 from pyntcli.store import CredStore
@@ -26,6 +28,12 @@ class ImageUnavailableException(Exception):
     pass
 
 
+class PortInUseException(Exception):
+    def __init__(self, port=""):
+        self.message = ui_thread.print(ui_thread.PrinterText("Port: {} already in use, please use a different one".format(port), ui_thread.PrinterText.WARNING))
+        super().__init__(self.message)
+
+
 def get_docker_type():
     try:
         c = docker.from_env()
@@ -60,16 +68,20 @@ class PyntDockerPort:
 
 def get_container_with_arguments(args: argparse.Namespace, *port_args: PyntDockerPort) -> PyntBaseConatiner:
     docker_arguments = []
-    if "desktop" in get_docker_type().lower():
-        ports = {}
-        for p in port_args:
+    ports = {}
+    for p in port_args:
+        if container_utils.is_port_in_use(p.dest):
+            raise PortInUseException(p.dest)
+        if "desktop" in get_docker_type().lower():
             ports[str(p.src)] = int(p.dest)
+        else:
+            docker_arguments.append(p.name)
+            docker_arguments.append(str(p.dest))
+
+    if "desktop" in get_docker_type().lower():
         docker_type = PyntDockerDesktopContainer(ports=ports)
     else:
         docker_type = PyntNativeContainer(network="host")
-        for p in port_args:
-            docker_arguments.append(p.name)
-            docker_arguments.append(str(p.dest))
 
     if "insecure" in args and args.insecure:
         docker_arguments.append("--insecure")

{pyntcli-0.1.74.dist-info → pyntcli-0.1.75.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
-pyntcli/__init__.py,sha256=KewwZnnRMQkstdiLHG6R7ciil5WtDn_QVk-Z392irYc,23
-pyntcli/main.py,sha256=intiqInoRbIF_lE8ilxQBP5aloPAtAvUBdF4k0Rqfxw,4289
+pyntcli/__init__.py,sha256=FJWQjdyjCSq1G0xvL-leZBsVKT8Trwi_Y3BZDT0-Bus,23
+pyntcli/main.py,sha256=7ZDeG3IO04T98D2NJ1vHWVAVJVm8y719NeV2Aom7tPY,5171
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/analytics/send.py,sha256=cKvMw4HIGJGLip5OMPqTv1AJDlKlc_Uk2Sfcl0e3QLE,2845
 pyntcli/auth/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -7,19 +7,20 @@ pyntcli/auth/login.py,sha256=CosHIB1HHWa3cGjpE4uHNxsi_7SPL-I6Da0zCq3OcmU,5012
 pyntcli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/commands/burp.py,sha256=tbGpKP4NEuEZYSuBxqvLJaC4kRqtv0GO6BpBfPX2DRM,10397
 pyntcli/commands/command.py,sha256=UvJEHv69iQ03R0pN2RCsi3my48xwSMoDBTvcnbg_XzE,9477
-pyntcli/commands/har.py,sha256=Iq0455umKvlcMxcU4l70-NIZh7Wovry3f76u68drmQ4,3654
+pyntcli/commands/har.py,sha256=mSCbTUnxQrKzJd-dAWoc6Tkw6tU1LDH7Ha1w2ylrrrg,3654
 pyntcli/commands/id_command.py,sha256=UBEgMIpm4vauTCsKyixltiGUolNg_OfHEJvJ_i5BpJY,943
 pyntcli/commands/listen.py,sha256=ZfzCM8P0TVweC42NCL24_1yK48_NvRER6Vi8_oChaT0,8450
-pyntcli/commands/newman.py,sha256=ctq9cuEH1GnFOhGshAn6eNfyw3rrrLMaeoWIVcf9JQs,4826
-pyntcli/commands/postman.py,sha256=yPE8jBITEhDT7htUaa7r2jxKfHwuSKj9177HGinABCs,4938
+pyntcli/commands/newman.py,sha256=y0KolwMgsvoqPz2mp0QRug_qNr-ftOZbu_tN7h4bH7I,4826
+pyntcli/commands/postman.py,sha256=GWq4NJJ_9WdFiXk5rv2nTyMM27w50XLh4LKkuuWpw4I,4721
 pyntcli/commands/pynt_cmd.py,sha256=KOl9guUtesO2JcMM5nPKKkjnK6F9HV4jHHcoUk4KVhw,2825
 pyntcli/commands/root.py,sha256=GijCi8hqe8sXEo6faWimlCmT8d782yjrw1IWJT5RAMk,3320
 pyntcli/commands/sub_command.py,sha256=GF3-rE_qk2L4jGPFqHLm9SdGINmu3EakhjJTFyWjRms,374
-pyntcli/commands/util.py,sha256=IREZvHYJ7wEth8ujOkk5ZXZ4UrUA7jDv134_UueED4s,2995
+pyntcli/commands/util.py,sha256=mi9c6Ex0ftpdY0jvI5BiBD2zwJD6RhrPQ2VyfxBZlA8,2793
 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/pynt_container.py,sha256=rMHdTOace-hJjhKbY8u9VxrVG6J5ymfEYiCGBGrIiEI,8332
+pyntcli/pynt_docker/container_utils.py,sha256=_Onn7loInzyJAG2-Uk6CGpsuRyelmUFHOvtJj4Uzi9A,175
+pyntcli/pynt_docker/pynt_container.py,sha256=y4m8wZU16gqFPaMzEJKKHut4DbjPxr_du8g7I4-AcHk,8761
 pyntcli/store/__init__.py,sha256=xuS9OB21F6B1sUx5XPGxz_6WpG6-KTMbuq50RrZS5OY,29
 pyntcli/store/json_connector.py,sha256=UGs3uORw3iyn0YJ8kzab-veEZToA6d-ByXYuqEleWsA,560
 pyntcli/store/store.py,sha256=Kf4IFCAu0i0DPVGgntrSYUiwz6kmW9HvItKnCT-MosE,1905
@@ -34,8 +35,8 @@ pyntcli/ui/ui_thread.py,sha256=OVTbiIFMg2KgxAvHf7yy86xGm4RVS2vj_VYZkMi-SRY,4956
 tests/conftest.py,sha256=gToq5K74GtgeGQXjFvXSzMaE6axBYxAzcFG5XJPOXjI,427
 tests/auth/test_login.py,sha256=juYxYZWfNmAuwm-ygGEF5gjzaR9LcimonDr7pN5vgLI,3209
 tests/store/test_cred_store.py,sha256=_7-917EtNC9eKEumO2_lt-7KuDmCwOZFaowCm7DbA_A,254
-pyntcli-0.1.74.dist-info/METADATA,sha256=mEvK3_PCXXcU-hNBhwdEsB5ZHWkf6doTvEtYCeSXZxw,463
-pyntcli-0.1.74.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pyntcli-0.1.74.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.74.dist-info/top_level.txt,sha256=u9MDStwVHB7UG8PUcODeWCul_NvzL2EzoLvSlgwLHFs,30
-pyntcli-0.1.74.dist-info/RECORD,,
+pyntcli-0.1.75.dist-info/METADATA,sha256=RC4dmb_LHLW2n3oSNK5--zOSaOJBC2Hcm-7LQrUakiU,463
+pyntcli-0.1.75.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pyntcli-0.1.75.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.75.dist-info/top_level.txt,sha256=u9MDStwVHB7UG8PUcODeWCul_NvzL2EzoLvSlgwLHFs,30
+pyntcli-0.1.75.dist-info/RECORD,,