insightconnect-plugin-runtime 6.1.4__py3-none-any.whl → 6.2.1__py3-none-any.whl

insightconnect_plugin_runtime/helper.py

@@ -30,6 +30,8 @@ ENCODE_TYPE = "utf-8"
 
 DEFAULTS_HOURS_AGO = 24
 
+logger = logging.getLogger()
+
 
 def hash_sha1(log: Dict) -> str:
     """
@@ -65,7 +67,7 @@ def compare_and_dedupe_hashes(
         if hash_ not in previous_logs_hashes:
             new_logs_hashes.append(hash_)
             logs_to_return.append(log)
-    logging.info(
+    logger.info(
         f"Original number of logs:{len(new_logs)}. Number of logs after de-duplication:{len(logs_to_return)}"
     )
     return logs_to_return, new_logs_hashes
@@ -75,10 +77,10 @@ def make_request(
     _request: requests.Request,
     timeout: int = 60,
     verify: bool = True,
-    cert: Union[str, Tuple]=None,
+    cert: Union[str, Tuple] = None,
     stream: bool = False,
     allow_redirects: bool = True,
-    exception_custom_configs: Dict[int, Exception]={},
+    exception_custom_configs: Dict[int, Exception] = {},
     exception_data_location: str = None,
     allowed_status_codes: List[str] = [],
 ) -> Tuple[requests.Response, Dict]:
@@ -156,7 +158,7 @@ def extract_json(response: requests.Response) -> Dict:
 
 
 def request_error_handling(
-    custom_configs: Dict[int, Exception]={},
+    custom_configs: Dict[int, Exception] = {},
     exception_data_location: str = None,
     allowed_status_codes: List[str] = [],
 ) -> Union[Any, None]:
@@ -204,7 +206,7 @@ def request_error_handling(
 
 def response_handler(
     response: requests.Response,
-    custom_configs: Dict[int, Exception]={},
+    custom_configs: Dict[int, Exception] = {},
     data_location: str = None,
     allowed_status_codes: List[str] = [],
 ) -> None:
@@ -246,7 +248,7 @@ def response_handler(
         }
         status_code_preset = status_code_presets.get(status_code)
         exception = PluginException(preset=PluginException.Preset.UNKNOWN, data=data)
-        logging.info(f"Request to {response.url} failed. Status code: {status_code}")
+        logger.info(f"Request to {response.url} failed. Status code: {status_code}")
         if status_code in custom_configs.keys():
             exception = custom_configs.get(status_code)
             if hasattr(exception, "data") and data is not None:
@@ -304,7 +306,7 @@ def extract_value(begin, key, end, s):
 
     Example: The following will use pull out the /bin/bash from the string s
     s = '\nShell: /bin/bash\n'
-    shell = get_value(r'\s', 'Shell', r':\s(.*)\s', s)
+    shell = get_value(r'\\s', 'Shell', r':\\s(.*)\\s', s)
 
     This function works well when you have a list of keys to iterate through where the pattern is the same.
     """
@@ -561,7 +563,7 @@ def rate_limiting(
                         error.cause
                         == PluginException.causes[PluginException.Preset.RATE_LIMIT]
                     ):
