pyntcli 0.1.80__py3-none-any.whl → 0.1.82__py3-none-any.whl

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.80"
+__version__ = "0.1.82"

pyntcli/analytics/send.py

@@ -1,15 +1,19 @@
 import requests
 import time
 import platform
+import socket
+import subprocess
 
 from pyntcli import __version__
 from pyntcli.transport import pynt_requests
 import pyntcli.log.log as log
+from pyntcli.ui import ui_thread
 
 
 PYNT_DEFAULT_USER_ID = "d9e3b82b-2900-43bf-8c8f-7ffe2f0cda36"
 MIXPANEL_TOKEN = "05c26edb86084bbbb803eed6818cd8aa"
-MIXPANEL_URL = "https://api-eu.mixpanel.com/track?ip=1"
+MIXPANEL_DOMAIN = "api-eu.mixpanel.com"
+MIXPANEL_URL = f"https://{MIXPANEL_DOMAIN}/track?ip=1"
 
 logger = log.get_logger()
 
@@ -47,18 +51,32 @@ class AnalyticsSender():
         self.user_id = user_id
         self.version = __version__
         self.events = []
+        self.disable_analytics = False
 
     @staticmethod
     def instance():
         if not AnalyticsSender._instance:
             AnalyticsSender._instance = AnalyticsSender()
+            AnalyticsSender._instance.check_network_restrictions()
 
         return AnalyticsSender._instance
 
