socketsecurity 1.0.24__tar.gz → 1.0.26__tar.gz

{socketsecurity-1.0.24/socketsecurity.egg-info → socketsecurity-1.0.26}/PKG-INFO

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

{socketsecurity-1.0.24 → socketsecurity-1.0.26}/socketsecurity/__init__.py

@@ -1,2 +1,2 @@
 __author__ = 'socket.dev'
-__version__ = '1.0.24'
+__version__ = '1.0.26'

{socketsecurity-1.0.24 → socketsecurity-1.0.26}/socketsecurity/core/__init__.py

@@ -163,9 +163,9 @@ def do_request(
             'User-Agent': f'SocketPythonCLI/{__version__}',
             "accept": "application/json"
         }
-    verify = False
+    verify = True
     if allow_unverified_ssl:
-        verify = True
+        verify = False
     response = requests.request(
         method.upper(),
         url,
@@ -410,12 +410,11 @@ class Core:
         Globs the path for supported manifest files.
         Note: Might move the source to a JSON file
         :param path: Str - path to where the manifest files are located
-        :param files: override finding the manifest files using the glob matcher
         :return:
         """
         log.debug("Starting Find Files")
         start_time = time.time()
-        files = []
+        files = set()
         for ecosystem in socket_globs:
             patterns = socket_globs[ecosystem]
             for file_name in patterns:
@@ -427,7 +426,7 @@ class Core:
                 glob_files = glob(file_path, recursive=True)
                 for glob_file in glob_files:
                     if glob_file not in files:
-                        files.append(glob_file)
+                        files.add(glob_file)
                 glob_end = time.time()
                 glob_total_time = glob_end - glob_start
                 log.debug(f"Glob for pattern {file_path} took {glob_total_time:.2f} seconds")
@@ -436,7 +435,7 @@ class Core:
         end_time = time.time()
         total_time = end_time - start_time
         log.info(f"Found {len(files)} in {total_time:.2f} seconds")
-        return files
+        return list(files)
 
     @staticmethod
     def create_full_scan(files: list, params: FullScanParams, workspace: str) -> FullScan:
@@ -594,13 +593,13 @@ class Core:
         head_packages = Core.create_sbom_dict(head_scan)
         new_scan_alerts = {}
         head_scan_alerts = {}
-        consolidated = []
+        consolidated = set()
         for package_id in new_packages:
             purl, package = Core.create_purl(package_id, new_packages)
             base_purl = f"{purl.ecosystem}/{purl.name}@{purl.version}"
             if package_id not in head_packages and package.direct and base_purl not in consolidated:
                 diff.new_packages.append(purl)
-                consolidated.append(base_purl)
+                consolidated.add(base_purl)
             new_scan_alerts = Core.create_issue_alerts(package, new_scan_alerts, new_packages)
         for package_id in head_packages:
             purl, package = Core.create_purl(package_id, head_packages)

{socketsecurity-1.0.24 → socketsecurity-1.0.26}/socketsecurity/socketcli.py

@@ -163,25 +163,27 @@ parser.add_argument(
 
 
 def output_console_comments(diff_report: Diff, sbom_file_name: str = None) -> None:
-    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):
-        log.info("Security issues detected by Socket Security")
-        msg = f"\n{console_security_comment}"
-        log.info(msg)
-        if not blocking_disabled:
-            sys.exit(1)
-    else:
-        log.info("No New Security issues detected by Socket Security")
+    if diff_report.id != "NO_DIFF_RAN":
+        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):
+            log.info("Security issues detected by Socket Security")
+            msg = f"\n{console_security_comment}"
+            log.info(msg)
+            if not blocking_disabled:
+                sys.exit(1)
+        else:
+            log.info("No New Security issues detected by Socket Security")
 
 
 def output_console_json(diff_report: Diff, sbom_file_name: str = None) -> None:
-    console_security_comment = Messages.create_security_comment_json(diff_report)
-    save_sbom_file(diff_report, sbom_file_name)
-    print(json.dumps(console_security_comment))
-    if not report_pass(diff_report) and not blocking_disabled:
-        sys.exit(1)
+    if diff_report.id != "NO_DIFF_RAN":
+        console_security_comment = Messages.create_security_comment_json(diff_report)
+        save_sbom_file(diff_report, sbom_file_name)
+        print(json.dumps(console_security_comment))
+        if not report_pass(diff_report) and not blocking_disabled:
+            sys.exit(1)
 
 
 def report_pass(diff_report: Diff) -> bool:
@@ -299,7 +301,7 @@ def main_code():
         default_branch = scm.is_default_branch
 
     base_api_url = os.getenv("BASE_API_URL") or None
-    core = Core(token=api_token, request_timeout=1200, base_api_url=base_api_url)
+    core = Core(token=api_token, request_timeout=1200, base_api_url=base_api_url, allow_unverified=allow_unverified)
     no_change = True
     if ignore_commit_files:
         no_change = False
@@ -319,7 +321,8 @@ def main_code():
         make_default_branch=default_branch,
         set_as_pending_head=set_as_pending_head
     )
-    diff = None
+    diff = Diff()
+    diff.id = "NO_DIFF_RAN"
     if scm is not None and scm.check_event_type() == "comment":
         log.info("Comment initiated flow")
         log.debug(f"Getting comments for Repo {scm.repository} for PR {scm.pr_number}")
@@ -329,10 +332,11 @@ def main_code():
     elif scm is not None and scm.check_event_type() != "comment":
         log.info("Push initiated flow")
         diff: Diff
-        diff = core.create_new_diff(target_path, params, workspace=target_path, no_change=no_change)
         if no_change:
-            log.info("No dependency changes")
+            log.info("No manifest files changes, skipping scan")
+            # log.info("No dependency changes")
         elif scm.check_event_type() == "diff":
+            diff = core.create_new_diff(target_path, params, workspace=target_path, no_change=no_change)
             log.info("Starting comment logic for PR/MR event")
             log.debug(f"Getting comments for Repo {scm.repository} for PR {scm.pr_number}")
             comments = scm.get_comments_for_pr(repo, str(pr_number))

{socketsecurity-1.0.24 → socketsecurity-1.0.26/socketsecurity.egg-info}/PKG-INFO

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