socketsecurity 1.0.29__tar.gz → 1.0.31__tar.gz

{socketsecurity-1.0.29/socketsecurity.egg-info → socketsecurity-1.0.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: socketsecurity
-Version: 1.0.29
+Version: 1.0.31
 Summary: Socket Security CLI for CI/CD
 Author-email: Douglas Coburn <douglas@socket.dev>
 Maintainer-email: Douglas Coburn <douglas@socket.dev>

{socketsecurity-1.0.29 → socketsecurity-1.0.31}/socketsecurity/__init__.py

@@ -1,2 +1,2 @@
 __author__ = 'socket.dev'
-__version__ = '1.0.29'
+__version__ = '1.0.31'

{socketsecurity-1.0.29 → socketsecurity-1.0.31}/socketsecurity/core/__init__.py

@@ -749,10 +749,11 @@ class Core:
             if alert.type in security_policy:
                 action = security_policy[alert.type]['action']
                 setattr(issue_alert, action, True)
-            if issue_alert.key not in alerts:
-                alerts[issue_alert.key] = [issue_alert]
-            else:
-                alerts[issue_alert.key].append(issue_alert)
+            if issue_alert.type != 'licenseSpdxDisj':
+                if issue_alert.key not in alerts:
+                    alerts[issue_alert.key] = [issue_alert]
+                else:
+                    alerts[issue_alert.key].append(issue_alert)
         return alerts
 
     @staticmethod

{socketsecurity-1.0.29 → socketsecurity-1.0.31}/socketsecurity/core/classes.py

@@ -161,10 +161,15 @@ class Issue:
 
         if hasattr(self, "created_at"):
             self.created_at = self.created_at.strip(" (Coordinated Universal Time)")
-        if not hasattr(self, "introduced_by"):
-            self.introduced_by = []
         if not hasattr(self, "manifests"):
             self.manifests = ""
+        if not hasattr(self, "introduced_by"):
+            self.introduced_by = []
+        else:
+            for item in self.introduced_by:
+                pkg, manifest = item
+                self.manifests += f"{manifest};"
+            self.manifests = self.manifests.rstrip(";")
         if not hasattr(self, "error"):
             self.error = False
         if not hasattr(self, "warn"):

{socketsecurity-1.0.29 → socketsecurity-1.0.31}/socketsecurity/socketcli.py

@@ -167,12 +167,16 @@ def output_console_comments(diff_report: Diff, sbom_file_name: str = None) -> No
         console_security_comment = Messages.create_console_security_alert_table(diff_report)
         save_sbom_file(diff_report, sbom_file_name)
         log.info(f"Socket Full Scan ID: {diff_report.id}")
-        if not report_pass(diff_report):
+        if len(diff_report.new_alerts) > 0:
             log.info("Security issues detected by Socket Security")
             msg = f"\n{console_security_comment}"
             log.info(msg)
-            if not blocking_disabled:
+            if not report_pass(diff_report) and not blocking_disabled:
                 sys.exit(1)
+            else:
+                # Means only warning alerts with no blocked
+                if not blocking_disabled:
+                    sys.exit(5)
         else:
             log.info("No New Security issues detected by Socket Security")
 
@@ -184,6 +188,9 @@ def output_console_json(diff_report: Diff, sbom_file_name: str = None) -> None:
         print(json.dumps(console_security_comment))
         if not report_pass(diff_report) and not blocking_disabled:
             sys.exit(1)
+        elif len(diff_report.new_alerts) > 0 and not blocking_disabled:
+            # Means only warning alerts with no blocked
+            sys.exit(5)
 
 
 def report_pass(diff_report: Diff) -> bool:
@@ -306,6 +313,7 @@ def main_code():
     if ignore_commit_files:
         no_change = False
     elif is_repo and files is not None and len(files) > 0:
+        log.info(files)
         no_change = core.match_supported_files(files)
 
     set_as_pending_head = False
@@ -379,7 +387,8 @@ def main_code():
                 new_overview_comment
             )
         else:
-            log.info("Not a PR/MR event no comment needed")
+            log.info("Starting non-PR/MR flow")
+            diff = core.create_new_diff(target_path, params, workspace=target_path, no_change=no_change)
         if enable_json:
             log.debug("Outputting JSON Results")
             output_console_json(diff, sbom_file)

{socketsecurity-1.0.29 → socketsecurity-1.0.31/socketsecurity.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: socketsecurity
-Version: 1.0.29
+Version: 1.0.31
 Summary: Socket Security CLI for CI/CD
 Author-email: Douglas Coburn <douglas@socket.dev>
 Maintainer-email: Douglas Coburn <douglas@socket.dev>