Merge branch 'improved-wrapping-main' into update-wrapping-to-wrapt-for-sources

Author: bitterpanda63

aikido_zen/sinks/__init__.py

@@ -1,5 +1,4 @@
 from wrapt import wrap_object, FunctionWrapper, when_imported
-
 from aikido_zen.background_process.packages import ANY_VERSION, is_package_compatible
 from aikido_zen.errors import AikidoException
 from aikido_zen.helpers.logging import logger

aikido_zen/sinks/http_client.py

@@ -12,6 +12,8 @@
 
 @before
 def _putrequest(func, instance, args, kwargs):
+    # putrequest(...) is called with path argument, store this on the HTTPConnection
+    # instance for later use in the getresponse(...) function.
     path = get_argument(args, kwargs, 1, "path")
     setattr(instance, "_aikido_var_path", path)
 

aikido_zen/sinks/os.py

@@ -28,7 +28,7 @@ def patch(m):
     - patches os.* functions that take in paths
     - patches os.path.* functions that take in paths
     - doesn't patch os.makedirs -> uses os.mkdir
-    - doesn't patch os.path.realpath or os.path.abspath -> uses os.path.join
+    - doesn't patch os.path.abspath -> uses os.path.join
     - doesn't patch os.path.exists and others -> to big of a performance impact
     - doesn't patch stat library https://docs.python.org/3/library/stat.html
     """

aikido_zen/sinks/psycopg2.py

@@ -13,7 +13,8 @@ def patch(m):
     """
     patching module psycopg2
     - patches psycopg2.connect
-    Warning: cannot set 'execute' attribute of immutable type 'psycopg2.extensions.cursor'
+    cannot set 'execute' attribute of immutable type 'psycopg2.extensions.cursor',
+    so we create our own cursor factory to bypass this limitation.
     """
     compatible = is_package_compatible(
         required_version="2.9.2", packages=["psycopg2", "psycopg2-binary"]

aikido_zen/sinks/shutil.py

@@ -16,7 +16,7 @@ def _shutil_func(func, instance, args, kwargs):
     op = f"shutil.{func.__name__}"
     if isinstance(source, str):
         vulns.run_vulnerability_scan(kind, op, args=(source,))
-    if isinstance(source, str):
+    if isinstance(destination, str):
         vulns.run_vulnerability_scan(kind, op, args=(destination,))