socketsecurity 0.0.58__tar.gz → 0.0.60__tar.gz

{socketsecurity-0.0.58 → socketsecurity-0.0.60}/PKG-INFO

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

{socketsecurity-0.0.58 → socketsecurity-0.0.60}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "socketsecurity"
-version = "0.0.58"
+version = "0.0.60"
 requires-python = ">= 3.9"
 dependencies = [
     'requests',

socketsecurity-0.0.60/socketsecurity/__init__.py

@@ -0,0 +1,4 @@
+import socketsecurity.core
+
+__author__ = 'socket.dev'
+__version = socketsecurity.core.__version__

{socketsecurity-0.0.58 → socketsecurity-0.0.60}/socketsecurity/core/__init__.py

@@ -23,7 +23,7 @@ import time
 
 
 __author__ = 'socket.dev'
-__version__ = '0.0.58'
+__version__ = '0.0.60'
 __all__ = [
     "Core",
     "log",

{socketsecurity-0.0.58 → socketsecurity-0.0.60}/socketsecurity/core/glitlab.py

@@ -124,7 +124,7 @@ class Gitlab:
         self.api_url = ci_api_v4_url
         self.ref_type = ""
         self.event_name = ci_pipeline_source
-        self.workspace = project_dir
+        self.workspace = ci_project_dir
         self.repository = ci_project_name
         if "/" in self.repository:
             self.repository = self.repository.rsplit("/")[1]
@@ -146,7 +146,7 @@ class Gitlab:
 
     @staticmethod
     def check_event_type() -> str:
-        if ci_pipeline_source.lower() == "push":
+        if ci_pipeline_source.lower() == "push" or ci_pipeline_source.lower == 'merge_request_event':
             if ci_merge_request_iid is None or ci_merge_request_iid == "":
                 event_type = "main"
             else:

{socketsecurity-0.0.58 → socketsecurity-0.0.60}/socketsecurity/core/issues.py

@@ -55,6 +55,7 @@ __all__ = [
 	"missingDependency",
 	"missingLicense",
 	"mixedLicense",
+	"ambiguousClassifier",
 	"modifiedException",
 	"modifiedLicense",
 	"networkAccess",
@@ -382,7 +383,7 @@ class copyleftLicense:
 
 	def __init__(self):
 		self.description = "(Experimental) Copyleft license information was found"
-		self.props = {"comments": "Comments", "exceptionId": "Exception id", "licenseId": "License Identifier"}
+		self.props = {"comments": "Comments", "licenseId": "License Identifiers"}
 		self.suggestion = "Determine whether use of copyleft material works for you"
 		self.title = "Copyleft License"
 		self.emoji = "\u26a0\ufe0f"
@@ -402,7 +403,7 @@ class nonpermissiveLicense:
 
 	def __init__(self):
 		self.description = "(Experimental) A license not known to be considered permissive was found"
-		self.props = {"comments": "Comments", "exceptionId": "Exception id", "licenseId": "License Identifier"}
+		self.props = {"comments": "Comments", "licenseId": "License Identifier"}
 		self.suggestion = "Determine whether use of material not offered under a known permissive license works for you"
 		self.title = "Non-permissive License"
 		self.emoji = "\u26a0\ufe0f"
@@ -1106,7 +1107,7 @@ class mixedLicense:
 
 	def __init__(self):
 		self.description = "(Experimental) Package contains multiple licenses."
-		self.props = {"licenseId": "License Id"}
+		self.props = {"licenseId": "License Ids"}
 		self.suggestion = "A new version of the package should be published that includes a single license. Consumers may seek clarification from the package author. Ensure that the license details are consistent across the LICENSE file, package.json license field and license details mentioned in the README."
 		self.title = "Mixed license"
 		self.emoji = "\u26a0\ufe0f"
@@ -1116,6 +1117,26 @@ class mixedLicense:
 		return json.dumps(self.__dict__)
 
 
+class ambiguousClassifier:
+	props: dict
+	description: str
+	suggestion: str
+	title: str
+	emoji: str
+	nextStepTitle: str
+
+	def __init__(self):
+		self.props = {"classifier": "The classifier"}
+		self.description = "(Experimental) An ambiguous license classifier was found."
+		self.suggestion = "A specific license or licenses should be identified"
+		self.title = "Ambiguous License Classifier"
+		self.emoji = "\u26a0\ufe0f"
+		self.nextStepTitle = "What is an ambiguous license classifier?"
+
+	def __str__(self):
+		return json.dumps(self.__dict__)
+
+
 class modifiedException:
 	description: str
 	props: dict
@@ -1943,6 +1964,7 @@ class AllIssues:
 	missingDependency: missingDependency
 	missingLicense: missingLicense
 	mixedLicense: mixedLicense
+	ambiguousClassifier: ambiguousClassifier
 	modifiedException: modifiedException
 	modifiedLicense: modifiedLicense
 	networkAccess: networkAccess
@@ -1983,7 +2005,6 @@ class AllIssues:
 	zeroWidth: zeroWidth
 	floatingDependency: floatingDependency
 	unpopularPackage: unpopularPackage
-
 	def __init__(self):
 		self.badEncoding = badEncoding()
 		self.badSemver = badSemver()
@@ -2037,6 +2058,7 @@ class AllIssues:
 		self.missingDependency = missingDependency()
 		self.missingLicense = missingLicense()
 		self.mixedLicense = mixedLicense()
+		self.ambiguousClassifier = ambiguousClassifier()
 		self.modifiedException = modifiedException()
 		self.modifiedLicense = modifiedLicense()
 		self.networkAccess = networkAccess()

{socketsecurity-0.0.58 → socketsecurity-0.0.60}/socketsecurity/socketcli.py

@@ -5,7 +5,10 @@ from socketsecurity.core.classes import FullScanParams, Diff, Package
 from socketsecurity.core.messages import Messages
 import os
 import sys
+import logging
 
+logging.basicConfig(level=logging.INFO)
+log = logging.getLogger("socketcli")
 
 parser = argparse.ArgumentParser(
     prog="socketcli",
@@ -80,19 +83,28 @@ parser.add_argument(
     help='Display the version',
 )
 
+parser.add_argument(
+    '--enable-debug',
+    help='Enable debug mode',
+    action='store_true',
+    default=False
+)
 
 def output_console_comments(diff_report) -> None:
     console_security_comment = Messages.create_console_security_alert_table(diff_report)
     if len(diff_report.new_alerts) > 0:
-        print("Security issues detected by Socket Security")
-        print(console_security_comment)
+        log.info("Security issues detected by Socket Security")
+        log.info(console_security_comment)
         sys.exit(1)
     else:
-        print("No New Security issues detected by Socket Security")
+        log.info("No New Security issues detected by Socket Security")
 
 
 def cli():
     arguments = parser.parse_args()
+    debug = arguments.enable_debug
+    if debug:
+        logging.basicConfig(level=logging.DEBUG)
     repo = arguments.repo
     branch = arguments.branch
     commit_message = arguments.commit_message
@@ -111,12 +123,12 @@ def cli():
     license_file += ".json"
     api_token = os.getenv("SOCKET_SECURITY_API_KEY") or arguments.api_token
     if api_token is None:
-        print("Unable to find Socket API Token")
+        log.info("Unable to find Socket API Token")
         sys.exit(3)
     if repo is None:
-        print("Repo name needs to be set")
+        log.info("Repo name needs to be set")
         sys.exit(2)
-    print(f"Starting Socket Security Scan version {__version__}")
+    log.info(f"Starting Socket Security Scan version {__version__}")
     scm = None
     if scm_type == "github":
         from socketsecurity.core.github import Github
@@ -143,11 +155,11 @@ def cli():
     )
     diff = None
     if scm is not None and scm.check_event_type() == "comment":
-        print("Comment initiated flow")
+        log.info("Comment initiated flow")
         comments = scm.get_comments_for_pr(scm.repository, str(scm.pr_number))
         scm.remove_comment_alerts(comments)
     elif scm is not None and scm.check_event_type() != "comment":
-        print("Push initiated flow")
+        log.info("Push initiated flow")
         diff: Diff
         diff = core.create_new_diff(target_path, params, workspace=target_path)
         if scm.check_event_type() == "diff":
@@ -158,7 +170,7 @@ def cli():
             scm.add_socket_comments(security_comment, overview_comment, comments)
         output_console_comments(diff)
     else:
-        print("API Mode")
+        log.info("API Mode")
         diff: Diff
         diff = core.create_new_diff(target_path, params, workspace=target_path)
         output_console_comments(diff)

{socketsecurity-0.0.58 → socketsecurity-0.0.60}/socketsecurity.egg-info/PKG-INFO

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

socketsecurity-0.0.58/socketsecurity/__init__.py

@@ -1,2 +0,0 @@
-__author__ = 'socket.dev'
-__version__ = '0.0.58'