some cleanup, added an arg and .net globs

Author: flowstate

.gitignore

@@ -23,4 +23,5 @@ file_generator.py
 .coverage
 .env.local
 Pipfile
-test/
+test/
+logs

pyproject.toml

@@ -13,7 +13,7 @@ dependencies = [
     'GitPython',
     'packaging',
     'python-dotenv', 
-    'socket-sdk-python>=2.0.5'
+    'socket-sdk-python>=2.0.6'
 ]
 readme = "README.md"
 description = "Socket Security CLI for CI/CD"

socketsecurity/core/__init__.py

@@ -1,5 +1,6 @@
 import logging
 import time
+import sys
 from dataclasses import asdict
 from glob import glob
 from pathlib import PurePath
@@ -145,21 +146,24 @@ def find_files(path: str) -> List[str]:
             for file_name in patterns:
                 pattern = Core.to_case_insensitive_regex(patterns[file_name]["pattern"])
                 file_path = f"{path}/**/{pattern}"
-                log.debug(f"Globbing {file_path}")
+                #log.debug(f"Globbing {file_path}")
                 glob_start = time.time()
                 glob_files = glob(file_path, recursive=True)
                 for glob_file in glob_files:
                     if glob_file not in files:
                         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")
+                #log.debug(f"Glob for pattern {file_path} took {glob_total_time:.2f} seconds")
 
         log.debug("Finished Find Files")
         end_time = time.time()
         total_time = end_time - start_time
-        log.info(f"Found {len(files)} in {total_time:.2f} seconds")
-        log.debug(f"Files found: {list(files)}")
+        files_list = list(files)
+        if len(files_list) > 5:
+            log.debug(f"{len(files_list)} Files found ({total_time:.2f}s): {', '.join(files_list[:5])}, ...")
+        else:
+            log.debug(f"{len(files_list)} Files found ({total_time:.2f}s): {', '.join(files_list)}")
         return list(files)
 
     @staticmethod
@@ -449,7 +453,6 @@ def create_new_diff(
         files = self.find_files(path)
         files_for_sending = self.load_files_for_sending(files, path)
 
-        log.debug(f"files: {files} found at path {path}")
         if not files:
             return Diff(id="no_diff_id")
 
@@ -461,18 +464,27 @@ def create_new_diff(
             head_full_scan_id = None
             has_head_scan = False
 
-        # Create new scan
-        new_scan_start = time.time()
-        new_full_scan = self.create_full_scan(files_for_sending, params, has_head_scan)
-        new_scan_end = time.time()
-        log.info(f"Total time to create new full scan: {new_scan_end - new_scan_start:.2f}")
-
-        
-        # head_full_scan = None
-        # if head_full_scan_id:
-        #     head_full_scan = self.get_full_scan(head_full_scan_id)
+                # Create new scan
+        try:
+            new_scan_start = time.time()
+            new_full_scan = self.create_full_scan(files_for_sending, params, has_head_scan)
+            new_scan_end = time.time()
+            log.info(f"Total time to create new full scan: {new_scan_end - new_scan_start:.2f}")
+        except APIFailure as e:
+            log.error(f"API Error: {e}")
+            sys.exit(1)
+        except Exception as e:
+            log.error(f"Unexpected error while creating new scan: {e}")
+            sys.exit(1)
 
-        added_packages, removed_packages = self.get_added_and_removed_packages(head_full_scan_id, new_full_scan)
+        try:
+            added_packages, removed_packages = self.get_added_and_removed_packages(head_full_scan_id, new_full_scan)
+        except APIFailure as e:
+            log.error(f"API Error: {e}")
+            sys.exit(1)
+        except Exception as e:
+            log.error(f"Unexpected error while comparing packages: {e}")
+            sys.exit(1)
 
         diff = self.create_diff_report(added_packages, removed_packages)
 

socketsecurity/core/scm/github.py

@@ -54,7 +54,9 @@ def from_env(cls, pr_number: Optional[str] = None) -> 'GithubConfig':
             owner = repository.split('/')[0]
             repository = repository.split('/')[1]
 
-        is_default = os.getenv('DEFAULT_BRANCH', '').lower() == 'true'
+        default_branch_env = os.getenv('DEFAULT_BRANCH')
+        # Consider the variable truthy if it exists and isn't explicitly 'false'
+        is_default = default_branch_env is not None and default_branch_env.lower() != 'false'
         return cls(
             sha=os.getenv('GITHUB_SHA', ''),
             api_url=os.getenv('GITHUB_API_URL', ''),

socketsecurity/core/utils.py

@@ -81,5 +81,28 @@
         "pom.xml": {
             "pattern": "pom.xml"
         }
+    },
+    ".net": {
+        "proj": {
+            "pattern": "*.*proj"
+        },
+        "props": {
+            "pattern": "*.props"
+        },
+        "targets": {
+            "pattern": "*.targets"
+        },
+        "nuspec": {
+            "pattern": "*.nuspec"
+        },
+        "nugetConfig": {
+            "pattern": "nuget.config"
+        },
+        "packagesConfig": {
+            "pattern": "packages.config"
+        },
+        "packagesLock": {
+            "pattern": "packages.lock.json"
+        }
     }
 }