praetorian-cli 2.2.0__tar.gz → 2.2.1__tar.gz

{praetorian_cli-2.2.0/praetorian_cli.egg-info → praetorian_cli-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praetorian-cli
-Version: 2.2.0
+Version: 2.2.1
 Summary: For interacting with the Chariot API
 Home-page: https://github.com/praetorian-inc/praetorian-cli
 Author: Praetorian

{praetorian_cli-2.2.0 → praetorian_cli-2.2.1}/praetorian_cli/handlers/agent.py

@@ -43,6 +43,14 @@ def start(sdk, allowed):
         - praetorian chariot agent mcp start
         - praetorian chariot agent mcp start -a search_by_term -a risk_add
         - praetorian chariot agent mcp start -a search_* -a risk_add
+
+    \b
+    Claude code configuration/usage:
+        - claude mcp add chariot -- praetorian chariot agent mcp start # read-only
+        - claude mcp add chariot -- praetorian chariot agent mcp start -a search_by_query -a risk_add -a asset_add # select write tools
+        - claude "show me my chariot assets from the example.com domain"
+        - claude "show me my chariot assets with port 22 open"
+        - claude "run a portscan on every discovered ip for example.com"
     """
     if len(allowed) == 0:
         allowed = None

{praetorian_cli-2.2.0 → praetorian_cli-2.2.1}/praetorian_cli/handlers/test.py

@@ -15,6 +15,7 @@ from praetorian_cli.handlers.cli_decorators import cli_handler
 def test(chariot, key, suite):
     """ Run integration test suite """
     os.environ['CHARIOT_TEST_PROFILE'] = chariot.keychain.profile
+    os.environ['CHARIOT_PROXY'] = chariot.proxy
     command = [test_module.__path__[0]]
     if key:
         command.extend(['-k', key])

{praetorian_cli-2.2.0 → praetorian_cli-2.2.1}/praetorian_cli/sdk/chariot.py

@@ -1,4 +1,4 @@
-import json, requests
+import json, requests, os
 
 from praetorian_cli.sdk.entities.accounts import Accounts
 from praetorian_cli.sdk.entities.agents import Agents
@@ -49,6 +49,9 @@ class Chariot:
         self.credentials = Credentials(self)
         self.proxy = proxy
 
+        if self.proxy == '' and os.environ.get('CHARIOT_PROXY'):
+            self.proxy = os.environ.get('CHARIOT_PROXY')
+
         if self.proxy:
             import urllib3
             urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -62,9 +65,27 @@ class Chariot:
         if self.proxy:
             kwargs['proxies'] = {'http': self.proxy, 'https': self.proxy}
             kwargs['verify'] = False
+        
+        self._add_beta_filter(method, kwargs)
 
         return requests.request(method, url, headers=self.keychain.headers(), **kwargs)
 
+    def _add_beta_filter(self, method: str, kwargs: dict):
+        if method == 'GET' or method == 'DELETE':
+            self._add_beta_url_param(kwargs)
+        else:
+            self._add_beta_json_param(kwargs)
+
+    def _add_beta_url_param(self, kwargs: dict):
+        if 'params' in kwargs:
+            kwargs['params']['beta'] = 'true'
+        else:
+            kwargs['params'] = {'beta': 'true'}
+
+    def _add_beta_json_param(self, kwargs: dict):
+        if 'json' in kwargs:
+            kwargs['json']['beta'] = True
+
     def my(self, params: dict, pages=1) -> dict:
         final_resp = dict()
 

{praetorian_cli-2.2.0 → praetorian_cli-2.2.1}/praetorian_cli/sdk/entities/assets.py

@@ -26,7 +26,7 @@ class Assets:
         :return: The asset that was added
         :rtype: dict
         """
-        return self.api.upsert('asset', dict(group=group, identifier=identifier, status=status, surface=[surface], type=type))[0]
+        return self.api.upsert('asset', dict(group=group, identifier=identifier, status=status, attackSurface=[surface], type=type))[0]
 
     def get(self, key, details=False):
         """
@@ -57,10 +57,13 @@ class Assets:
         :return: None
         :rtype: None
         """
+        params = dict(key=key)
         if status:
-            self.api.upsert('asset', dict(key=key, status=status))
+            params = params | dict(status=status)
         if surface:
-            self.api.attributes.add(key, 'surface', surface)
+            params = params | dict(attackSurface=[surface])
+            
+        return self.api.upsert('asset', params)
 
     def delete(self, key):
         """

{praetorian_cli-2.2.0 → praetorian_cli-2.2.1}/praetorian_cli/sdk/test/test_asset.py

@@ -14,8 +14,8 @@ class TestAsset:
     def test_add_asset(self):
         asset = self.sdk.assets.add(self.asset_dns, self.asset_name, status=Asset.ACTIVE.value, surface='test-surface')
         assert asset['key'] == self.asset_key
-        assert len(asset['surface']) == 1
-        assert asset['surface'][0] == 'test-surface'
+        assert len(asset['attackSurface']) == 1
+        assert 'test-surface' in asset['attackSurface']
         assert asset['status'] == Asset.ACTIVE.value
 
     def test_get_asset(self):
@@ -30,11 +30,10 @@ class TestAsset:
         assert any([a['group'] == self.asset_dns for a in results])
 
     def test_update_asset(self):
-        self.sdk.assets.update(self.asset_key, status=Asset.FROZEN.value)
-        assert self.get_asset()['status'] == Asset.FROZEN.value
-        self.sdk.assets.update(self.asset_key, surface='abc')
-        attributes = self.sdk.assets.attributes(self.asset_key)
-        assert any([a['name'] == 'surface' and a['value'] == 'abc' for a in attributes])
+        self.sdk.assets.update(self.asset_key, status=Asset.FROZEN.value, surface='abc')
+        asset = self.get_asset()
+        assert asset['status'] == Asset.FROZEN.value
+        assert 'abc' in asset['attackSurface']
 
     def test_delete_asset(self):
         self.sdk.assets.delete(self.asset_key)
@@ -45,8 +44,8 @@ class TestAsset:
     def test_add_ad_domain(self):
         asset = self.sdk.assets.add(self.ad_domain_name, self.ad_domain_name, status=Asset.ACTIVE.value, surface='test-surface', type=Kind.ADDOMAIN.value)
         assert asset['key'] == self.ad_domain_key
-        assert len(asset['surface']) == 1
-        assert asset['surface'][0] == 'test-surface'
+        assert len(asset['attackSurface']) == 1
+        assert 'test-surface' in asset['attackSurface']
         assert asset['status'] == Asset.ACTIVE.value
     
     def test_get_ad_domain(self):
@@ -61,11 +60,10 @@ class TestAsset:
         assert any([a['group'] == self.ad_domain_name for a in results])
     
     def test_update_ad_domain(self):
-        self.sdk.assets.update(self.ad_domain_key, status=Asset.FROZEN.value)
-        assert self.get_ad_domain()['status'] == Asset.FROZEN.value
-        self.sdk.assets.update(self.ad_domain_key, surface='abc')
-        attributes = self.sdk.assets.attributes(self.ad_domain_key)
-        assert any([a['name'] == 'surface' and a['value'] == 'abc' for a in attributes])
+        self.sdk.assets.update(self.ad_domain_key, status=Asset.FROZEN.value, surface='abc')
+        ad_domain = self.get_ad_domain()
+        assert ad_domain['status'] == Asset.FROZEN.value
+        assert 'abc' in ad_domain['attackSurface']
     
     def test_delete_ad_domain(self):
         self.sdk.assets.delete(self.ad_domain_key)

{praetorian_cli-2.2.0 → praetorian_cli-2.2.1}/praetorian_cli/sdk/test/test_z_cli.py

@@ -33,7 +33,7 @@ class TestZCli:
 
         self.verify(f'update asset -s F "{o.asset_key}" -f internal')
         self.verify(f'get asset "{o.asset_key}" -d', [o.asset_key,
-                    f'"status": "{Asset.FROZEN.value}"', f'#surface#internal'])
+                    f'"status": "{Asset.FROZEN.value}"', '"internal"'])
 
         self.verify(f'delete asset "{o.asset_key}"')
         self.verify(f'get asset "{o.asset_key}"', [o.asset_key, f'"status": "{Asset.DELETED.value}"'])

{praetorian_cli-2.2.0 → praetorian_cli-2.2.1/praetorian_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praetorian-cli
-Version: 2.2.0
+Version: 2.2.1
 Summary: For interacting with the Chariot API
 Home-page: https://github.com/praetorian-inc/praetorian-cli
 Author: Praetorian

{praetorian_cli-2.2.0 → praetorian_cli-2.2.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = praetorian-cli
-version = 2.2.0
+version = 2.2.1
 author = Praetorian
 author_email = support@praetorian.com
 description = For interacting with the Chariot API