praetorian-cli 2.2.7__tar.gz → 2.2.8__tar.gz

{praetorian_cli-2.2.7/praetorian_cli.egg-info → praetorian_cli-2.2.8}/PKG-INFO

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

{praetorian_cli-2.2.7 → praetorian_cli-2.2.8}/praetorian_cli/sdk/chariot.py

@@ -64,19 +64,25 @@ class Chariot:
             import urllib3
             urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-    def _make_request(self, method: str, url: str, **kwargs) -> requests.Response:
+    def chariot_request(self, method: str, url: str, **kwargs) -> requests.Response:
         """
-        Centralized method to make HTTP requests with proxy configuration.
-        Automatically applies proxy settings and verify=False if proxy is defined.
+        Centralized method to make HTTP requests to the Chariot API with all global headers/parameters set.
+        """
+        
+        self.add_beta_url_param(kwargs)
+
+        return self.request(method, url, self.keychain.headers(), **kwargs)
+    
+    def request(self, method: str, url: str, headers: dict = None, **kwargs) -> requests.Response:
+        """
+        Centralized wrapper around requests.request, ensuring the HTTP proxy is respected.
         """
 
         if self.proxy:
             kwargs['proxies'] = {'http': self.proxy, 'https': self.proxy}
             kwargs['verify'] = False
-        
-        self.add_beta_url_param(kwargs)
 
-        return requests.request(method, url, headers=self.keychain.headers(), **kwargs)
+        return requests.request(method, url, headers=headers, **kwargs)
 
     def add_beta_url_param(self, kwargs: dict):
         if 'params' in kwargs:
@@ -94,7 +100,7 @@ class Chariot:
 
         # The search is on data in DynamoDB, which uses DynamoDB's native offset format.
         for _ in range(pages):
-            resp = self._make_request('GET', self.url('/my'), params=params)
+            resp = self.chariot_request('GET', self.url('/my'), params=params)
             process_failure(resp)
             resp = resp.json()
             extend(final_resp, resp)
@@ -121,7 +127,7 @@ class Chariot:
         final_resp = dict()
 
         while pages > 0:
-            resp = self._make_request('POST', self.url('/my'), json=raw_query, params=params)
+            resp = self.chariot_request('POST', self.url('/my'), json=raw_query, params=params)
             if is_query_limit_failure(resp):
                 # In this block, the data size is too large for the number of records requested in raw_query['limit'].
                 # We need to halve the page size: LIMIT = LIMIT / 2
@@ -148,22 +154,22 @@ class Chariot:
         return final_resp
 
     def post(self, type: str, body: dict, params: dict = {}) -> dict:
-        resp = self._make_request('POST', self.url(f'/{type}'), json=body, params=params)
+        resp = self.chariot_request('POST', self.url(f'/{type}'), json=body, params=params)
         process_failure(resp)
         return resp.json()
 
     def put(self, type: str, body: dict, params: dict = {}) -> dict:
-        resp = self._make_request('PUT', self.url(f'/{type}'), json=body, params=params)
+        resp = self.chariot_request('PUT', self.url(f'/{type}'), json=body, params=params)
         process_failure(resp)
         return resp.json()
 
     def get(self, type: str, params: dict = {}) -> dict:
-        resp = self._make_request('GET', self.url(f'/{type}'), params=params)
+        resp = self.chariot_request('GET', self.url(f'/{type}'), params=params)
         process_failure(resp)
         return resp.json()
 
     def delete(self, type: str, body: dict, params: dict) -> dict:
-        resp = self._make_request('DELETE', self.url(f'/{type}'), json=body, params=params)
+        resp = self.chariot_request('DELETE', self.url(f'/{type}'), json=body, params=params)
         process_failure(resp)
         return resp.json()
 
@@ -183,12 +189,12 @@ class Chariot:
         return self.put(type, body, params)
 
     def link_account(self, username: str, value: str = '', config: dict = {}) -> dict:
-        resp = self._make_request('POST', self.url(f'/account/{username}'), json=dict(config=config, value=value))
+        resp = self.chariot_request('POST', self.url(f'/account/{username}'), json=dict(config=config, value=value))
         process_failure(resp)
         return resp.json()
 
     def unlink(self, username: str, value: str = '', config: dict = {}) -> dict:
-        resp = self._make_request('DELETE', self.url(f'/account/{username}'), json=dict(value=value, config=config))
+        resp = self.chariot_request('DELETE', self.url(f'/account/{username}'), json=dict(value=value, config=config))
         process_failure(resp)
         return resp.json()
 
