socketsecurity 1.0.12__tar.gz → 1.0.14__tar.gz

{socketsecurity-1.0.12/socketsecurity.egg-info → socketsecurity-1.0.14}/PKG-INFO

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

{socketsecurity-1.0.12 → socketsecurity-1.0.14}/socketsecurity/__init__.py

@@ -1,2 +1,2 @@
 __author__ = 'socket.dev'
-__version__ = '1.0.12'
+__version__ = '1.0.14'

{socketsecurity-1.0.12 → socketsecurity-1.0.14}/socketsecurity/core/__init__.py

@@ -1,6 +1,6 @@
 import logging
 from pathlib import PurePath
-from packaging.version import Version
+
 import requests
 from urllib.parse import urlencode
 import base64
@@ -46,6 +46,8 @@ org_slug = None
 all_new_alerts = False
 security_policy = {}
 log = logging.getLogger("socketdev")
+# log_format = "%(asctime)s %(funcName)20s()  %(message)s"
+# logging.basicConfig(format=log_format)
 log.addHandler(logging.NullHandler())
 
 socket_globs = {
@@ -396,8 +398,10 @@ class Core:
         :param files: override finding the manifest files using the glob matcher
         :return:
         """
-        all_files = []
+        all_files = set()
         files_provided = False
+        log.debug("Starting Find Files")
+        start_time = time.time()
         if files is not None and len(files) > 0:
             files_provided = True
         for ecosystem in socket_globs:
@@ -405,11 +409,20 @@ class Core:
             for file_name in patterns:
                 pattern = patterns[file_name]["pattern"]
                 file_path = f"{path}/**/{pattern}"
+
                 if not files_provided:
+                    log.debug(f"Globbing {file_path}")
+                    glob_start = time.time()
                     files = glob(file_path, recursive=True)
+                    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")
                 else:
+                    log.debug("Files found from commit")
                     files = Core.match_supported_files(path, files)
+                name_fix_start = time.time()
                 for file in files:
+                    # log.debug(f"Getting file and path for {file_path}")
                     if platform.system() == "Windows":
                         file = file.replace("\\", "/")
                     if path not in file:
@@ -417,7 +430,15 @@ class Core:
                     found_path, file_name = file.rsplit("/", 1)
                     details = (found_path, file_name)
                     if details not in all_files:
-                        all_files.append(details)
+                        all_files.add(details)
+                name_fix_end = time.time()
+                total_name_fix = name_fix_end - name_fix_start
+                log.debug(f"Total Time for name fix for {file_path} was {total_name_fix:.6f}")
+        log.debug("Finished Find Files")
+        end_time = time.time()
+        total_time = end_time - start_time
+        log.info(f"Found {len(all_files)} in {total_time:.2f} seconds")
+        all_files = list(all_files)
         return all_files
 
     @staticmethod
@@ -512,9 +533,7 @@ class Core:
         :return:
         """
         if no_change:
-            diff = Diff()
-            diff.id = "no_diff_ran"
-            return diff
+            return Diff()
         files = Core.find_files(path, new_files)
         if files is None or len(files) == 0:
             return Diff()
@@ -557,25 +576,20 @@ class Core:
         new_scan_alerts = {}
         head_scan_alerts = {}
         consolidated = []
-        previous_versions = []
-        previous_capabilities = {}
         for package_id in new_packages:
             purl, package = Core.create_purl(package_id, new_packages)
-            base_name = f"{purl.ecosystem}/{purl.name}"
-            base_purl = f"{base_name}@{purl.version}"
+            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)
-                previous_versions.append(base_name)
             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)
-            base_name = f"{purl.ecosystem}/{purl.name}"
-            if package_id not in new_packages and package.direct and base_name not in previous_versions:
+            if package_id not in new_packages and package.direct:
                 diff.removed_packages.append(purl)
             head_scan_alerts = Core.create_issue_alerts(package, head_scan_alerts, head_packages)
         diff.new_alerts = Core.compare_issue_alerts(new_scan_alerts, head_scan_alerts, diff.new_alerts)
-        diff.new_capabilities = Core.check_alert_capabilities(new_packages, head_packages)
+        diff.new_capabilities = Core.compare_capabilities(new_packages, head_packages)
         diff = Core.add_capabilities_to_purl(diff)
         return diff
 
@@ -595,50 +609,48 @@ class Core:
         return diff
 
     @staticmethod