-                        logging.info(
+                        logger.info(
                             f"Rate limiting error occurred. Retrying in {delay:.1f} seconds ({attempts_counter}/{max_tries})"
                         )
                         retry = True
@@ -603,12 +605,12 @@ def check_hashes(src, checksum):
     if type(src) is str:
         hashes = get_hashes_string(src)
     else:
-        logging.error("CheckHashes: Argument must be a string")
+        logger.error("CheckHashes: Argument must be a string")
         raise Exception("CheckHashes")
     for alg in hashes:
         if hashes[alg] == checksum:
             return True
-    logging.info("CheckHashes: No checksum match")
+    logger.info("CheckHashes: No checksum match")
     return False
 
 
@@ -620,9 +622,9 @@ def check_cachefile(cache_file):
         cache_file = cache_dir + "/" + cache_file
     if os.path.isdir(cache_dir):
         if os.path.isfile(cache_file):
-            logging.info("CheckCacheFile: File %s exists", cache_file)
+            logger.info("CheckCacheFile: File %s exists", cache_file)
             return True
-        logging.info("CheckCacheFile: File %s did not exist", cache_file)
+        logger.info("CheckCacheFile: File %s did not exist", cache_file)
     return False
 
 
@@ -638,9 +640,9 @@ def open_file(file_path):
                 return f
             return None
         else:
-            logging.info("OpenFile: File %s is not a file or does not exist ", filename)
+            logger.info("OpenFile: File %s is not a file or does not exist ", filename)
     else:
-        logging.error(
+        logger.error(
             "OpenFile: Directory %s is not a directory or does not exist", dirname
         )
 
@@ -654,13 +656,13 @@ def open_cachefile(cache_file, append=False):
     if os.path.isdir(cache_dir):
         if os.path.isfile(cache_file):
             f = open(cache_file, "a+" if append else "r+")
-            logging.info("OpenCacheFile: %s exists, returning it", cache_file)
+            logger.info("OpenCacheFile: %s exists, returning it", cache_file)
         else:
             if not os.path.isdir(os.path.dirname(cache_file)):
                 os.makedirs(os.path.dirname(cache_file))
             f = open(cache_file, "w+")  # Open once to create the cache file
             f.close()
-            logging.info("OpenCacheFile: %s created", cache_file)
+            logger.info("OpenCacheFile: %s created", cache_file)
             f = open(cache_file, "a+" if append else "r+")
         return f
     logging.error("OpenCacheFile: %s directory or does not exist", cache_dir)
@@ -676,7 +678,7 @@ def remove_cachefile(cache_file):
         if os.path.isfile(cache_file):
             os.remove(cache_file)
             return True
-        logging.info("RemoveCacheFile: Cache file %s did not exist", cache_file)
+        logger.info("RemoveCacheFile: Cache file %s did not exist", cache_file)
     return False
 
 
@@ -695,9 +697,9 @@ def lock_cache(lock_file):
             os.makedirs(os.path.dirname(lock_file))
         f = open(lock_file, "w")
         f.close()
-        logging.info("Cache lock %s created", lock_file)
+        logger.info("Cache lock %s created", lock_file)
         return True
-    logging.info("Cache lock %s failed, lock not created", lock_file)
+    logger.info("Cache lock %s failed, lock not created", lock_file)
     return False
 
 
@@ -716,7 +718,7 @@ def unlock_cache(lock_file, wait_time):
             time.sleep(wait_time)
             os.remove(lock_file)
             return True
-        logging.info("Cache unlock %s failed, lock not released", lock_file)
+        logger.info("Cache unlock %s failed, lock not released", lock_file)
     return False
 
 

{insightconnect_plugin_runtime-6.1.4.dist-info → insightconnect_plugin_runtime-6.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: insightconnect-plugin-runtime
-Version: 6.1.4
+Version: 6.2.1
 Summary: InsightConnect Plugin Runtime
 Home-page: https://github.com/rapid7/komand-plugin-sdk-python
 Author: Rapid7 Integrations Alliance
@@ -13,13 +13,13 @@ Classifier: Natural Language :: English
 Classifier: Topic :: Software Development :: Build Tools
 Description-Content-Type: text/markdown
 Requires-Dist: requests==2.32.2
-Requires-Dist: python-jsonschema-objects==0.5.2
+Requires-Dist: python_jsonschema_objects==0.5.2
 Requires-Dist: jsonschema==4.21.1
 Requires-Dist: certifi==2024.07.04
 Requires-Dist: Flask==3.0.2
 Requires-Dist: gunicorn==22.0.0
-Requires-Dist: greenlet==3.0.3
-Requires-Dist: gevent==24.2.1
+Requires-Dist: greenlet==3.1.1
+Requires-Dist: gevent==24.10.1
 Requires-Dist: marshmallow==3.21.0
 Requires-Dist: apispec==6.5.0
 Requires-Dist: apispec-webframeworks==1.0.0
@@ -48,10 +48,10 @@ to get started.
 
 ## Development of the InsightConnect Plugin Runtime
 
-The Python Runtime codebase is built to support Python 3.9.18 as of version 5.3.0. The following dependencies will need 
+The Python Runtime codebase is built to support Python 3.11.10 as of version 6.2.0. The following dependencies will need 
 to be installed when developing or testing the Plugin Runtime:
 
-- Python 3.9.18
+- Python 3.11.10
 - Docker
 - make
 - tox
@@ -184,11 +184,11 @@ Running a specific test file:
 
 |                   | Plugin  | Slim Plugin |
 |:------------------|:-------:|:-----------:|
-| Python Version    | 3.9.18  |   3.9.18    |
+| Python Version    | 3.11.10 |   3.11.10   |
 | OS                | Alpine  |  Bullseye   |
 | Package installer |   apk   |     apt     |
 | Shell             | /bin/sh |  /bin/bash  |
-| Image Size        | ~350MB  |   ~180MB    |
+| Image Size        | ~370MB  |   ~230MB    |
 
 Note that for the plugin image, we run `apk update` and `apk add ..` which leads to a longer build time.
 
@@ -211,6 +211,8 @@ contributed. Black is installed as a test dependency and the hook can be initial
 after cloning this repository.
 
 ## Changelog
+* 6.2.1 - Fix instances where logging would lead to duplicate entries being output
+* 6.2.0 - Update base images to pull Python 3.11.10 | changed the pep-8 check in tox to `pycodestyle`
 * 6.1.4 - Address vulnerabilities within local development requirements.txt and vulnerabilities in slim image.
 * 6.1.3 - Addressing failing Python Slim package (bump packages).
 * 6.1.2 - Removing the call to mask_output_data for task code.

{insightconnect_plugin_runtime-6.1.4.dist-info → insightconnect_plugin_runtime-6.2.1.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=F2JmcvmUAlwjeqtqGoTbfuTSgmgqaFOw-xdZMCC79is,31538
+insightconnect_plugin_runtime/helper.py,sha256=IY4-ntZbiXWFx7jAQ_n1vBjQBd_tt4Zr4INtXzQmiGg,31564
 insightconnect_plugin_runtime/metrics.py,sha256=hf_Aoufip_s4k4o8Gtzz90ymZthkaT2e5sXh5B4LcF0,3186
 insightconnect_plugin_runtime/plugin.py,sha256=Yf4LNczykDVc31F9G8uuJ9gxEsgmxmAr0n4pcZzichM,26393
 insightconnect_plugin_runtime/schema.py,sha256=jTNc6KAMqFpaDVWrAYhkVC6e8I63P3X7uVlJkAr1hiY,583
@@ -78,7 +78,7 @@ tests/unit/test_server_spec.py,sha256=je97BaktgK0Fiz3AwFPkcmHzYtOJJNqJV_Fw5hrvqX
 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.1.4.dist-info/METADATA,sha256=tUofv23JDlh0ClMPm-Vi6AKGkZZdCvDcBAqrnig0WiU,14929
-insightconnect_plugin_runtime-6.1.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-insightconnect_plugin_runtime-6.1.4.dist-info/top_level.txt,sha256=AJtyJOpiFzHxsbHUICTcUKXyrGQ3tZxhrEHsPjJBvEA,36
-insightconnect_plugin_runtime-6.1.4.dist-info/RECORD,,
+insightconnect_plugin_runtime-6.2.1.dist-info/METADATA,sha256=7VvNCT7PV0qyLXPRcZcp6tUulmRLyEHix_Qf53iwn3M,15117
+insightconnect_plugin_runtime-6.2.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+insightconnect_plugin_runtime-6.2.1.dist-info/top_level.txt,sha256=AJtyJOpiFzHxsbHUICTcUKXyrGQ3tZxhrEHsPjJBvEA,36
+insightconnect_plugin_runtime-6.2.1.dist-info/RECORD,,

{insightconnect_plugin_runtime-6.1.4.dist-info → insightconnect_plugin_runtime-6.2.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.1.0)
+Generator: setuptools (75.6.0)
 Root-Is-Purelib: true
 Tag: py3-none-any