pyntcli 0.1.87__py3-none-any.whl → 0.1.89__py3-none-any.whl

pyntcli/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.87"
+__version__ = "0.1.89"

pyntcli/commands/burp.py

@@ -62,7 +62,7 @@ def decode_request(item) -> str:
     raise e
 
 
-def replay_req(item, proxy_port):
+def replay_req(session, item, proxy_port):
     url = item["url"]
     if not util.is_http_handler(url):
         return None
@@ -93,6 +93,7 @@ def replay_req(item, proxy_port):
     body = decoded_req.split("\r\n\r\n")[1]
     ui_thread.print(ui_thread.PrinterText(f"{url}"))
     pynt_requests.request_from_xml(
+        session=session,
         method=method,
         url=url,
         headers=headers,
@@ -107,10 +108,11 @@ def replay_req(item, proxy_port):
 def run_burp_xml(doc, proxy_port):
     items = doc["items"]["item"]
     ui_thread.print(ui_thread.PrinterText("Creating traffic from xml file"))
+    session = pynt_requests.get_new_session()
     if isinstance(items, dict):
-        replay_req(item=items, proxy_port=proxy_port)
+        replay_req(session, item=items, proxy_port=proxy_port)
     else:
-        [replay_req(i, proxy_port=proxy_port) for i in doc["items"]["item"]]
+        [replay_req(session, i, proxy_port=proxy_port) for i in doc["items"]["item"]]
 
 
 def parse_xml(xml_path):
@@ -136,6 +138,7 @@ def burp_usage():
         .with_line("")
         .with_line("Options:", style=ui_thread.PrinterText.HEADER)
         .with_line("\t--xml - Path to the xml to run tests on")
+        .with_line('\t--captured-domains - Pynt will scan only these domains and subdomains. For all domains write "*"')
         .with_line("\t--port - Set the port pynt will listen to (DEFAULT: 5001)")
         .with_line("\t--ca-path - The path to the CA file in PEM format")
         .with_line("\t--proxy-port - Set the port proxied traffic should be routed to (DEFAULT: 6666)")
@@ -166,10 +169,11 @@ class BurpCommand(sub_command.PyntSubCommand):
         burp_cmd.add_argument("--xml", help="", default="", required=True)
         burp_cmd.add_argument("--ca-path", type=str, default="")
         burp_cmd.add_argument("--report", type=str, default="")
+        burp_cmd.add_argument("--captured-domains", nargs="+", help="", default="")
         burp_cmd.add_argument(
             "--return-error",
             choices=["all-findings", "errors-only", "never"],
-            default="never"
+            default="never",
         )
         burp_cmd.print_usage = self.print_usage
         burp_cmd.print_help = self.print_usage
@@ -233,6 +237,10 @@ class BurpCommand(sub_command.PyntSubCommand):
                 args.proxy_port, args.proxy_port, "--proxy-port"
             ),
         )
+
+        for host in args.captured_domains:
+            container.docker_arguments += ["--host-targets", host]
+
         if "ca_path" in args and args.ca_path:
             if not os.path.isfile(args.ca_path):
                 ui_thread.print(
@@ -312,10 +320,10 @@ class BurpCommand(sub_command.PyntSubCommand):
         )
 
         with ui_thread.progress(
-                "ws://localhost:{}/progress?scanId={}".format(args.port, self.scan_id),
-                partial(lambda *args: None),
-                "scan in progress...",
-                100,
+            "ws://localhost:{}/progress?scanId={}".format(args.port, self.scan_id),
+            partial(lambda *args: None),
+            "scan in progress...",
+            100,
         ):
             html_report = self._get_report(args, "html")
             html_report_path = os.path.join(

pyntcli/commands/har.py

@@ -8,6 +8,7 @@ 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 (
@@ -55,7 +56,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=str(port), dest=port, name="--port")
+            args, pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, dest=port, name="--port")
         )
 
         if not os.path.isfile(args.har):

pyntcli/commands/newman.py