-    def check_alert_capabilities(
-            new_packages: dict,
-            old_packages: dict
-    ) -> dict:
+    def compare_capabilities(new_packages: dict, head_packages: dict) -> dict:
         capabilities = {}
-        capabilities_details = {}
-        capabilities_details = Core.compare_version_capabilities(old_packages, capabilities_details)
-        capabilities_details = Core.compare_version_capabilities(new_packages, capabilities_details)
-        for base_name in capabilities_details:
-            data = capabilities_details[base_name]
-            package_id = data["package_id"]
-            package_capabilities = data["capabilities"]
-            if len(package_capabilities) > 0:
-                capabilities[package_id] = package_capabilities
+        for package_id in new_packages:
+            package: Package
+            head_package: Package
+            package = new_packages[package_id]
+            if package_id in head_packages:
+                head_package = head_packages[package_id]
+                for alert in package.alerts:
+                    if alert not in head_package.alerts:
+                        capabilities = Core.check_alert_capabilities(package, capabilities, package_id, head_package)
+            else:
+                capabilities = Core.check_alert_capabilities(package, capabilities, package_id)
+
         return capabilities
 
     @staticmethod
-    def compare_version_capabilities(packages: dict, capabilities_details: dict) -> dict:
+    def check_alert_capabilities(
+            package: Package,
+            capabilities: dict,
+            package_id: str,
+            head_package: Package = None
+    ) -> dict:
         alert_types = {
             "envVars": "Environment",
             "networkAccess": "Network",
             "filesystemAccess": "File System",
             "shellAccess": "Shell"
         }
-        for package_id in packages:
-            package: Package
-            package = packages[package_id]
-            base_name = f"{package.type}/{package.name}"
-            if base_name not in capabilities_details:
-                capabilities_details[base_name] = {
-                    "last_version": package.version,
-                    "package_id": package.id,
-                    "capabilities": []
-                }
-            new_version = Version(package.version)
-            last_version = Version(capabilities_details[base_name]["last_version"])
-            previous_capabilities = capabilities_details[base_name]["capabilities"]
-            if new_version > last_version:
-                capabilities_details[base_name]["last_version"] = package.version
-                for alert in package.alerts:
-                    value = alert_types[alert["type"]]
-                    if value not in previous_capabilities or len(previous_capabilities) == 0:
-                        capabilities_details[base_name]["capabilities"].append(value)
-            return capabilities_details
+
+        for alert in package.alerts:
+            new_alert = True
+            if head_package is not None and alert in head_package.alerts:
+                new_alert = False
+            if alert["type"] in alert_types and new_alert:
+                value = alert_types[alert["type"]]
+                if package_id not in capabilities:
+                    capabilities[package_id] = [value]
+                else:
+                    if value not in capabilities[package_id]:
+                        capabilities[package_id].append(value)
+        return capabilities
 
     @staticmethod
     def compare_issue_alerts(new_scan_alerts: dict, head_scan_alerts: dict, alerts: list) -> list:

{socketsecurity-1.0.12 → socketsecurity-1.0.14}/socketsecurity/socketcli.py

@@ -1,5 +1,7 @@
 import argparse
 import json
+
+import socketsecurity.core
 from socketsecurity.core import Core, __version__
 from socketsecurity.core.classes import FullScanParams, Diff, Package, Issue
 from socketsecurity.core.messages import Messages
@@ -10,7 +12,9 @@ import os
 import sys
 import logging
 
-logging.basicConfig(level=logging.INFO)
+log_format = "%(asctime)s: %(message)s"
+logging.basicConfig(level=logging.INFO, format=log_format)
+socketsecurity.core.log.setLevel(level=logging.INFO)
 log = logging.getLogger("socketcli")
 blocking_disabled = False
 
@@ -211,7 +215,7 @@ def main_code():
     arguments = parser.parse_args()
     debug = arguments.enable_debug
     if debug:
-        logging.basicConfig(level=logging.DEBUG)
+        logging.basicConfig(level=logging.DEBUG, format=log_format)
         log.setLevel(logging.DEBUG)
         Core.enable_debug_log(logging.DEBUG)
         log.debug("Debug logging enabled")
@@ -287,7 +291,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=6000, base_api_url=base_api_url)
+    core = Core(token=api_token, request_timeout=1200, base_api_url=base_api_url)
     no_change = True
     if ignore_commit_files:
         no_change = False

{socketsecurity-1.0.12 → socketsecurity-1.0.14/socketsecurity.egg-info}/PKG-INFO

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