socketsecurity 1.0.13__tar.gz → 1.0.14__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: socketsecurity
-Version: 1.0.13
+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.13 → socketsecurity-1.0.14}/socketsecurity/__init__.py

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

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

@@ -46,8 +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_format = "%(asctime)s %(funcName)20s()  %(message)s"
+# logging.basicConfig(format=log_format)
 log.addHandler(logging.NullHandler())
 
 socket_globs = {
@@ -398,7 +398,7 @@ 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()
@@ -412,12 +412,17 @@ class Core:
 
                 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"Checking {file} for match")
+                    # log.debug(f"Getting file and path for {file_path}")
                     if platform.system() == "Windows":
                         file = file.replace("\\", "/")
                     if path not in file:
@@ -425,11 +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")
+        log.info(f"Found {len(all_files)} in {total_time:.2f} seconds")
+        all_files = list(all_files)
         return all_files
 
     @staticmethod

{socketsecurity-1.0.13 → 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,6 @@ def main_code():
     arguments = parser.parse_args()
     debug = arguments.enable_debug
     if debug:
-        log_format = "%(asctime)s %(funcName)20s()  %(message)s"
         logging.basicConfig(level=logging.DEBUG, format=log_format)
         log.setLevel(logging.DEBUG)
         Core.enable_debug_log(logging.DEBUG)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: socketsecurity
-Version: 1.0.13
+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>