socketsecurity 0.0.82__tar.gz → 0.0.83__tar.gz

{socketsecurity-0.0.82/socketsecurity.egg-info → socketsecurity-0.0.83}/PKG-INFO

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

{socketsecurity-0.0.82 → socketsecurity-0.0.83}/socketsecurity/__init__.py

@@ -1,2 +1,2 @@
 __author__ = 'socket.dev'
-__version__ = '0.0.82'
+__version__ = '0.0.83'

{socketsecurity-0.0.82 → socketsecurity-0.0.83}/socketsecurity/core/__init__.py

@@ -22,6 +22,7 @@ from socketsecurity.core.classes import (
 )
 import platform
 from glob import glob
+import fnmatch
 import time
 
 __all__ = [
@@ -306,25 +307,15 @@ class Core:
         return sbom
 
     @staticmethod
-    def find_files(path: str) -> list:
+    def find_files(path: str, new_files: list = None) -> list:
         """
         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 new_files:
         :return:
         """
         socket_globs = {
-            "general": {
-                "readme": {
-                    "pattern": "*readme*"
-                },
-                "notice": {
-                    "pattern": "*notice*"
-                },
-                "license": {
-                    "pattern": "{licen{s,c}e{,-*},copying}"
-                }
-            },
             "npm": {
                 "package.json": {
                     "pattern": "package.json"
@@ -399,6 +390,12 @@ class Core:
                 file_path = f"{path}/**/{pattern}"
                 files = glob(file_path, recursive=True)
                 for file in files:
+                    if "/" in file:
+                        _, base_name = file.rsplit("/", 1)
+                    else:
+                        base_name = file
+                    if new_files is not None and base_name not in new_files:
+                        continue
                     if platform.system() == "Windows":
                         file = file.replace("\\", "/")
                     found_path, file_name = file.rsplit("/", 1)
@@ -478,7 +475,7 @@ class Core:
         return full_scan
 
     @staticmethod
-    def create_new_diff(path: str, params: FullScanParams, workspace: str) -> Diff:
+    def create_new_diff(path: str, params: FullScanParams, workspace: str, new_files: list = None) -> Diff:
         """
         1. Get the head full scan. If it isn't present because this repo doesn't exist yet return an Empty full scan.
         2. Create a new Full scan for the current run
@@ -487,9 +484,10 @@ class Core:
         :param path: Str - path of where to look for manifest files for the new Full Scan
         :param params: FullScanParams - Query params for the Full Scan endpoint
         :param workspace: str - Path for workspace
+        :param new_files:
         :return:
         """
-        files = Core.find_files(path)
+        files = Core.find_files(path, new_files)
         try:
             head_full_scan_id = Core.get_head_scan_for_repo(params.repo)
             if head_full_scan_id is None or head_full_scan_id == "":

socketsecurity-0.0.83/socketsecurity/core/git_interface.py

@@ -0,0 +1,25 @@
+from git import Repo
+
+
+class Git:
+    repo: Repo
+    path: str
+
+    def __init__(self, path: str):
+        self.path = path
+        self.repo = Repo(path)
+        assert self.repo
+        self.head = self.repo.head
+        self.reference = self.head.reference
+        self.commit = self.reference.commit
+        self.repo_name = self.repo.remotes.origin.url.split('.git')[0].split('/')[-1]
+        self.branch = self.repo.active_branch
+        self.author = self.commit.author
+        self.commit_sha = self.commit.binsha
+        self.commit_message = self.commit.message
+        self.committer = self.commit.committer
+        self.show_files = self.repo.git.show(self.commit, name_only=True, format="%n").splitlines()
+        self.changed_files = []
+        for item in self.show_files:
+            if item != "":
+                self.changed_files.append(item)

{socketsecurity-0.0.82 → socketsecurity-0.0.83}/socketsecurity/socketcli.py

@@ -4,6 +4,8 @@ from socketsecurity.core import Core, __version__
 from socketsecurity.core.classes import FullScanParams, Diff, Package
 from socketsecurity.core.messages import Messages
 from socketsecurity.core.scm_comments import Comments
+from socketsecurity.core.git_interface import Git
+from git import InvalidGitRepositoryError
 import os
 import sys
 import logging
@@ -27,7 +29,7 @@ parser.add_argument(
 )
 parser.add_argument(
     '--branch',
-    default='main',
+    default='',
     help='The name of the branch',
     required=False
 )
@@ -113,6 +115,12 @@ parser.add_argument(
     default=False
 )
 
+parser.add_argument(
+    '--files',
+    help='Specify a list of files in the format of ["file1", "file2"]',
+    default="[]"
+)
+
 
 def output_console_comments(diff_report) -> None:
     console_security_comment = Messages.create_console_security_alert_table(diff_report)
@@ -160,17 +168,41 @@ def main_code():
     sbom_file = arguments.sbom_file
     license_mode = arguments.generate_license
     enable_json = arguments.enable_json
-    license_file = f"{repo}"
-    if branch is not None:
-        license_file += f"_{branch}"
-    license_file += ".json"
+    files = arguments.files
     api_token = os.getenv("SOCKET_SECURITY_API_KEY") or arguments.api_token
+    try:
+        files = json.loads(files)
+    except Exception as error:
+        log.error(f"Unable to parse {files}")
+        log.error(error)
+        sys.exit(3)
     if api_token is None:
         log.info("Unable to find Socket API Token")
         sys.exit(3)
+    try:
+        git_repo = Git(target_path)
+        if repo is None:
+            repo = git_repo.repo_name
+        if commit_sha is None or commit_sha == '':
+            commit_sha = git_repo.commit
+        if branch is None or branch == '':
+            branch = git_repo.branch
+        if committer is None or committer == '':
+            committer = git_repo.committer
+        if commit_message is None or commit_message == '':
+            commit_message = git_repo.commit_message
+        if len(files) == 0:
+            files = git_repo.changed_files
+    except InvalidGitRepositoryError:
+        pass
+        # git_repo = None
     if repo is None:
         log.info("Repo name needs to be set")
         sys.exit(2)
+    license_file = f"{repo}"
+    if branch is not None:
+        license_file += f"_{branch}"
+    license_file += ".json"
     log.info(f"Starting Socket Security Scan version {__version__}")
     scm = None
     if scm_type == "github":
@@ -205,7 +237,7 @@ 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)
+        diff = core.create_new_diff(target_path, params, workspace=target_path, new_files=files)
         if scm.check_event_type() == "diff":
             comments = scm.get_comments_for_pr(repo, str(pr_number))
             diff.new_alerts = Comments.remove_alerts(comments, diff.new_alerts)
@@ -231,7 +263,7 @@ def main_code():
     else:
         log.info("API Mode")
         diff: Diff
-        diff = core.create_new_diff(target_path, params, workspace=target_path)
+        diff = core.create_new_diff(target_path, params, workspace=target_path, new_files=files)
         if enable_json:
             output_console_json(diff)
         else:

{socketsecurity-0.0.82 → socketsecurity-0.0.83/socketsecurity.egg-info}/PKG-INFO

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

{socketsecurity-0.0.82 → socketsecurity-0.0.83}/socketsecurity.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ socketsecurity.egg-info/top_level.txt
 socketsecurity/core/__init__.py
 socketsecurity/core/classes.py
 socketsecurity/core/exceptions.py
+socketsecurity/core/git_interface.py
 socketsecurity/core/github.py
 socketsecurity/core/gitlab.py
 socketsecurity/core/issues.py