+    def check_network_restrictions(self):
+        try:
+            result = subprocess.run(["ping", "-c", "1", MIXPANEL_DOMAIN], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, timeout=2)
+            if result.returncode != 0:
+                self.set_disable_analytics("ping return code not 0")
+        except (socket.gaierror, subprocess.TimeoutExpired):
+            self.set_disable_analytics("timeout")
+
+    def set_disable_analytics(self, reason: str):
+        self.disable_analytics = True
+        logger.debug(f"Disabling analytics due to : {reason}")
+
     def base_event(self, event_type):
         return {
             "event": event_type,
-            "properties":  {
+            "properties": {
                 "time": time.time(),
                 "distinct_id": self.user_id,
                 "$os": platform.platform(),
@@ -75,10 +93,10 @@ class AnalyticsSender():
                 base_event["properties"][k] = v
 
         if self.user_id != PYNT_DEFAULT_USER_ID:
-            try:
+            if self.disable_analytics:
+                logger.info(f"Analytics disabled, sending to logz: {base_event}")
+            else:
                 pynt_requests.post(MIXPANEL_URL, json=[base_event])
-            except Exception:
-                logger.info(f"mixpanel unavailable, sending to logz: {base_event}")
         else:
             self.events.append(base_event)
 
@@ -99,8 +117,9 @@ class AnalyticsSender():
 
     def done(self):
         if self.events:
-            try:
+            if self.disable_analytics:
+                logger.info(f"Analytics disabled, sending to logz: {self.events}")
+            else:
                 pynt_requests.post(MIXPANEL_URL, json=self.events)
-            except Exception:
-                logger.info(f"mixpanel unavailable, sending to logz: {self.events}")
+
             self.events = []

pyntcli/commands/burp.py

@@ -10,6 +10,7 @@ from subprocess import Popen, PIPE
 from functools import partial
 import xmltodict
 import base64
+import pyntcli.log.log as log
 from xml.parsers.expat import ExpatError
 
 from pyntcli.pynt_docker import pynt_container
@@ -30,6 +31,9 @@ methods = [
     "connect",
 ]
 
+logger = log.get_logger()
+supported_encoding = ["utf-8", "latin1", "utf-16", "cp1252"]
+
 
 def is_valid_method(method: str):
     if method.lower() in methods:
@@ -37,9 +41,31 @@ def is_valid_method(method: str):
     return False
 
 
+def decode_request(item) -> str:
+    error = None
+    for encoding in supported_encoding:
+        try:
+            return base64.b64decode(item["request"]["#text"]).decode(encoding)
+        except UnicodeDecodeError as e:
+            error = e
+            continue
+        except Exception as e:
+            error = e
+            break
+
+    ui_thread.print(
+        ui_thread.PrinterText(
+            f"Error decoding request: {error}"),
+        ui_thread.PrinterText.WARNING)
+    logger.error(f"Error decoding request: {error}")
+
+    raise e
+
+
 def replay_req(item, proxy_port):
     url = item["url"]
-    decoded_req = base64.b64decode(item["request"]["#text"]).decode("utf-8")
+    decoded_req = decode_request(item)
+
     method = decoded_req.split("\r\n")[0].split(" ")[0]
 
     if not is_valid_method(method):
@@ -289,12 +315,12 @@ class BurpCommand(sub_command.PyntSubCommand):
                 json_report_path = util.get_user_report_path(full_path, "json")
 
             if html_report:
-                with open(html_report_path, "w",encoding="utf-8") as html_file:
+                with open(html_report_path, "w", encoding="utf-8") as html_file:
                     html_file.write(html_report)
                 webbrowser.open("file://{}".format(html_report_path))
 
             if json_report:
-                with open(json_report_path, "w",encoding="utf-8") as json_file:
+                with open(json_report_path, "w", encoding="utf-8") as json_file:
                     json_file.write(json_report)
                 reporter = cli_reporter.PyntReporter(json_report_path)
                 reporter.print_summary()

pyntcli/main.py

@@ -6,7 +6,6 @@ from pyntcli.commands import pynt_cmd
 from pyntcli.pynt_docker import pynt_container
 from pyntcli.ui import ui_thread
 from pyntcli.ui import pynt_errors
-from pyntcli.ui import ui_thread
 from pyntcli.auth import login
 from pyntcli.analytics import send as analytics
 from requests.exceptions import SSLError

{pyntcli-0.1.80.dist-info → pyntcli-0.1.82.dist-info}/METADATA

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

@@ -1,11 +1,11 @@
-pyntcli/__init__.py,sha256=7BO6MGkPGuN-ZrZBKBek9x0F-EwGEiaELuB5k1018oE,23
-pyntcli/main.py,sha256=7ZDeG3IO04T98D2NJ1vHWVAVJVm8y719NeV2Aom7tPY,5171
+pyntcli/__init__.py,sha256=YThvBsPSPw2rCgZQb5SxE-vfr4Y0SBQRhFo1VmMzEQg,23
+pyntcli/main.py,sha256=qTGMG2JSpieg-1RRgBz9dPL4vHo1WJJIxTPQYAuzxuY,5138
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyntcli/analytics/send.py,sha256=cKvMw4HIGJGLip5OMPqTv1AJDlKlc_Uk2Sfcl0e3QLE,2845
+pyntcli/analytics/send.py,sha256=pJOyOWl3g_Vm9apKK3LzNVqsnC6zsWA1bCK3ZegbLpc,3637
 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=KuxeX9I0ZXSVAMHdt9OYFok79X9IK6z71-ZN-_fnrvU,10565
+pyntcli/commands/burp.py,sha256=2FqLc65SjuXdenUS1ggC6dGRU_iSA52Ft_8OnfGsm_8,11193
 pyntcli/commands/command.py,sha256=0O7Za_cjT6vDkDfM0OTMPB6DLI3U1r1R7lXQydz7458,9495
 pyntcli/commands/har.py,sha256=mSCbTUnxQrKzJd-dAWoc6Tkw6tU1LDH7Ha1w2ylrrrg,3654
 pyntcli/commands/id_command.py,sha256=UBEgMIpm4vauTCsKyixltiGUolNg_OfHEJvJ_i5BpJY,943
@@ -35,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=KFlzWhXBAuwdi7GXf16gCB3ya94LQG2wjcSChE149rQ,3798
 tests/store/test_cred_store.py,sha256=_7-917EtNC9eKEumO2_lt-7KuDmCwOZFaowCm7DbA_A,254
-pyntcli-0.1.80.dist-info/METADATA,sha256=vpZ6n4DcVQ0o7mAw6eubAsPDT7buPIzGBwbDDN0rbuA,463
-pyntcli-0.1.80.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-pyntcli-0.1.80.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.80.dist-info/top_level.txt,sha256=u9MDStwVHB7UG8PUcODeWCul_NvzL2EzoLvSlgwLHFs,30
-pyntcli-0.1.80.dist-info/RECORD,,
+pyntcli-0.1.82.dist-info/METADATA,sha256=WpnF74sRKWiYhqK37FpYb6ggOl_FscYOIjVjaAedZuU,463
+pyntcli-0.1.82.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+pyntcli-0.1.82.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.82.dist-info/top_level.txt,sha256=u9MDStwVHB7UG8PUcODeWCul_NvzL2EzoLvSlgwLHFs,30
+pyntcli-0.1.82.dist-info/RECORD,,