@@ -8,6 +8,7 @@ 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 (
@@ -62,7 +63,7 @@ class NewmanSubCommand(sub_command.PyntSubCommand):
     def run_cmd(self, args: argparse.Namespace):
         port = util.find_open_port()
         container = pynt_container.get_container_with_arguments(
-            args, pynt_container.PyntDockerPort(src=str(port), dest=port, name="--port")
+            args, pynt_container.PyntDockerPort(src=PYNT_CONTAINER_INTERNAL_PORT, dest=port, name="--port")
         )
 
         if not os.path.isfile(args.collection):

pyntcli/transport/pynt_requests.py

@@ -39,12 +39,12 @@ def add_host_ca(ca_path):
     cert_data = open(ca_path, "rb").read()
 
     cafile = certifi.where()
-    ca_chain = open(cafile, 'rb').read()
+    ca_chain = open(cafile, "rb").read()
 
     bundle_path = os.path.join(tempfile.gettempdir(), "bundle.pem")
     with open(bundle_path, "wb") as f:
         f.write(ca_chain)
-        f.write(b'\n')
+        f.write(b"\n")
         f.write(cert_data)
 
     verify = bundle_path
@@ -62,5 +62,16 @@ def put(url, data=None, **kwargs):
     return requests.put(url, data=data, verify=verify, **kwargs)
 
 
-def request_from_xml(method, url, proxies=None, data=None,  **kwargs):
-    return requests.request(method=method, url=url, data=data, verify=False, proxies=proxies, **kwargs)
+def get_new_session():
+    s = requests.session()
+    s.max_redirects = 500
+
+    return s
+
+
+def request_from_xml(
+    session: requests.Session, method, url, proxies=None, data=None, **kwargs
+):
+    return session.request(
+        method=method, url=url, data=data, verify=False, proxies=proxies, **kwargs
+    )

{pyntcli-0.1.87.dist-info → pyntcli-0.1.89.dist-info}/METADATA

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

@@ -1,16 +1,16 @@
-pyntcli/__init__.py,sha256=DqFIxZO1qWYGIooEyrZV7d6zn4AaSeN_vya1dM6dtRc,23
+pyntcli/__init__.py,sha256=PY93tkOmcPlWKkwp9BLM87U29v6noa-gTaI98NliUTA,23
 pyntcli/main.py,sha256=eJFpT-haLVQAYP71_ZHjNaA5iG2wvDXy8km84GU0Mwo,6009
 pyntcli/analytics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=O-KKyp6kcbTeHMEKsABlLQfI6rFqz229pef53UkpGlQ,11840
+pyntcli/commands/burp.py,sha256=A56AD9Cx-JmzrsHyVHEj4OQzFaXYQRIi_svU8HtBl5Y,12240
 pyntcli/commands/command.py,sha256=0lCMxXIyj3vAd8NfeQ2Ik1WhV8RHq17cwwaQn2isRzQ,10411
-pyntcli/commands/har.py,sha256=iBFd_Zqjths3JztmHHJBvIbrfT98ANVK180tVXqFXFk,4063
+pyntcli/commands/har.py,sha256=pl-qPZE6yOlLrruZ2bGiDkEpEVkLmnxb68bRxgzdszg,4120
 pyntcli/commands/id_command.py,sha256=UBEgMIpm4vauTCsKyixltiGUolNg_OfHEJvJ_i5BpJY,943
 pyntcli/commands/listen.py,sha256=L8lpa8r-mZor9F_ad9L7KQAznljSEOgn_LPURm4e6dM,8789
-pyntcli/commands/newman.py,sha256=MQ7EG1QTm-Xnb_gfpx_DYo1BeoV_Y5SFIBJrtKCZZB8,5181
+pyntcli/commands/newman.py,sha256=tXbb9hY0rO1-INvEiXia5-_TDhiA5QqdmgOKs_Jd6DY,5238
 pyntcli/commands/postman.py,sha256=wh0sgJTTkUDY5GFKxCKMrcE9OmSZk6nufltsIlJb6As,5013
 pyntcli/commands/pynt_cmd.py,sha256=KOl9guUtesO2JcMM5nPKKkjnK6F9HV4jHHcoUk4KVhw,2825
 pyntcli/commands/root.py,sha256=inffMhaMJykoRC0T2f7uF3f5BEdJw_c6Q1e2FTG4bfU,3511
@@ -27,7 +27,7 @@ pyntcli/store/json_connector.py,sha256=UGs3uORw3iyn0YJ8kzab-veEZToA6d-ByXYuqEleW
 pyntcli/store/store.py,sha256=9KwalOd1EA1VtYwr9oJgBsPgUYakX5uyif_sNXGQ614,1917
 pyntcli/store/store_connector.py,sha256=w4LzcpRZesUZL1f63RmLlWEFRtJ6Y6rcS6PkkGtO4MA,357
 pyntcli/transport/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyntcli/transport/pynt_requests.py,sha256=KiEG3hNcwY7DLIJDCq-7LIPq54yYQcDBhHe3KhpqRTc,1563
+pyntcli/transport/pynt_requests.py,sha256=e-km_PonlrnQ2jwZHcCfNuv4laFWpaJjH-_f4Fge26M,1700
 pyntcli/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyntcli/ui/progress.py,sha256=RrnO_jJNunoyupylakmWmHOEPw3lh99OHpKBzL6OBiE,1008
 pyntcli/ui/pynt_errors.py,sha256=00UprD4tFViREv7kuXGQ99PAKGTpXYixxi3Ndeoeiew,689
@@ -36,8 +36,8 @@ pyntcli/ui/ui_thread.py,sha256=4YzpO5dDrWpbTovMdHvv9ZQdLFJamZEAKXjF9rIIIoQ,5039
 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.87.dist-info/METADATA,sha256=buf6PtP3EoTWbUyD7cqhPJpPkj_stwuVePNRSfMzoDY,463
-pyntcli-0.1.87.dist-info/WHEEL,sha256=cpQTJ5IWu9CdaPViMhC9YzF8gZuS5-vlfoFihTBC86A,91
-pyntcli-0.1.87.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
-pyntcli-0.1.87.dist-info/top_level.txt,sha256=u9MDStwVHB7UG8PUcODeWCul_NvzL2EzoLvSlgwLHFs,30
-pyntcli-0.1.87.dist-info/RECORD,,
+pyntcli-0.1.89.dist-info/METADATA,sha256=p-7mBPbyYjorg8Ksfw8-X64mbgRuaU4wcGkxcYL16No,463
+pyntcli-0.1.89.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+pyntcli-0.1.89.dist-info/entry_points.txt,sha256=kcGmqAxXDttNk2EPRcqunc_LTVp61gzakz0v-GEE2SY,43
+pyntcli-0.1.89.dist-info/top_level.txt,sha256=u9MDStwVHB7UG8PUcODeWCul_NvzL2EzoLvSlgwLHFs,30
+pyntcli-0.1.89.dist-info/RECORD,,

{pyntcli-0.1.87.dist-info → pyntcli-0.1.89.dist-info}/WHEEL

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