insightconnect-plugin-runtime 6.2.3__py3-none-any.whl → 6.2.5__py3-none-any.whl

insightconnect_plugin_runtime/clients/aws_client.py

@@ -599,7 +599,7 @@ class AWSAction(Action):
         auth_params: Dict[str, str],
     ):
         session_name = str(uuid.uuid1())
-        sts_client = boto3.client("sts", **auth_params)
+        sts_client = boto3.client("sts", **auth_params, region_name=assume_role_params.get(REGION))
         try:
             assumed_role_object = sts_client.assume_role(
                 **clean(

insightconnect_plugin_runtime/helper.py

@@ -21,6 +21,7 @@ from insightconnect_plugin_runtime.exceptions import (
     PluginException,
     HTTPStatusCodes,
     ResponseExceptionData,
+    APIException
 )
 
 CAMEL_CASE_REGEX = r"\b[a-z0-9]+([A-Z][a-z]+[0-9]*)*\b"
@@ -111,6 +112,7 @@ def make_request(
     exception_custom_configs: Dict[int, Exception] = {},
     exception_data_location: str = None,
     allowed_status_codes: List[str] = [],
+    max_response_size: int = None,
 ) -> Tuple[requests.Response, Dict]:
     """
     Makes a HTTP request while checking for RequestErrors and JSONDecodeErrors
@@ -133,6 +135,8 @@ def make_request(
     :type str:
     :param allowed_status_codes: Status codes that will not raise an exception.
     :type List[str]:
+    :param max_response_size: Raise an error if the stream content is bigger than this specified size
+    :type int:
 
     :return: The request response and the response JSON.
     :rtype: Tuple[Response, Dict]
@@ -148,6 +152,19 @@ def make_request(
                 cert=cert,
                 stream=stream,
             )
+
+            # Before we close this session check and download all content, check if the returned content is too large.
+            # This may not be supported on all APIs as they need to support streaming and return the content-length
+            # header but adding this extra check will be beneficial for memory usage to those that do support it.
+            if stream and max_response_size:
+                resp_size = response.headers.get("content-length", "0")
+                if int(resp_size) > max_response_size:
+                    raise APIException(
+                        status_code=400,
+                        cause=f"API response is exceeding allowed limit of {max_response_size} bytes.",
+                        assistance="Please update the parameters to reduce the size of the data being returned.",
+                        data=f"Content length returned was {resp_size} and max allowed is {max_response_size}",
+                    )
     except requests.exceptions.Timeout as exception:
         raise PluginException(
             preset=PluginException.Preset.TIMEOUT, data=str(exception)

{insightconnect_plugin_runtime-6.2.3.dist-info → insightconnect_plugin_runtime-6.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: insightconnect-plugin-runtime
-Version: 6.2.3
+Version: 6.2.5
 Summary: InsightConnect Plugin Runtime
 Home-page: https://github.com/rapid7/komand-plugin-sdk-python
 Author: Rapid7 Integrations Alliance
@@ -219,6 +219,8 @@ contributed. Black is installed as a test dependency and the hook can be initial
 after cloning this repository.
 
 ## Changelog
+* 6.2.5 - Fixed bug related to failure to set default region to assume role method in `aws_client` for newer versions of boto3 | Updated alpine image packages on build
+* 6.2.4 - Update `make_request` helper to support extra parameter of `max_response_size` to cap the response
 * 6.2.3 - Updated dockerfiles for both `slim` and `full` SDK types to use Python 3.11.11 | Updated dependencies | Removed `pkg_resources` usage due to deprecation
 * 6.2.2 - Fix instances where logging errors would lead to duplicate entries being output | Add option to hash only on provided keys for `hash_sha1` function
 * 6.2.1 - Fix instances where logging would lead to duplicate entries being output

{insightconnect_plugin_runtime-6.2.3.dist-info → insightconnect_plugin_runtime-6.2.5.dist-info}/RECORD

@@ -4,7 +4,7 @@ insightconnect_plugin_runtime/cli.py,sha256=Pb-Janu-XfRlSXxPHh30OIquljWptrhhS51C
 insightconnect_plugin_runtime/connection.py,sha256=4bHHV2B0UFGsAtvLu1fiYQRwx7fissUakHPUyjLQO0E,2340
 insightconnect_plugin_runtime/dispatcher.py,sha256=ru7njnyyWE1-oD-VbZJ-Z8tELwvDf69rM7Iezs4rbnw,1774
 insightconnect_plugin_runtime/exceptions.py,sha256=Pvcdkx81o6qC2qU661x-DzNjuIMP82x52nPMSEqEo4s,8491
-insightconnect_plugin_runtime/helper.py,sha256=WiCFu4S33BL8wugBmyFH-06inkcXPmdC5cv0UGlSHfA,32646
+insightconnect_plugin_runtime/helper.py,sha256=B0XqAXmn8CT1KQ6i5IoWLQrQ_HVOvuKrIKFuj_npQ-g,33770
 insightconnect_plugin_runtime/metrics.py,sha256=hf_Aoufip_s4k4o8Gtzz90ymZthkaT2e5sXh5B4LcF0,3186
 insightconnect_plugin_runtime/plugin.py,sha256=Yf4LNczykDVc31F9G8uuJ9gxEsgmxmAr0n4pcZzichM,26393
 insightconnect_plugin_runtime/schema.py,sha256=6MVw5hqGATU1VLgwfOWfPsP3hy1OnsugCTsgX8sknes,521
@@ -18,7 +18,7 @@ insightconnect_plugin_runtime/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeR
 insightconnect_plugin_runtime/api/endpoints.py,sha256=8QQrxzW8jmQIkalud8fqYwB05uUw8sTiDNgO5ZekOCA,33353
 insightconnect_plugin_runtime/api/schemas.py,sha256=jRmDrwLJTBl-iQOnyZkSwyJlCWg4eNjAnKfD9Eko4z0,2754
 insightconnect_plugin_runtime/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-insightconnect_plugin_runtime/clients/aws_client.py,sha256=bgSK3Txr1YonDiUN5JFEZ5cAyCXFM14JjfMus6lRV8o,23017
+insightconnect_plugin_runtime/clients/aws_client.py,sha256=ViJF3klbD1YM5GVxme3BFYfpuADUlVGP8sdbX2Z6_Cw,23061
 insightconnect_plugin_runtime/clients/oauth.py,sha256=bWtAGRMwdK4dw9vMPcw9usklyIHBDtZh55kMZ7sWROc,2453
 insightconnect_plugin_runtime/data/input_message_schema.json,sha256=7_BcHi6UOBiVWGrrJHHn5IoddteXjL7GOKETdO9T2DE,1770
 insightconnect_plugin_runtime/data/output_message_schema.json,sha256=Qya6U-NR5MfOlw4V98VpQzGBVq75eGMUQhI-j3yxOHI,1137
@@ -68,7 +68,7 @@ tests/unit/test_aws_action.py,sha256=pBE23Qn4aXKJqPmwiHMcEU5zPdyvbKO-eK-6jUlrsQw
 tests/unit/test_custom_encoder.py,sha256=KLYyVOTq9MEkZXyhVHqjm5LVSW6uJS4Davgghsw9DGk,2207
 tests/unit/test_endpoints.py,sha256=LuXOfLBu47rDjGa5YEsOwTZBEdvQdl_C6-r46oxWZA8,6401
 tests/unit/test_exceptions.py,sha256=Y4F-ij8WkEJkUU3mPvxlEchqE9NCdxDvR8bJzPVVNao,5328
-tests/unit/test_helpers.py,sha256=9Y5N5cUBtesfr289oOZFekMJb84VYuFjucqQ9VEk3WQ,17431
+tests/unit/test_helpers.py,sha256=ym1tFi1VSKmdPaHEAlMEl1S7Ibu9-LrqZ2oqJv7bfbE,18685
 tests/unit/test_metrics.py,sha256=PjjTrB9w7uQ2Q5UN-893-SsH3EGJuBseOMHSD1I004s,7979
 tests/unit/test_oauth.py,sha256=nbFG0JH1x04ExXqSe-b5BGdt_hJs7DP17eUa6bQzcYI,2093
 tests/unit/test_plugin.py,sha256=ZTNAZWwZhDIAbxkVuWhnz9FzmojbijgMmsLWM2mXQI0,4160
@@ -77,8 +77,8 @@ tests/unit/test_server_cloud_plugins.py,sha256=PuMDHTz3af6lR9QK1BtPScr7_cRbWheto
 tests/unit/test_server_spec.py,sha256=je97BaktgK0Fiz3AwFPkcmHzYtOJJNqJV_Fw5hrvqX4,644
 tests/unit/test_trigger.py,sha256=E53mAUoVyponWu_4IQZ0IC1gQ9lakBnTn_9vKN2IZfg,1692
 tests/unit/test_variables.py,sha256=OUEOqGYZA3Nd5oKk5GVY3hcrWKHpZpxysBJcO_v5gzs,291
-tests/unit/utils.py,sha256=VooVmfpIgxmglNdtmT32AkEDFxHxyRHLK8RsCWjjYRY,2153
-insightconnect_plugin_runtime-6.2.3.dist-info/METADATA,sha256=m0fZClkhAwEVwvC34tDdEfursS7-CuHs5bhYZJNJab8,15610
-insightconnect_plugin_runtime-6.2.3.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-insightconnect_plugin_runtime-6.2.3.dist-info/top_level.txt,sha256=AJtyJOpiFzHxsbHUICTcUKXyrGQ3tZxhrEHsPjJBvEA,36
-insightconnect_plugin_runtime-6.2.3.dist-info/RECORD,,
+tests/unit/utils.py,sha256=hcY0A2H_DMgCDXUTvDtCXMdMvRjLQgTaGcTpATb8YG0,2236
+insightconnect_plugin_runtime-6.2.5.dist-info/METADATA,sha256=n08BX1O96S4-Nd6kDOiKrXF5jWec4b2Qq4g3DLBJLIs,15887
+insightconnect_plugin_runtime-6.2.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+insightconnect_plugin_runtime-6.2.5.dist-info/top_level.txt,sha256=AJtyJOpiFzHxsbHUICTcUKXyrGQ3tZxhrEHsPjJBvEA,36
+insightconnect_plugin_runtime-6.2.5.dist-info/RECORD,,

tests/unit/test_helpers.py

@@ -4,6 +4,7 @@ from insightconnect_plugin_runtime.exceptions import (
     HTTPStatusCodes,
     ResponseExceptionData,
     PluginException,
+    APIException
 )
 import requests
 import os
@@ -378,16 +379,39 @@ class TestRequestsHelpers(TestCase):
             json={"sample": "value"},
             headers={"Content-Type": "application/json"},
         )
-        response = helper.make_request(_request=request)
+        response = helper.make_request(_request=request, stream=True, max_response_size=100)
         expected = {
             "json": {"example": "sample"},
             "status_code": 200,
             "content": b"example",
             "url": "https://example.com/success",
+            "content-length": "1",
         }
         self.assertEqual(response.content, expected.get("content"))
         self.assertEqual(response.status_code, expected.get("status_code"))
         self.assertEqual(response.url, expected.get("url"))
+        self.assertEqual(response.headers.get("content-length"), expected.get("content-length"))
+
+    @patch("requests.Session.send")
+    def test_make_request_enforces_max_response_size(self, mocked_request):
+        returned_max_size, test_max_size = "5000", 1527
+
+        response = requests.Response()
+        response.headers = {"content-length": returned_max_size, "content-type": "application/json"}
+        mocked_request.return_value = response
+
+        test_request = requests.Request(method="GET", url="https://event_source.com/api/v1/logs")
+
+        with self.assertRaises(APIException) as api_err:
+            helper.make_request(_request=test_request, stream=True, max_response_size=test_max_size)
+
+        self.assertEqual(400, api_err.exception.status_code)
+        exp_err_cause = f"API response is exceeding allowed limit of {test_max_size} bytes."
+        exp_err_data = f"Content length returned was {returned_max_size} and max allowed is {test_max_size}"
+        self.assertEqual(400, api_err.exception.status_code)
+        self.assertEqual(exp_err_cause, api_err.exception.cause)
+        self.assertEqual(exp_err_data, api_err.exception.data)
+
 
     @parameterized.expand(
         [

tests/unit/utils.py

@@ -34,6 +34,7 @@ def get_mock_response(
     response._content = bytes_string
     response.url = url
     response.reason = reason
+    response.headers = {"content-length": "1", "content-type": "application/json"}
 
     def return_json():
         return data