@@ -202,7 +208,7 @@ class Chariot:
     def _upload(self, chariot_filepath: str, content: str) -> dict:
         # It is a two-step upload. The PUT request to the /file endpoint is to get a presigned URL for S3.
         # There is no data transfer.
-        presigned_url = self._make_request('PUT', self.url('/file'), params=dict(name=chariot_filepath))
+        presigned_url = self.chariot_request('PUT', self.url('/file'), params=dict(name=chariot_filepath))
         process_failure(presigned_url)
         resp = requests.put(presigned_url.json()['url'], data=content)
         process_failure(resp)
@@ -213,12 +219,21 @@ class Chariot:
         if global_:
             params |= GLOBAL_FLAG
 
-        resp = self._make_request('GET', self.url('/file'), params=params, allow_redirects=True)
+        resp = self.chariot_request('GET', self.url('/file'), params=params)
+        process_failure(resp)
+
+        data = resp.json()
+        url = data.get("url", None)
+        if not url:
+            message = f'Download request failed: response missing URL' + (f'\nBody: {resp.text}' if resp.text else '(empty)')
+            raise Exception(message)
+        
+        resp = self.request('GET', url)
         process_failure(resp)
         return resp.content
 
     def count(self, params: dict) -> dict:
-        resp = self._make_request('GET', self.url('/my/count'), params=params)
+        resp = self.chariot_request('GET', self.url('/my/count'), params=params)
         process_failure(resp)
         return resp.json()
 
@@ -227,11 +242,11 @@ class Chariot:
         return json.loads(self.download(f'enrichments/{type}/{filename}', True).decode('utf-8'))
 
     def purge(self):
-        self._make_request('DELETE', self.url('/account/purge'))
+        self.chariot_request('DELETE', self.url('/account/purge'))
 
     def agent(self, agent: str, body: dict) -> dict:
         body = body | dict(agent=agent)
-        resp = self._make_request('PUT', self.url('/agent'), json=body)
+        resp = self.chariot_request('PUT', self.url('/agent'), json=body)
         process_failure(resp)
         return resp.json()
 

{praetorian_cli-2.2.7 → praetorian_cli-2.2.8}/praetorian_cli/sdk/entities/credentials.py

