socketsecurity 2.0.38__tar.gz → 2.0.42__tar.gz

{socketsecurity-2.0.38 → socketsecurity-2.0.42}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: socketsecurity
-Version: 2.0.38
+Version: 2.0.42
 Summary: Socket Security CLI for CI/CD
 Project-URL: Homepage, https://socket.dev
 Author-email: Douglas Coburn <douglas@socket.dev>
@@ -39,7 +39,7 @@ Requires-Dist: packaging
 Requires-Dist: prettytable
 Requires-Dist: python-dotenv
 Requires-Dist: requests
-Requires-Dist: socket-sdk-python>=2.0.20
+Requires-Dist: socket-sdk-python>=2.0.21
 Provides-Extra: dev
 Requires-Dist: hatch; extra == 'dev'
 Requires-Dist: pip-tools>=7.4.0; extra == 'dev'

{socketsecurity-2.0.38 → socketsecurity-2.0.42}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "socketsecurity"
-version = "2.0.38"
+version = "2.0.42"
 requires-python = ">= 3.10"
 license = {"file" = "LICENSE"}
 dependencies = [
@@ -16,7 +16,7 @@ dependencies = [
     'GitPython',
     'packaging',
     'python-dotenv',
-    'socket-sdk-python>=2.0.20'
+    'socket-sdk-python>=2.0.21'
 ]
 readme = "README.md"
 description = "Socket Security CLI for CI/CD"

{socketsecurity-2.0.38 → socketsecurity-2.0.42}/socketsecurity/__init__.py

@@ -1,3 +1,2 @@
 __author__ = 'socket.dev'
-__version__ = '2.0.38'
-
+__version__ = '2.0.42'

{socketsecurity-2.0.38 → socketsecurity-2.0.42}/socketsecurity/core/__init__.py

@@ -427,6 +427,8 @@ class Core:
             Exception: If API request fails
         """
         try:
+            # Need to switch to either standard logger or not call our module logging so that there isn't a conflict
+            # Also need to update the SDK to not emit log in a way that can't be trapped by try/except
             sdk_logger = logging_std.getLogger("socketdev")
             original_level = sdk_logger.level
             sdk_logger.setLevel(logging_std.CRITICAL)
@@ -799,7 +801,6 @@ class Core:
             alert = Alert(**alert_item)
             props = getattr(self.config.all_issues, alert.type, default_props)
             introduced_by = self.get_source_data(package, packages)
-
             issue_alert = Issue(
                 pkg_type=package.type,
                 pkg_name=package.name,

{socketsecurity-2.0.38 → socketsecurity-2.0.42}/socketsecurity/core/messages.py

@@ -3,6 +3,7 @@ import logging
 import re
 from pathlib import Path
 
+from docutils.nodes import title
 from mdutils import MdUtils
 from prettytable import PrettyTable
 
@@ -233,10 +234,21 @@ class Messages:
                 # Create a unique rule id and name by appending the manifest file.
                 unique_rule_id = f"{base_rule_id} ({mf})"
                 rule_name = f"Alert {base_rule_id} ({mf})"
-
-                short_desc = (f"{alert.props.get('note', '')}<br/><br/>Suggested Action:<br/>{alert.suggestion}"
+                props = {}
+                if hasattr(alert, 'props'):
+                    props = alert.props
+                suggestion = ''
+                if hasattr(alert, 'suggestion'):
+                    suggestion = alert.suggestion
+                alert_title = ''
+                if hasattr(alert, 'title'):
+                    alert_title = alert.title
+                description = ''
+                if hasattr(alert, 'description'):
+                    description = alert.description
+                short_desc = (f"{props.get('note', '')}<br/><br/>Suggested Action:<br/>{suggestion}"
                               f"<br/><a href=\"{socket_url}\">{socket_url}</a>")
-                full_desc = "{} - {}".format(alert.title, alert.description.replace('\r\n', '<br/>'))
+                full_desc = "{} - {}".format(alert_title, description.replace('\r\n', '<br/>'))
 
                 if unique_rule_id not in rules_map:
                     rules_map[unique_rule_id] = {