praetorian-cli 2.2.13__tar.gz → 2.2.14__tar.gz

{praetorian_cli-2.2.13/praetorian_cli.egg-info → praetorian_cli-2.2.14}/PKG-INFO

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

{praetorian_cli-2.2.13 → praetorian_cli-2.2.14}/praetorian_cli/sdk/chariot.py

@@ -64,25 +64,19 @@ class Chariot:
             import urllib3
             urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
 
-    def chariot_request(self, method: str, url: str, **kwargs) -> requests.Response:
+    def chariot_request(self, method: str, url: str, headers: dict = {}, **kwargs) -> requests.Response:
         """
-        Centralized method to make HTTP requests to the Chariot API with all global headers/parameters set.
+        Centralized wrapper around requests.request. Take care of proxy, beta flag, and 
+        supplies the authentication headers
         """
-        
         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
 
-        return requests.request(method, url, headers=headers, **kwargs)
+        return requests.request(method, url, headers=(headers | self.keychain.headers()), **kwargs)
+
 
     def add_beta_url_param(self, kwargs: dict):
         if 'params' in kwargs:
@@ -206,8 +200,12 @@ class Chariot:
         return resp
 
     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.
+        # Encrypted files have _encrypted/ prefix in the path. Encrypted files do not use presigned URLs.
+        # Instead, they use the /encrypted-file endpoint that directly gets and puts content.
+        if is_encrypted_partition(chariot_filepath):
+            return self.chariot_request('PUT', self.url('/encrypted-file'), params=dict(name=chariot_filepath), data=content)
+
+        # Regular files use presigned URLs
         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)
@@ -216,6 +214,15 @@ class Chariot:
 
     def download(self, name: str, global_=False) -> bytes:
         params = dict(name=name)
+        # Encrypted files have _encrypted/ prefix in the path. Encrypted files do not use presigned URLs.
+        # Instead, they use the /encrypted-file endpoint that directly gets and puts content.
+        if is_encrypted_partition(name):
+            accept_binary = {'Accept': 'application/octet-stream'}
+            resp = self.chariot_request('GET', self.url('/encrypted-file'), params=params, headers=accept_binary)
+            process_failure(resp)
+            return resp.content
+
+        # Regular files, use presigned URLs
         if global_:
             params |= GLOBAL_FLAG
 
@@ -228,7 +235,7 @@ class Chariot:
             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)
+        resp = requests.request('GET', url)
         process_failure(resp)
         return resp.content
 
@@ -355,3 +362,7 @@ def extend(accumulate: dict, new: dict) -> dict:
             extend(accumulate[key], value)
 
     return accumulate
+
+
+def is_encrypted_partition(chariot_filepath: str) -> bool:
+    return chariot_filepath.startswith('_encrypted/')

{praetorian_cli-2.2.13 → praetorian_cli-2.2.14}/praetorian_cli/sdk/test/test_file.py

@@ -12,6 +12,7 @@ class TestFile:
         self.sdk = setup_chariot()
         micro = epoch_micro()
         self.chariot_filepath = f'home/test-file-{micro}.txt'
+        self.encrypted_chariot_filepath = f'_encrypted/test-file-{micro}.txt'
         self.sanitized_filepath = f'home_test-file-{micro}.txt'
         self.bogus_filepath = f'bogus-filepath-{micro}.txt'
         self.local_filepath = f'./test-file-{micro}.txt'
@@ -52,6 +53,21 @@ class TestFile:
             self.sdk.files.get(self.chariot_filepath)
         assert str(ex_info.value) == f'File {self.chariot_filepath} not found.'
 
+    def test_add_encrypted_file(self):
+        self.sdk.files.add(self.local_filepath, self.encrypted_chariot_filepath)
+        files, offset = self.sdk.files.list(self.encrypted_chariot_filepath)
+        assert files[0]['name'] == self.encrypted_chariot_filepath
+
+    def test_get_encrypted_file(self):
+        content = self.sdk.files.get_utf8(self.encrypted_chariot_filepath)
+        assert content == self.content
+
+    def test_delete_encrypted_file(self):
+        self.sdk.files.delete(self.encrypted_chariot_filepath)
+        with pytest.raises(Exception) as ex_info:
+            self.sdk.files.get(self.encrypted_chariot_filepath)
+        assert str(ex_info.value) == f'File {self.encrypted_chariot_filepath} not found.'
+
     def teardown_class(self):
         os.remove(self.local_filepath)
         os.remove(self.sanitized_filepath)

{praetorian_cli-2.2.13 → praetorian_cli-2.2.14/praetorian_cli.egg-info}/PKG-INFO

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

{praetorian_cli-2.2.13 → praetorian_cli-2.2.14}/setup.cfg

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