@@ -40,6 +40,7 @@ class Credentials:
         :rtype: dict or str
         """
         request = {
+            'Operation': 'get',
             'CredentialID': credential_id,
             'Category': category,
             'Type': type,

{praetorian_cli-2.2.7 → praetorian_cli-2.2.8}/praetorian_cli/sdk/entities/risks.py

@@ -102,7 +102,17 @@ class Risks:
         if contains_filter:
             contains_filter_filter = Filter(field=Filter.Field.KEY, operator=Filter.Operator.CONTAINS, value=contains_filter)
             filters.append(contains_filter_filter)
-        query = Query(Node([Node.Label.RISK], filters=filters), page=int(offset))
+
+        query = Query(
+            Node(
+                labels=[Node.Label.RISK],
+                filters=filters
+            )
+        )
+
+        if offset:
+            query.page = int(offset)
+
         return self.api.search.by_query(query, pages)
 
     def attributes(self, key):

{praetorian_cli-2.2.7 → praetorian_cli-2.2.8}/praetorian_cli/sdk/keychain.py

@@ -65,13 +65,16 @@ class Keychain:
             error(f'Could not find the "{self.profile}" profile in {self.filepath}. Run "praetorian configure" to fix.')
 
         profile = self.config[self.profile]
-        if 'api' not in profile or 'client_id' not in profile:
-            error(f'Keychain profile "{self.profile}" is corrupted or incomplete. Run "praetorian configure" to fix.')
-
+        
         self.load_env('username', 'PRAETORIAN_CLI_USERNAME', required=False)
         self.load_env('password', 'PRAETORIAN_CLI_PASSWORD', required=False)
         self.load_env(API_KEY_ID, 'PRAETORIAN_CLI_API_KEY_ID', required=False)
         self.load_env(API_KEY_SECRET, 'PRAETORIAN_CLI_API_KEY_SECRET', required=False)
+        self.load_env('api', 'PRAETORIAN_CLI_API', required=False)
+        self.load_env('client_id', 'PRAETORIAN_CLI_CLIENT_ID', required=False)
+        
+        if 'api' not in profile or 'client_id' not in profile:
+            error(f'Keychain profile "{self.profile}" is corrupted or incomplete. Run "praetorian configure" to fix.')
 
         if self.account is None:
             self.account = self.config.get(self.profile, 'account', fallback=None)

{praetorian_cli-2.2.7 → praetorian_cli-2.2.8}/praetorian_cli/sdk/test/test_conversation.py

@@ -23,7 +23,7 @@ class TestConversation:
             "mode": "query"
         }
         
-        response = self.sdk._make_request("POST", url, json=payload)
+        response = self.sdk.chariot_request("POST", url, json=payload)
         
         # Should get successful response
         assert response.status_code == 200
@@ -45,7 +45,7 @@ class TestConversation:
             "mode": "query"
         }
         
-        response = self.sdk._make_request("POST", url, json=initial_payload)
+        response = self.sdk.chariot_request("POST", url, json=initial_payload)
         assert response.status_code == 200
         
         result = response.json()
@@ -58,7 +58,7 @@ class TestConversation:
             "conversationId": conversation_id
         }
         
-        response = self.sdk._make_request("POST", url, json=follow_up_payload)
+        response = self.sdk.chariot_request("POST", url, json=follow_up_payload)
         
         # Should get successful response
         assert response.status_code == 200
@@ -72,7 +72,7 @@ class TestConversation:
             "mode": "query"
         }
         
-        response = self.sdk._make_request("POST", url, json=payload)
+        response = self.sdk.chariot_request("POST", url, json=payload)
         assert response.status_code == 200
         
         result = response.json()
@@ -100,7 +100,7 @@ class TestConversation:
             "mode": "query"
         }
         
-        response = self.sdk._make_request("POST", url, json=payload)
+        response = self.sdk.chariot_request("POST", url, json=payload)
         assert response.status_code == 200
         
         # Wait a moment for conversation to be stored
@@ -123,7 +123,7 @@ class TestConversation:
             # Missing required "message" field
         }
         
-        response = self.sdk._make_request("POST", url, json=malformed_payload)
+        response = self.sdk.chariot_request("POST", url, json=malformed_payload)
         
         # Should get a 4xx error for bad request
         assert response.status_code >= 400
@@ -138,7 +138,7 @@ class TestConversation:
             "mode": "query"
         }
         
-        response = self.sdk._make_request("POST", url, json=query_payload)
+        response = self.sdk.chariot_request("POST", url, json=query_payload)
         assert response.status_code == 200
         
         result = response.json()
@@ -150,7 +150,7 @@ class TestConversation:
             "mode": "agent"
         }
         
-        response = self.sdk._make_request("POST", url, json=agent_payload)
+        response = self.sdk.chariot_request("POST", url, json=agent_payload)
         assert response.status_code == 200
         
         result = response.json()
@@ -165,7 +165,7 @@ class TestConversation:
             "mode": "query"
         }
         
-        response = self.sdk._make_request("POST", url, json=payload)
+        response = self.sdk.chariot_request("POST", url, json=payload)
         assert response.status_code == 200
         
         result = response.json()

{praetorian_cli-2.2.7 → praetorian_cli-2.2.8}/praetorian_cli/sdk/test/test_z_cli.py

@@ -296,7 +296,7 @@ class TestZCli:
         o = make_test_values(lambda: None)
         self.verify(f'add asset --dns "{o.webapp_name}" --name "{o.webapp_url}" --type webapplication')
         self.verify(f'get asset "{o.webapp_key}"', expected_stdout=[o.webapp_key, o.webapp_url, o.webapp_name, '"status"', '"A"'])
-        self.verify(f'list assets -f "{o.webapp_name}"', expected_stdout=[o.webapp_key])
+        self.verify(f'list assets -f "{o.webapp_key}"', expected_stdout=[o.webapp_key])
         self.verify(f'delete asset "{o.webapp_key}"', ignore_stdout=True)
     
     def test_webpage_cli(self):

{praetorian_cli-2.2.7 → praetorian_cli-2.2.8}/praetorian_cli/ui/conversation/textual_chat.py

@@ -347,7 +347,7 @@ class ConversationApp(App):
         if self.conversation_id:
             payload["conversationId"] = self.conversation_id
         
-        response = self.sdk._make_request("POST", url, json=payload)
+        response = self.sdk.chariot_request("POST", url, json=payload)
         
         if response.status_code == 200:
             result = response.json()

{praetorian_cli-2.2.7 → praetorian_cli-2.2.8/praetorian_cli.egg-info}/PKG-INFO

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

{praetorian_cli-2.2.7 → praetorian_cli-2.2.8}/setup.cfg

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