pangea-sdk 3.2.0__py3-none-any.whl → 3.3.0__py3-none-any.whl

pangea/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.2.0"
+__version__ = "3.3.0"
 
 from pangea.asyncio.request import PangeaRequestAsync
 from pangea.config import PangeaConfig

pangea/asyncio/request.py

@@ -51,12 +51,14 @@ class PangeaRequestAsync(PangeaRequestBase):
         if self.config_id and data.get("config_id", None) is None:
             data["config_id"] = self.config_id
 
+        transfer_method = data.get("transfer_method", None)
+
         if (
             files is not None
             and type(data) is dict
-            and data.get("transfer_method", None) == TransferMethod.DIRECT.value
+            and (transfer_method == TransferMethod.DIRECT.value or transfer_method == TransferMethod.POST_URL.value)
         ):
-            requests_response = await self._post_presigned_url(
+            requests_response = await self._full_post_presigned_url(
                 endpoint, result_class=result_class, data=data, files=files
             )
         else:
@@ -72,6 +74,83 @@ class PangeaRequestAsync(PangeaRequestBase):
 
         return self._check_response(pangea_response)
 
+    async def get(
+        self, path: str, result_class: Type[PangeaResponseResult], check_response: bool = True
+    ) -> PangeaResponse:
+        """Makes the GET call to a Pangea Service endpoint.
+
+        Args:
+            endpoint(str): The Pangea Service API endpoint.
+            path(str): Additional URL path
+
+        Returns:
+            PangeaResponse which contains the response in its entirety and
+               various properties to retrieve individual fields
+        """
+
+        url = self._url(path)
+        self.logger.debug(json.dumps({"service": self.service, "action": "get", "url": url}))
+
+        async with self.session.get(url, headers=self._headers()) as requests_response:
+            pangea_response = PangeaResponse(
+                requests_response, result_class=result_class, json=await requests_response.json()
+            )
+
+        self.logger.debug(
+            json.dumps(
+                {"service": self.service, "action": "get", "url": url, "response": pangea_response.json},
+                default=default_encoder,
+            )
+        )
+
+        if check_response is False:
+            return pangea_response
+
+        return self._check_response(pangea_response)
+
+    async def poll_result_by_id(
+        self, request_id: str, result_class: Union[Type[PangeaResponseResult], dict], check_response: bool = True
+    ):
+        path = self._get_poll_path(request_id)
+        self.logger.debug(json.dumps({"service": self.service, "action": "poll_result_once", "url": path}))
+        return await self.get(path, result_class, check_response=check_response)
+
+    async def poll_result_once(self, response: PangeaResponse, check_response: bool = True):
+        request_id = response.request_id
+        if not request_id:
+            raise pe.PangeaException("Poll result error error: response did not include a 'request_id'")
+
+        if response.status != ResponseStatus.ACCEPTED.value:
+            raise pe.PangeaException("Response already proccesed")
+
+        return await self.poll_result_by_id(request_id, response.result_class, check_response=check_response)
+
+    async def post_presigned_url(self, url: str, data: Dict, files: List[Tuple]):
+        # Send form request with file and upload_details as body
+        resp = await self._http_post(url=url, data=data, files=files, presigned_url_post=True)
+        self.logger.debug(
+            json.dumps(
+                {"service": self.service, "action": "post presigned", "url": url, "response": resp.text},
+                default=default_encoder,
+            )
+        )
+
+        if resp.status < 200 or resp.status >= 300:
+            raise pe.PresignedUploadError(f"presigned POST failure: {resp.status}", resp.text)
+
+    async def put_presigned_url(self, url: str, files: List[Tuple]):
+        # Send put request with file as body
+        resp = await self._http_put(url=url, files=files)
+        self.logger.debug(
+            json.dumps(
+                {"service": self.service, "action": "put presigned", "url": url, "response": resp.text},
+                default=default_encoder,
+            )
+        )
+
+        if resp.status_code < 200 or resp.status_code >= 300:
+            raise pe.PresignedUploadError(f"presigned PUT failure: {resp.status_code}", resp.text)
+
     async def _http_post(
         self,
         url: str,
@@ -105,7 +184,21 @@ class PangeaRequestAsync(PangeaRequestBase):
 
         return await self.session.post(url, headers=headers, data=data_send)
 
-    async def _post_presigned_url(
+    async def _http_put(
+        self,
+        url: str,
+        files: List[Tuple],
+        headers: Dict = {},
+    ) -> aiohttp.ClientResponse:
+        self.logger.debug(
+            json.dumps({"service": self.service, "action": "http_put", "url": url}, default=default_encoder)
+        )
+        form = FormData()
+        name, value = files[0]
+        form.add_field(name, value[1], filename=value[0], content_type=value[2])
+        return self.session.put(url, headers=headers, data=form)
+
+    async def _full_post_presigned_url(
         self,
         endpoint: str,
         result_class: Type[PangeaResponseResult],
@@ -115,61 +208,52 @@ class PangeaRequestAsync(PangeaRequestBase):
         if len(files) == 0:
             raise AttributeError("files attribute should have at least 1 file")
 
+        response = await self.request_presigned_url(endpoint=endpoint, result_class=result_class, data=data)
+        data_to_presigned = response.accepted_result.accepted_status.upload_details
+        presigned_url = response.accepted_result.accepted_status.upload_url
+
+        await self.post_presigned_url(url=presigned_url, data=data_to_presigned, files=files)
+        return response.raw_response
+
+    async def request_presigned_url(
+        self,
+        endpoint: str,
+        result_class: Type[PangeaResponseResult],
+        data: Union[str, Dict] = {},
+    ) -> PangeaResponse:
         # Send request
         try:
             # This should return 202 (AcceptedRequestException)
             resp = await self.post(endpoint=endpoint, result_class=result_class, data=data, poll_result=False)
             raise pe.PresignedURLException("Should return 202", resp)
-
         except pe.AcceptedRequestException as e:
             accepted_exception = e
         except Exception as e:
             raise e
 
         # Receive 202 with accepted_status
-        result = await self._poll_presigned_url(accepted_exception)
-        data_to_presigned = result.accepted_status.upload_details
-        presigned_url = result.accepted_status.upload_url
-
-        # Send multipart request with file and upload_details as body
-        resp = await self._http_post(url=presigned_url, data=data_to_presigned, files=files, presigned_url_post=True)
-        self.logger.debug(
-            json.dumps(
-                {
-                    "service": self.service,
-                    "action": "post presigned",
-                    "url": presigned_url,
-                    "response": await resp.text(),
-                },
-                default=default_encoder,
-            )
-        )
-
-        if resp.status < 200 or resp.status >= 300:
-            raise pe.PresignedUploadError(f"presigned POST failure: {resp.status}", await resp.text())
-
-        return accepted_exception.response.raw_response
+        return await self._poll_presigned_url(accepted_exception.response)
 
-    async def _poll_presigned_url(self, initial_exc: pe.AcceptedRequestException) -> AcceptedResult:
-        if type(initial_exc) is not pe.AcceptedRequestException:
-            raise AttributeError("Exception should be of type AcceptedRequestException")
+    async def _poll_presigned_url(self, response: PangeaResponse) -> AcceptedResult:
+        if response.http_status != 202:
+            raise AttributeError("Response should be 202")
 
-        if initial_exc.accepted_result.accepted_status.upload_url:
-            return initial_exc.accepted_result
+        if response.accepted_result.accepted_status.upload_url:
+            return response
 
         self.logger.debug(json.dumps({"service": self.service, "action": "poll_presigned_url", "step": "start"}))
         retry_count = 1
         start = time.time()
-        loop_exc = initial_exc
+        loop_resp = response
 
         while (
-            loop_exc.accepted_result is not None
-            and not loop_exc.accepted_result.accepted_status.upload_url
+            loop_resp.accepted_result is not None
+            and not loop_resp.accepted_result.accepted_status.upload_url
             and not self._reach_timeout(start)
         ):
             await asyncio.sleep(self._get_delay(retry_count, start))
             try:
-                await self.poll_result_once(initial_exc.response, check_response=False)
+                await self.poll_result_once(response, check_response=False)
                 msg = "Polling presigned url return 200 instead of 202"
                 self.logger.debug(
                     json.dumps(
@@ -179,6 +263,7 @@ class PangeaRequestAsync(PangeaRequestBase):
                 raise pe.PangeaException(msg)
             except pe.AcceptedRequestException as e:
                 retry_count += 1
+                loop_resp = e.response
                 loop_exc = e
             except Exception as e:
                 self.logger.debug(
@@ -190,8 +275,8 @@ class PangeaRequestAsync(PangeaRequestBase):
 
         self.logger.debug(json.dumps({"service": self.service, "action": "poll_presigned_url", "step": "exit"}))
 
-        if loop_exc.accepted_result is not None and not loop_exc.accepted_result.accepted_status.upload_url:
-            return loop_exc.accepted_result
+        if loop_resp.accepted_result is not None and not loop_resp.accepted_result.accepted_status.upload_url:
+            return loop_resp
         else:
             raise loop_exc
 
@@ -207,57 +292,6 @@ class PangeaRequestAsync(PangeaRequestBase):
 
         return response
 
-    async def get(
-        self, path: str, result_class: Type[PangeaResponseResult], check_response: bool = True
-    ) -> PangeaResponse:
-        """Makes the GET call to a Pangea Service endpoint.
-
-        Args:
-            endpoint(str): The Pangea Service API endpoint.
-            path(str): Additional URL path
-
-        Returns:
-            PangeaResponse which contains the response in its entirety and
-               various properties to retrieve individual fields
-        """
-
-        url = self._url(path)
-        self.logger.debug(json.dumps({"service": self.service, "action": "get", "url": url}))
-
-        async with self.session.get(url, headers=self._headers()) as requests_response:
-            pangea_response = PangeaResponse(
-                requests_response, result_class=result_class, json=await requests_response.json()
-            )
-
-        self.logger.debug(
-            json.dumps(
-                {"service": self.service, "action": "get", "url": url, "response": pangea_response.json},
-                default=default_encoder,
-            )
-        )
-
-        if check_response is False:
-            return pangea_response
-
-        return self._check_response(pangea_response)
-
-    async def poll_result_by_id(
-        self, request_id: str, result_class: Union[Type[PangeaResponseResult], dict], check_response: bool = True
-    ):
-        path = self._get_poll_path(request_id)
-        self.logger.debug(json.dumps({"service": self.service, "action": "poll_result_once", "url": path}))
-        return await self.get(path, result_class, check_response=check_response)
-
-    async def poll_result_once(self, response: PangeaResponse, check_response: bool = True):
-        request_id = response.request_id
-        if not request_id:
-            raise pe.PangeaException("Poll result error error: response did not include a 'request_id'")
-
-        if response.status != ResponseStatus.ACCEPTED.value:
-            raise pe.PangeaException("Response already proccesed")
-
-        return await self.poll_result_by_id(request_id, response.result_class, check_response=check_response)
-
     async def _poll_result_retry(self, response: PangeaResponse) -> PangeaResponse:
         retry_count = 1
         start = time.time()

pangea/asyncio/services/base.py

@@ -1,9 +1,11 @@
 # Copyright 2022 Pangea Cyber Corporation
 # Author: Pangea Cyber Corporation
 
+from typing import Optional, Type, Union
+
 from pangea.asyncio.request import PangeaRequestAsync
 from pangea.exceptions import AcceptedRequestException
-from pangea.response import PangeaResponse
+from pangea.response import PangeaResponse, PangeaResponseResult
 from pangea.services.base import ServiceBase
 
 
@@ -21,7 +23,13 @@ class ServiceBaseAsync(ServiceBase):
 
         return self._request
 
-    async def poll_result(self, exception: AcceptedRequestException) -> PangeaResponse:
+    async def poll_result(
+        self,
+        exception: Optional[AcceptedRequestException] = None,
+        response: Optional[PangeaResponse] = None,
+        request_id: Optional[str] = None,
+        result_class: Union[Type[PangeaResponseResult], dict] = dict,
+    ) -> PangeaResponse:
         """
         Poll result
 
@@ -39,7 +47,16 @@ class ServiceBaseAsync(ServiceBase):
         Examples:
             response = service.poll_result(exception)
         """
-        return await self.request.poll_result_once(exception.response, check_response=True)
+        if exception is not None:
+            return await self.request.poll_result_once(exception.response, check_response=True)
+        elif response is not None:
+            return await self.request.poll_result_once(response, check_response=True)
+        elif request_id is not None:
+            return await self.request.poll_result_by_id(
+                request_id=request_id, result_class=result_class, check_response=True
+            )
+        else:
+            raise AttributeError("Need to set exception, response or request_id")
 
     async def close(self):
         await self.request.session.close()

pangea/asyncio/services/file_scan.py

@@ -1,11 +1,14 @@
 # Copyright 2022 Pangea Cyber Corporation
 # Author: Pangea Cyber Corporation
 import io
-from typing import Optional
+import logging
+from typing import Dict, Optional
 
 import pangea.services.file_scan as m
-from pangea.response import PangeaResponse
-from pangea.utils import get_presigned_url_upload_params
+from pangea.asyncio.request import PangeaRequestAsync
+from pangea.request import PangeaConfig
+from pangea.response import PangeaResponse, TransferMethod
+from pangea.utils import FileUploadParams, get_file_upload_params
 
 from .base import ServiceBaseAsync
 
@@ -46,6 +49,7 @@ class FileScanAsync(ServiceBaseAsync):
         raw: Optional[bool] = None,
         provider: Optional[str] = None,
         sync_call: bool = True,
+        transfer_method: TransferMethod = TransferMethod.DIRECT,
     ) -> PangeaResponse[m.FileScanResult]:
         """
         Scan
@@ -84,13 +88,79 @@ class FileScanAsync(ServiceBaseAsync):
         if file or file_path:
             if file_path:
                 file = open(file_path, "rb")
-            crc, sha, size, _ = get_presigned_url_upload_params(file)
+            if transfer_method == TransferMethod.DIRECT or transfer_method == TransferMethod.POST_URL:
+                params = get_file_upload_params(file)
+                crc = params.crc_hex
+                sha = params.sha256_hex
+                size = params.size
+            else:
+                crc, sha, size = None, None, None
             files = [("upload", ("filename", file, "application/octet-stream"))]
         else:
             raise ValueError("Need to set file_path or file arguments")
 
         input = m.FileScanRequest(
-            verbose=verbose, raw=raw, provider=provider, transfer_crc32c=crc, transfer_sha256=sha, transfer_size=size
+            verbose=verbose,
+            raw=raw,
+            provider=provider,
+            transfer_crc32c=crc,
+            transfer_sha256=sha,
+            transfer_size=size,
+            transfer_method=transfer_method,
         )
         data = input.dict(exclude_none=True)
         return await self.request.post("v1/scan", m.FileScanResult, data=data, files=files, poll_result=sync_call)
+
+    async def request_upload_url(
+        self,
+        transfer_method: TransferMethod = TransferMethod.PUT_URL,
+        params: Optional[FileUploadParams] = None,
+        verbose: Optional[bool] = None,
+        raw: Optional[bool] = None,
+        provider: Optional[str] = None,
+    ) -> PangeaResponse[m.FileScanResult]:
+        input = m.FileScanRequest(
+            verbose=verbose,
+            raw=raw,
+            provider=provider,
+            transfer_method=transfer_method,
+        )
+        if params is not None and (
+            transfer_method == TransferMethod.POST_URL or transfer_method == TransferMethod.DIRECT
+        ):
+            input.transfer_crc32c = params.crc_hex
+            input.transfer_sha256 = params.sha256_hex
+            input.transfer_size = params.size
+
+        data = input.dict(exclude_none=True)
+        return await self.request.request_presigned_url("v1/scan", m.FileScanResult, data=data)
+
+
+class FileUploaderAsync:
+    def __init__(self):
+        self.logger = logging.getLogger("pangea")
+        self._request: PangeaRequestAsync = PangeaRequestAsync(
+            config=PangeaConfig(),
+            token="",
+            service="FileScanUploader",
+            logger=self.logger,
+        )
+
+    async def upload_file(
+        self,
+        url: str,
+        file: io.BufferedReader,
+        transfer_method: TransferMethod = TransferMethod.PUT_URL,
+        file_details: Optional[Dict] = None,
+    ):
+        if transfer_method == TransferMethod.PUT_URL:
+            files = [("file", ("filename", file, "application/octet-stream"))]
+            await self._request.put_presigned_url(url=url, files=files)
+        elif transfer_method == TransferMethod.POST_URL or transfer_method == TransferMethod.DIRECT:
+            files = [("file", ("filename", file, "application/octet-stream"))]
+            await self._request.post_presigned_url(url=url, data=file_details, files=files)
+        else:
+            raise ValueError(f"Transfer method not supported: {transfer_method}")
+
+    async def close(self):
+        await self._request.session.close()

pangea/asyncio/services/redact.py

@@ -36,13 +36,8 @@ class RedactAsync(ServiceBaseAsync):
 
     service_name = "redact"
 
-    def __init__(
-        self,
-        token,
-        config=None,
-        logger_name="pangea",
-    ):
-        super().__init__(token, config, logger_name)
+    def __init__(self, token, config=None, logger_name="pangea", config_id: Optional[str] = None):
+        super().__init__(token, config, logger_name, config_id=config_id)
 
     async def redact(
         self,

pangea/config.py

@@ -10,7 +10,7 @@ class PangeaConfig:
     """Holds run time configuration information used by SDK components."""
 
     """
-    Used to set pangea domain (and port if needed), it should not include service subdomain
+    Used to set Pangea domain (and port if needed), it should not include service subdomain
     just for particular use cases when environment = "local", domain could be set to an url including:
     scheme (http:// or https://), subdomain, domain and port.
 
@@ -19,7 +19,7 @@ class PangeaConfig:
 
     """
     Used to generate service url.
-    It should be only 'production' or 'local' in case of particular services that can run locally as Redact
+    It should be only 'production' or 'local' in cases of particular services that can run locally as Redact.
 
     """
     environment: str = "production"

pangea/request.py

@@ -12,7 +12,7 @@ import pangea
 import pangea.exceptions as pe
 import requests
 from pangea.config import PangeaConfig
-from pangea.response import AcceptedResult, PangeaResponse, PangeaResponseResult, ResponseStatus, TransferMethod
+from pangea.response import PangeaResponse, PangeaResponseResult, ResponseStatus, TransferMethod
 from pangea.utils import default_encoder
 from requests.adapters import HTTPAdapter, Retry
 
@@ -203,12 +203,16 @@ class PangeaRequest(PangeaRequestBase):
         if self.config_id and data.get("config_id", None) is None:
             data["config_id"] = self.config_id
 
+        transfer_method = data.get("transfer_method", None)
+
         if (
             files is not None
             and type(data) is dict
-            and data.get("transfer_method", None) == TransferMethod.DIRECT.value
+            and (transfer_method == TransferMethod.DIRECT.value or transfer_method == TransferMethod.POST_URL.value)
         ):
-            requests_response = self._post_presigned_url(endpoint, result_class=result_class, data=data, files=files)
+            requests_response = self._full_post_presigned_url(
+                endpoint, result_class=result_class, data=data, files=files
+            )
         else:
             requests_response = self._http_post(
                 url, headers=self._headers(), data=data, files=files, multipart_post=True
@@ -220,13 +224,106 @@ class PangeaRequest(PangeaRequestBase):
 
         return self._check_response(pangea_response)
 
+    def get(self, path: str, result_class: Type[PangeaResponseResult], check_response: bool = True) -> PangeaResponse:
+        """Makes the GET call to a Pangea Service endpoint.
+
+        Args:
+            endpoint(str): The Pangea Service API endpoint.
+            path(str): Additional URL path
+
+        Returns:
+            PangeaResponse which contains the response in its entirety and
+               various properties to retrieve individual fields
+        """
+
+        url = self._url(path)
+        self.logger.debug(json.dumps({"service": self.service, "action": "get", "url": url}))
+        requests_response = self.session.get(url, headers=self._headers())
+        pangea_response = PangeaResponse(requests_response, result_class=result_class, json=requests_response.json())
+
+        self.logger.debug(
+            json.dumps(
+                {"service": self.service, "action": "get", "url": url, "response": pangea_response.json},
+                default=default_encoder,
+            )
+        )
+
+        if check_response is False:
+            return pangea_response
+
+        return self._check_response(pangea_response)
+
+    def poll_result_by_id(
+        self, request_id: str, result_class: Union[Type[PangeaResponseResult], dict], check_response: bool = True
+    ):
+        path = self._get_poll_path(request_id)
+        self.logger.debug(json.dumps({"service": self.service, "action": "poll_result_once", "url": path}))
+        return self.get(path, result_class, check_response=check_response)
+
+    def poll_result_once(self, response: PangeaResponse, check_response: bool = True):
+        request_id = response.request_id
+        if not request_id:
+            raise pe.PangeaException("Poll result error: response did not include a 'request_id'")
+
+        if response.status != ResponseStatus.ACCEPTED.value:
+            raise pe.PangeaException("Response already proccesed")
+
+        return self.poll_result_by_id(request_id, response.result_class, check_response=check_response)
+
+    def request_presigned_url(
+        self,
+        endpoint: str,
+        result_class: Type[PangeaResponseResult],
+        data: Union[str, Dict] = {},
+    ) -> PangeaResponse:
+        # Send request
+        try:
+            # This should return 202 (AcceptedRequestException)
+            resp = self.post(endpoint=endpoint, result_class=result_class, data=data, poll_result=False)
+            raise pe.PresignedURLException("Should return 202", resp)
+
+        except pe.AcceptedRequestException as e:
+            accepted_exception = e
+        except Exception as e:
+            raise e
+
+        # Receive 202 with accepted_status
+        return self._poll_presigned_url(accepted_exception.response)
+
+    def post_presigned_url(self, url: str, data: Dict, files: List[Tuple]):
+        # Send form request with file and upload_details as body
+        resp = self._http_post(url=url, data=data, files=files, multipart_post=False)
+        self.logger.debug(
+            json.dumps(
+                {"service": self.service, "action": "post presigned", "url": url, "response": resp.text},
+                default=default_encoder,
+            )
+        )
+
+        if resp.status_code < 200 or resp.status_code >= 300:
+            raise pe.PresignedUploadError(f"presigned POST failure: {resp.status_code}", resp.text)
+
+    def put_presigned_url(self, url: str, files: List[Tuple]):
+        # Send put request with file as body
+        resp = self._http_put(url=url, files=files)
+        self.logger.debug(
+            json.dumps(
+                {"service": self.service, "action": "put presigned", "url": url, "response": resp.text},
+                default=default_encoder,
+            )
+        )
+
+        if resp.status_code < 200 or resp.status_code >= 300:
+            raise pe.PresignedUploadError(f"presigned PUT failure: {resp.status_code}", resp.text)
+
+    # Start internal methods
     def _http_post(
         self,
         url: str,
         headers: Dict = {},
         data: Union[str, Dict] = {},
         files: Optional[List[Tuple]] = None,
-        multipart_post: bool = True,
+        multipart_post: bool = True,  # Multipart or form post
     ) -> requests.Response:
         self.logger.debug(
             json.dumps(
@@ -237,6 +334,17 @@ class PangeaRequest(PangeaRequestBase):
         data_send, files = self._http_post_process(data=data, files=files, multipart_post=multipart_post)
         return self.session.post(url, headers=headers, data=data_send, files=files)
 
+    def _http_put(
+        self,
+        url: str,
+        files: List[Tuple],
+        headers: Dict = {},
+    ) -> requests.Response:
+        self.logger.debug(
+            json.dumps({"service": self.service, "action": "http_put", "url": url}, default=default_encoder)
+        )
+        return self.session.put(url, headers=headers, files=files)
+
     def _http_post_process(
         self, data: Union[str, Dict] = {}, files: Optional[List[Tuple]] = None, multipart_post: bool = True
     ):
@@ -263,7 +371,7 @@ class PangeaRequest(PangeaRequestBase):
 
         return data, files
 
-    def _post_presigned_url(
+    def _full_post_presigned_url(
         self,
         endpoint: str,
         result_class: Type[PangeaResponseResult],
@@ -273,35 +381,12 @@ class PangeaRequest(PangeaRequestBase):
         if len(files) == 0:
             raise AttributeError("files attribute should have at least 1 file")
 
-        # Send request
-        try:
-            # This should return 202 (AcceptedRequestException)
-            resp = self.post(endpoint=endpoint, result_class=result_class, data=data, poll_result=False)
-            raise pe.PresignedURLException("Should return 202", resp)
-
-        except pe.AcceptedRequestException as e:
-            accepted_exception = e
-        except Exception as e:
-            raise e
-
-        # Receive 202 with accepted_status
-        result = self._poll_presigned_url(accepted_exception)
-        data_to_presigned = result.accepted_status.upload_details
-        presigned_url = result.accepted_status.upload_url
-
-        # Send multipart request with file and upload_details as body
-        resp = self._http_post(url=presigned_url, data=data_to_presigned, files=files, multipart_post=False)
-        self.logger.debug(
-            json.dumps(
-                {"service": self.service, "action": "post presigned", "url": presigned_url, "response": resp.text},
-                default=default_encoder,
-            )
-        )
-
-        if resp.status_code < 200 or resp.status_code >= 300:
-            raise pe.PresignedUploadError(f"presigned POST failure: {resp.status_code}", resp.text)
+        response = self.request_presigned_url(endpoint=endpoint, result_class=result_class, data=data)
+        data_to_presigned = response.accepted_result.accepted_status.upload_details
+        presigned_url = response.accepted_result.accepted_status.upload_url
 
-        return accepted_exception.response.raw_response
+        self.post_presigned_url(url=presigned_url, data=data_to_presigned, files=files)
+        return response.raw_response
 
     def _handle_queued_result(self, response: PangeaResponse) -> PangeaResponse:
         if self._queued_retry_enabled and response.raw_response.status_code == 202:
@@ -315,52 +400,6 @@ class PangeaRequest(PangeaRequestBase):
 
         return response
 
-    def get(self, path: str, result_class: Type[PangeaResponseResult], check_response: bool = True) -> PangeaResponse:
-        """Makes the GET call to a Pangea Service endpoint.
-
-        Args:
-            endpoint(str): The Pangea Service API endpoint.
-            path(str): Additional URL path
-
-        Returns:
-            PangeaResponse which contains the response in its entirety and
-               various properties to retrieve individual fields
-        """
-
-        url = self._url(path)
-        self.logger.debug(json.dumps({"service": self.service, "action": "get", "url": url}))
-        requests_response = self.session.get(url, headers=self._headers())
-        pangea_response = PangeaResponse(requests_response, result_class=result_class, json=requests_response.json())
-
-        self.logger.debug(
-            json.dumps(
-                {"service": self.service, "action": "get", "url": url, "response": pangea_response.json},
-                default=default_encoder,
-            )
-        )
-
-        if check_response is False:
-            return pangea_response
-
-        return self._check_response(pangea_response)
-
-    def poll_result_by_id(
-        self, request_id: str, result_class: Union[Type[PangeaResponseResult], dict], check_response: bool = True
-    ):
-        path = self._get_poll_path(request_id)
-        self.logger.debug(json.dumps({"service": self.service, "action": "poll_result_once", "url": path}))
-        return self.get(path, result_class, check_response=check_response)
-
-    def poll_result_once(self, response: PangeaResponse, check_response: bool = True):
-        request_id = response.request_id
-        if not request_id:
-            raise pe.PangeaException("Poll result error: response did not include a 'request_id'")
-
-        if response.status != ResponseStatus.ACCEPTED.value:
-            raise pe.PangeaException("Response already proccesed")
-
-        return self.poll_result_by_id(request_id, response.result_class, check_response=check_response)
-
     def _poll_result_retry(self, response: PangeaResponse) -> PangeaResponse:
         retry_count = 1
         start = time.time()
@@ -373,26 +412,26 @@ class PangeaRequest(PangeaRequestBase):
         self.logger.debug(json.dumps({"service": self.service, "action": "poll_result_retry", "step": "exit"}))
         return self._check_response(response)
 
-    def _poll_presigned_url(self, initial_exc: pe.AcceptedRequestException) -> AcceptedResult:
-        if type(initial_exc) is not pe.AcceptedRequestException:
-            raise AttributeError("Exception should be of type AcceptedRequestException")
+    def _poll_presigned_url(self, response: PangeaResponse) -> PangeaResponse:
+        if response.http_status != 202:
+            raise AttributeError("Response should be 202")
 
-        if initial_exc.accepted_result.accepted_status.upload_url:
-            return initial_exc.accepted_result
+        if response.accepted_result.accepted_status.upload_url:
+            return response
 
         self.logger.debug(json.dumps({"service": self.service, "action": "poll_presigned_url", "step": "start"}))
         retry_count = 1
         start = time.time()
-        loop_exc = initial_exc
+        loop_resp = response
 
         while (
-            loop_exc.accepted_result is not None
-            and not loop_exc.accepted_result.accepted_status.upload_url
+            loop_resp.accepted_result is not None
+            and not loop_resp.accepted_result.accepted_status.upload_url
             and not self._reach_timeout(start)
         ):
             time.sleep(self._get_delay(retry_count, start))
             try:
-                self.poll_result_once(initial_exc.response, check_response=False)
+                self.poll_result_once(loop_resp, check_response=False)
                 msg = "Polling presigned url return 200 instead of 202"
                 self.logger.debug(
                     json.dumps(
@@ -402,6 +441,7 @@ class PangeaRequest(PangeaRequestBase):
                 raise pe.PangeaException(msg)
             except pe.AcceptedRequestException as e:
                 retry_count += 1
+                loop_resp = e.response
                 loop_exc = e
             except Exception as e:
                 self.logger.debug(
@@ -409,12 +449,12 @@ class PangeaRequest(PangeaRequestBase):
                         {"service": self.service, "action": "poll_presigned_url", "step": "exit", "cause": {str(e)}}
                     )
                 )
-                raise pe.PresignedURLException("Failed to pull Presigned URL", loop_exc.response, e)
+                raise pe.PresignedURLException("Failed to pull Presigned URL", loop_resp, e)
 
         self.logger.debug(json.dumps({"service": self.service, "action": "poll_presigned_url", "step": "exit"}))
 
-        if loop_exc.accepted_result is not None and not loop_exc.accepted_result.accepted_status.upload_url:
-            return loop_exc.accepted_result
+        if loop_resp.accepted_result is not None and not loop_resp.accepted_result.accepted_status.upload_url:
+            return loop_resp
         else:
             raise loop_exc
 

pangea/response.py

@@ -13,8 +13,11 @@ T = TypeVar("T")
 
 
 class TransferMethod(str, enum.Enum):
-    DIRECT = "direct"
+    DIRECT = "post-url"  # deprecated, use POST_URL instead
     MULTIPART = "multipart"
+    POST_URL = "post-url"
+    PUT_URL = "put-url"
+    # URL = "url"
 
     def __str__(self):
         return str(self.value)

pangea/services/audit/audit.py

@@ -462,7 +462,7 @@ class Audit(ServiceBase, AuditBase):
 
         Examples:
             log_response = audit.log(
-                message="hello world", 
+                message="hello world",
                 verbose=True,
             )
         """
@@ -551,7 +551,7 @@ class Audit(ServiceBase, AuditBase):
 
         Examples:
             log_response = audit.log_bulk(
-                events=[{"message": "hello world"}], 
+                events=[{"message": "hello world"}],
                 verbose=True,
             )
         """
@@ -590,7 +590,7 @@ class Audit(ServiceBase, AuditBase):
 
         Examples:
             log_response = audit.log_bulk_async(
-                events=[{"message": "hello world"}], 
+                events=[{"message": "hello world"}],
                 verbose=True,
             )
         """
@@ -664,10 +664,10 @@ class Audit(ServiceBase, AuditBase):
 
         Examples:
             response = audit.search(
-                query="message:test", 
-                search_restriction={'source': ["monitor"]}, 
-                limit=1, 
-                verify_consistency=True, 
+                query="message:test",
+                search_restriction={'source': ["monitor"]},
+                limit=1,
+                verify_consistency=True,
                 verify_events=True,
             )
         """

pangea/services/authn/authn.py

@@ -520,9 +520,10 @@ class AuthN(ServiceBase):
 
         def update(
             self,
-            disabled: bool,
+            disabled: Optional[bool] = None,
             id: Optional[str] = None,
             email: Optional[str] = None,
+            unlock: Optional[bool] = None,
         ) -> PangeaResponse[m.UserUpdateResult]:
             """
             Update user's settings
@@ -534,6 +535,7 @@ class AuthN(ServiceBase):
             Args:
                 disabled (bool): New disabled value.
                     Disabling a user account will prevent them from logging in.
+                unlock (bool): Unlock a user account if it has been locked out due to failed Authentication attempts.
                 id (str, optional): The identity of a user or a service
                 email (str, optional): An email address
 
@@ -552,6 +554,7 @@ class AuthN(ServiceBase):
                 id=id,
                 email=email,
                 disabled=disabled,
+                unlock=unlock,
             )
 
             return self.request.post("v2/user/update", m.UserUpdateResult, data=input.dict(exclude_none=True))

pangea/services/authn/models.py

@@ -363,7 +363,8 @@ class UserProfileUpdateResult(User):
 class UserUpdateRequest(APIRequestModel):
     id: Optional[str] = None
     email: Optional[str] = None
-    disabled: bool
+    disabled: Optional[bool] = None
+    unlock: Optional[bool] = None
 
 
 class UserUpdateResult(User):

pangea/services/base.py

@@ -3,13 +3,13 @@
 
 import copy
 import logging
-from typing import Optional, Union
+from typing import Optional, Type, Union
 
 from pangea.asyncio.request import PangeaRequestAsync
 from pangea.config import PangeaConfig
 from pangea.exceptions import AcceptedRequestException
 from pangea.request import PangeaRequest
-from pangea.response import PangeaResponse
+from pangea.response import PangeaResponse, PangeaResponseResult
 
 
 class ServiceBase(object):
@@ -50,7 +50,13 @@ class ServiceBase(object):
 
         return self._request
 
-    def poll_result(self, exception: AcceptedRequestException) -> PangeaResponse:
+    def poll_result(
+        self,
+        exception: Optional[AcceptedRequestException] = None,
+        response: Optional[PangeaResponse] = None,
+        request_id: Optional[str] = None,
+        result_class: Union[Type[PangeaResponseResult], dict] = dict,
+    ) -> PangeaResponse:
         """
         Poll result
 
@@ -68,4 +74,11 @@ class ServiceBase(object):
         Examples:
             response = service.poll_result(exception)
         """
-        return self.request.poll_result_once(exception.response, check_response=True)
+        if exception is not None:
+            return self.request.poll_result_once(exception.response, check_response=True)
+        elif response is not None:
+            return self.request.poll_result_once(response, check_response=True)
+        elif request_id is not None:
+            return self.request.poll_result_by_id(request_id=request_id, result_class=result_class, check_response=True)
+        else:
+            raise AttributeError("Need to set exception, response or request_id")

pangea/services/file_scan.py

@@ -1,10 +1,12 @@
 # Copyright 2022 Pangea Cyber Corporation
 # Author: Pangea Cyber Corporation
 import io
+import logging
 from typing import Dict, List, Optional
 
+from pangea.request import PangeaConfig, PangeaRequest
 from pangea.response import APIRequestModel, PangeaResponse, PangeaResponseResult, TransferMethod
-from pangea.utils import get_presigned_url_upload_params
+from pangea.utils import FileUploadParams, get_file_upload_params
 
 from .base import ServiceBase
 
@@ -118,8 +120,11 @@ class FileScan(ServiceBase):
         if file or file_path:
             if file_path:
                 file = open(file_path, "rb")
-            if transfer_method == TransferMethod.DIRECT:
-                crc, sha, size, _ = get_presigned_url_upload_params(file)
+            if transfer_method == TransferMethod.DIRECT or transfer_method == TransferMethod.POST_URL:
+                params = get_file_upload_params(file)
+                crc = params.crc_hex
+                sha = params.sha256_hex
+                size = params.size
             else:
                 crc, sha, size = None, None, None
             files = [("upload", ("filename", file, "application/octet-stream"))]
@@ -137,3 +142,54 @@ class FileScan(ServiceBase):
         )
         data = input.dict(exclude_none=True)
         return self.request.post("v1/scan", FileScanResult, data=data, files=files, poll_result=sync_call)
+
+    def request_upload_url(
+        self,
+        transfer_method: TransferMethod = TransferMethod.PUT_URL,
+        params: Optional[FileUploadParams] = None,
+        verbose: Optional[bool] = None,
+        raw: Optional[bool] = None,
+        provider: Optional[str] = None,
+    ) -> PangeaResponse[FileScanResult]:
+        input = FileScanRequest(
+            verbose=verbose,
+            raw=raw,
+            provider=provider,
+            transfer_method=transfer_method,
+        )
+        if params is not None and (
+            transfer_method == TransferMethod.POST_URL or transfer_method == TransferMethod.DIRECT
+        ):
+            input.transfer_crc32c = params.crc_hex
+            input.transfer_sha256 = params.sha256_hex
+            input.transfer_size = params.size
+
+        data = input.dict(exclude_none=True)
+        return self.request.request_presigned_url("v1/scan", FileScanResult, data=data)
+
+
+class FileUploader:
+    def __init__(self):
+        self.logger = logging.getLogger("pangea")
+        self._request = PangeaRequest(
+            config=PangeaConfig(),
+            token="",
+            service="FileScanUploader",
+            logger=self.logger,
+        )
+
+    def upload_file(
+        self,
+        url: str,
+        file: io.BufferedReader,
+        transfer_method: TransferMethod = TransferMethod.PUT_URL,
+        file_details: Optional[Dict] = None,
+    ):
+        if transfer_method == TransferMethod.PUT_URL:
+            files = [("file", ("filename", file, "application/octet-stream"))]
+            self._request.put_presigned_url(url=url, files=files)
+        elif transfer_method == TransferMethod.POST_URL or transfer_method == TransferMethod.DIRECT:
+            files = [("file", ("filename", file, "application/octet-stream"))]
+            self._request.post_presigned_url(url=url, data=file_details, files=files)
+        else:
+            raise ValueError(f"Transfer method not supported: {transfer_method}")

pangea/services/redact.py

@@ -134,13 +134,8 @@ class Redact(ServiceBase):
 
     service_name = "redact"
 
-    def __init__(
-        self,
-        token,
-        config=None,
-        logger_name="pangea",
-    ):
-        super().__init__(token, config, logger_name)
+    def __init__(self, token, config=None, logger_name="pangea", config_id: Optional[str] = None):
+        super().__init__(token, config, logger_name, config_id=config_id)
 
     def redact(
         self,

pangea/services/vault/vault.py

@@ -537,7 +537,7 @@ class Vault(ServiceBase):
 
         Generate a symmetric key
 
-        OperationId: vault_post_v1_key_generate 1
+        OperationId: vault_post_v1_key_generate 2
 
         Args:
             algorithm (SymmetricAlgorithm): The algorithm of the key
@@ -611,7 +611,7 @@ class Vault(ServiceBase):
 
         Generate an asymmetric key
 
-        OperationId: vault_post_v1_key_generate 2
+        OperationId: vault_post_v1_key_generate 1
 
         Args:
             algorithm (AsymmetricAlgorithm): The algorithm of the key

pangea/utils.py

@@ -8,6 +8,7 @@ from collections import OrderedDict
 from hashlib import new, sha1, sha256, sha512
 
 from google_crc32c import Checksum as CRC32C
+from pydantic import BaseModel
 
 
 def format_datetime(dt: datetime.datetime) -> str:
@@ -100,7 +101,13 @@ def get_prefix(hash: str, len: int = 5):
     return hash[0:len]
 
 
-def get_presigned_url_upload_params(file: io.BufferedReader):
+class FileUploadParams(BaseModel):
+    crc_hex: str
+    sha256_hex: str
+    size: int
+
+
+def get_file_upload_params(file: io.BufferedReader) -> FileUploadParams:
     if "b" not in file.mode:
         raise AttributeError("File need to be open in binary mode")
 
@@ -118,4 +125,4 @@ def get_presigned_url_upload_params(file: io.BufferedReader):
         size += len(chunk)
 
     file.seek(0)  # restart reading
-    return crc.hexdigest().decode("utf-8"), sha.hexdigest(), size, file
+    return FileUploadParams(crc_hex=crc.hexdigest().decode("utf-8"), sha256_hex=sha.hexdigest(), size=size)

{pangea_sdk-3.2.0.dist-info → pangea_sdk-3.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pangea-sdk
-Version: 3.2.0
+Version: 3.3.0
 Summary: Pangea API SDK
 License: MIT
 Keywords: Pangea,SDK,Audit
@@ -15,10 +15,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Topic :: Software Development
 Classifier: Topic :: Software Development :: Libraries
-Requires-Dist: aiohttp (>=3.8.5,<4.0.0)
+Requires-Dist: aiohttp (>=3.8.6,<4.0.0)
 Requires-Dist: alive-progress (>=2.4.1,<3.0.0)
 Requires-Dist: asyncio (>=3.4.3,<4.0.0)
-Requires-Dist: cryptography (==41.0.3)
+Requires-Dist: cryptography (==41.0.5)
 Requires-Dist: deprecated (>=1.2.13,<2.0.0)
 Requires-Dist: google-crc32c (>=1.5.0,<2.0.0)
 Requires-Dist: pydantic (>=1.10.2,<2.0.0)
@@ -59,18 +59,18 @@ poetry add pangea-sdk
 
 ## Usage
 
-For samples apps look at [/examples](https://github.com/pangeacyber/pangea-python/tree/main/examples) folder in this repository. There you will find basic samples apps for each services supported on this SDK. Each service folder has a README.md with intructions to install, setup and run.
+For sample apps, look at the [/examples](https://github.com/pangeacyber/pangea-python/tree/main/examples) folder in this repository. There you will find basic sample apps for each of the services supported on this SDK. Each service folder has a README.md with instructions to install, setup, and run the sample app.
 
 
 ## Asyncio support
 
-We have added support to asyncio library using aiohttp in order to support async/await calls to all our services.
+We have added support to the asyncio library using aiohttp in order to support async/await calls to all our services.
 Async services classes are inside [pangea/asyncio](https://github.com/pangeacyber/pangea-python/tree/main/packages/pangea-sdk/pangea/asyncio) folder, and examples about how to use them are in [/examples/asyncio](https://github.com/pangeacyber/pangea-python/tree/main/examples/asyncio).
 
 
 ### Secure Audit Service - Integrity Tools
 
-Python Pangea SDK include also some extra features to validate Audit Service log's integrity. Here we explain how to run them.
+The Python Pangea SDK also includes some extra features to validate Audit Service log's integrity. Here we explain how to run them.
 
 #### Verify audit data
 
@@ -101,7 +101,7 @@ curl -H "Authorization: Bearer ${PANGEA_TOKEN}" -X POST -H 'Content-Type: applic
 
 Download all audit logs for a given time range. Start and end date should be provided,
 a variety of formats is supported, including ISO-8601. The result is stored in a
-jsonl file (one json per line)
+json file (one json per line).
 
 ```
 usage: python -m pangea.dump_audit [-h] [--token TOKEN] [--domain DOMAIN] [--output OUTPUT] start end
@@ -126,8 +126,8 @@ options:
 
 #### Perform Exhaustive Verification of Audit Data
 
-This script performs extensive verification on a range of events of the log stream. Appart from verifying the hash
-and the membership proof, it checks that there is no omissions in the stream, i.e. all the events are present and properly located.
+This script performs extensive verification on a range of events of the log stream. Apart from verifying the hash
+and the membership proof, it checks that there are no omissions in the stream, i.e. all the events are present and properly located.
 
 ```
 usage: python -m pangea.deep_verify [-h] [--token TOKEN] [--domain DOMAIN] --file FILE
@@ -153,9 +153,9 @@ It accepts multiple file formats:
 
 ## Reporting issues and new features
 
-If faced some issue using or testing this SDK or a new feature request feel free to open an issue [clicking here](https://github.com/pangeacyber/pangea-python/issues).
-We would need you to provide some basic information like what SDK's version you are using, stack trace if you got it, framework used, and steps to reproduce the issue.
-Also feel free to contact [Pangea support](mailto:support@pangea.cloud) by email or send us a message on [Slack](https://pangea.cloud/join-slack/)
+If you run into an issue using or testing this SDK or if you have a new feature request, feel free to open an issue by [clicking here](https://github.com/pangeacyber/pangea-python/issues).
+We would need you to provide some basic information, such as what SDK version you are using, the stack trace if you got it, the framework used, and steps to reproduce the issue.
+Also, feel free to contact [Pangea support](mailto:support@pangea.cloud) by email or send us a message on [Slack](https://pangea.cloud/join-slack/).
 
 
 ## Contributing
@@ -168,5 +168,5 @@ These linters will run on every `git commit` operation.
 
 ### Send a PR
 
-If you would like to [send a PR](https://github.com/pangeacyber/pangea-python/pulls) including a new feature or fixing a bug in code or an error in documents we will really appreciate it and after review and approval you will be included in our [contributors list](https://github.com/pangeacyber/pangea-python/blob/main/packages/pangea-sdk/CONTRIBUTING.md)
+If you would like to [send a PR](https://github.com/pangeacyber/pangea-python/pulls) including a new feature or fixing a bug in the code or an error in documents, we really appreciate it and after review and approval, you will be included in our [contributors list](https://github.com/pangeacyber/pangea-python/blob/main/packages/pangea-sdk/CONTRIBUTING.md).
 

{pangea_sdk-3.2.0.dist-info → pangea_sdk-3.3.0.dist-info}/RECORD

@@ -1,43 +1,43 @@
-pangea/__init__.py,sha256=wJkVKT91Nt_-CfUqTrKN0v_lLpE2Wu7Q5LgQbArZUDc,200
-pangea/asyncio/request.py,sha256=ZvEzLnKD5Z7fHV-rqd6yLSHvhAXxvzs2dNnxgXg19KQ,11220
+pangea/__init__.py,sha256=GgLmx-eZWNCnGMva8AGtHJ4JesBsSPfw8YdDVyuKXOo,200
+pangea/asyncio/request.py,sha256=akSpGTjC8j8Jr6uK40Zu8v9HQXX_QOf7dKgweq5K6DM,12642
 pangea/asyncio/services/__init__.py,sha256=_CEDza6E9VmEs6d_vubWetfeqTogH7UxT7XrTVRw4Mo,290
 pangea/asyncio/services/audit.py,sha256=xHvz5ReJpmk_StK3mr_uDqCI80J6Aj7-EglEBWS0Qqc,16480
 pangea/asyncio/services/authn.py,sha256=HssvrZ3fr2oP5sgYBj1Rr5Yf-fKiHhrWTue5LOAeyOk,43288
-pangea/asyncio/services/base.py,sha256=iN0Y8EZbLPzPBMJzbrasOzSSQ2-JfhN__pz1ZBW3g1E,1588
+pangea/asyncio/services/base.py,sha256=hmdY5-IS_H2WGMeVfzotn11Z1c2B2iJTHi4USBbmptA,2304
 pangea/asyncio/services/embargo.py,sha256=8WguyWZUaGVwGpNzic5h8QzLueirA9WpBBik4mpCTeA,3056
-pangea/asyncio/services/file_scan.py,sha256=Ccbx3kOrT9lXBTxaANM2ULDd44SVrSDVlXpcE_GxYjE,3607
+pangea/asyncio/services/file_scan.py,sha256=DnysLA0oEsxkHPdt4Pal6oWKiYdl7TZz8eX20Bs_Zl8,6280
 pangea/asyncio/services/intel.py,sha256=LdJSxCohXsI4Vk8bG74jXTBYAL9N45lb5LIX7nBXqLI,22248
-pangea/asyncio/services/redact.py,sha256=NSi2GRNqdpTAYUDCMsPc9bv6HX1orbfiw2NK1yKFwxU,5137
+pangea/asyncio/services/redact.py,sha256=W9eKMw1XyY6tgRudRrtuCpyQYhgttvmsYngoiMld0C4,5152
 pangea/asyncio/services/vault.py,sha256=JhxUdmPNYZzp3eiAQFR6vsfyS9L3ddKWes-Cv7rj2ow,43425
 pangea/audit_logger.py,sha256=zCSsq0kvw4Pb_aIBb7APfaYsTqd9dmohYLFld2ir5lc,3778
-pangea/config.py,sha256=zxu1dYv2sjjODPOWVWPjC3BDPqwY1LxWSSnN1bU4XxM,1668
+pangea/config.py,sha256=kFu9mLMkFpkM7wdT8Ymvskx6DGLfRZKeKfQRVZTgbyA,1670
 pangea/deep_verify.py,sha256=WiA_2gqtrSCQYoTMKX9ILlNgnknsH4UxZpJXLVG2uyc,8343
 pangea/deprecated.py,sha256=IjFYEVvY1E0ld0SMkEYC1o62MAleX3nnT1If2dFVbHo,608
 pangea/dump_audit.py,sha256=Ws0KuZyHoaySsQ2lq9EKK2iw65O8x4zL1Mii0ChDh0k,6511
 pangea/exceptions.py,sha256=JMx_Dym7W2cgcPSHN4bz9Rlrm-3BZGNpIYu3VBXZLBU,5277
-pangea/request.py,sha256=jtT3dbhgckNQlDgj5aNVNA_BLiH9vwXs-198CsiyUDQ,17223
-pangea/response.py,sha256=DvWm73JkUbYKtumYG02dnpfqcA6sXdAzU8PEsDx_xeg,5257
+pangea/request.py,sha256=5BP-wFI6x7lfJ41-6bTcpcg3pyviMgrX_4nX_M9yyXg,18640
+pangea/response.py,sha256=mOgeFqafEH_MdDILSo-ju5cWicXlvSd1CXzbsHObiJo,5363
 pangea/services/__init__.py,sha256=auqKaEAOLiazHCzOQVwrUwd2ABFw_bF-ptoOq1bpa68,253
-pangea/services/audit/audit.py,sha256=Q38Vtl76ZtqOgyCZpXHkyO3l8lrTxr_5ubEpFmelk_M,30302
+pangea/services/audit/audit.py,sha256=50zkQE2HQ0cQtFroFSVjUxX1M4RQsf6pBUeMidSkEHI,30295
 pangea/services/audit/exceptions.py,sha256=CVdaQZCvQKx1n-iIjWz5wnStUGU6cXDwKqe7MoijAXk,451
 pangea/services/audit/models.py,sha256=ztLcB7XNRudn3GquyW8gp_TlCrH3va32Tw0nMpO7g6k,12244
 pangea/services/audit/signing.py,sha256=JWYutDNV5XZZzLASwdUJ-9gMHlGd8-h4IjIbKz7JMJM,5261
 pangea/services/audit/util.py,sha256=2EM3K9R-T9FBKegklmLLoWa1IDm84uGjmJZVO3mYEhk,7568
-pangea/services/authn/authn.py,sha256=rOduEUjxs7ybeT_mm1wHcA8tSnG7QS0wZ4aNHICqPSk,42565
-pangea/services/authn/models.py,sha256=SmeBGbKeVejqAmnkZy02pvwl9mz5hZTZ9fnQHvNYTRs,18099
-pangea/services/base.py,sha256=utQPd6dUGlbvaOPRl1eoHGkFdVbdSSX4t_Mo_cfB9LA,2093
+pangea/services/authn/authn.py,sha256=sGQUPQ8VLEMtu8AkEhWPyY6Q6AxCsfrX-XNUzkC-o1M,42774
+pangea/services/authn/models.py,sha256=V-hj1KfbSuaWJMVgd-Q3fWTsnbj3EdPumnzXtjHOR8g,18150
+pangea/services/base.py,sha256=bRSuuhLv6iQrPVjhasOjTBqOgxTRRhCD204v3tNjVOE,2731
 pangea/services/embargo.py,sha256=F3jx7SbElnjhbDEUR3oHfWsQ8G8zf_kfp6_q1_vmOIc,3871
-pangea/services/file_scan.py,sha256=hyFilh7uqx_kPs3F4dthXsfVds1AUeLCm091zaMtGnw,4825
+pangea/services/file_scan.py,sha256=K4zDhZtY-Co622QgSOueGfkCaAJVy04mO6sqQ22TBS4,6999
 pangea/services/intel.py,sha256=oTvTxCtdnoaZRlt0anUKnkRT2FVfc9LG8ftDIX09jHk,30399
-pangea/services/redact.py,sha256=VpC-uGgReRyiRTl-8tuQLzT10yFvYIcVroqH-YQC30k,7741
+pangea/services/redact.py,sha256=vH4sg_t8MnoSjSY-F42JZhe8EfRmVCclslDN7U1hNP4,7756
 pangea/services/vault/models/asymmetric.py,sha256=ac2Exc66elXxO-HxBqtvLPQWNI7y_00kb6SVqBPKecA,1450
 pangea/services/vault/models/common.py,sha256=D_xZlqjEc0XO9G_aoed3YuPNTNYB5S2DoZJRIJVoliQ,9095
 pangea/services/vault/models/secret.py,sha256=cLgEj-_BeGkB4-pmSeTkWVyasFbaJwcEltIEcOyf1U8,481
 pangea/services/vault/models/symmetric.py,sha256=5N2n6FDStB1CLPfpd4p-6Ig__Nt-EyurhjCWfEyws2k,1330
-pangea/services/vault/vault.py,sha256=Y8lhQ5O95FZb9J5CwpPjYQfzMif85Tnun6bU92gqzFA,43160
+pangea/services/vault/vault.py,sha256=t3KU59FjUfVawbMZt7A51cDQoyapftChdihTqllVrTw,43160
 pangea/tools.py,sha256=A9gkHpAkECwqnUKA-O09vG-n6Gmq2g_LYr61BUs-n54,6403
-pangea/utils.py,sha256=qr4KA4evZ_L5DBOrzW7GLdt39XAHBTZho88IimkUhVw,3194
+pangea/utils.py,sha256=09dHX9CKmyKNWccSF2z7LyCYYYduZ9AWP6D5Ylnfty8,3360
 pangea/verify_audit.py,sha256=gWhde7gETKSWfBaMm5gEckAO2xmYB_vmgcZ_4FvvyfU,10616
-pangea_sdk-3.2.0.dist-info/METADATA,sha256=1jKXM5HPXzJhmmzd5pdZufVQCGN_okr2sGfL2AhSldg,6863
-pangea_sdk-3.2.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-pangea_sdk-3.2.0.dist-info/RECORD,,
+pangea_sdk-3.3.0.dist-info/METADATA,sha256=7xobhjV_WaLEGoK4-jsG9YZG_PqDEhYlXD3c6CnnxS0,6934
+pangea_sdk-3.3.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+pangea_sdk-3.3.0.dist-info/RECORD,,