socketsecurity 0.0.57__tar.gz → 0.0.59__tar.gz

{socketsecurity-0.0.57 → socketsecurity-0.0.59}/PKG-INFO

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

{socketsecurity-0.0.57 → socketsecurity-0.0.59}/pyproject.toml

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

socketsecurity-0.0.59/socketsecurity/__init__.py

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

{socketsecurity-0.0.57 → socketsecurity-0.0.59}/socketsecurity/core/__init__.py

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

{socketsecurity-0.0.57 → socketsecurity-0.0.59}/socketsecurity/core/glitlab.py

@@ -10,7 +10,7 @@ import sys
 global ci_commit_sha
 global ci_api_v4_url
 global ci_project_dir
-global ci_commit_branch
+global ci_merge_request_source_branch_name
 global ci_merge_request_iid
 global ci_merge_request_project_id
 global ci_commit_message
@@ -30,7 +30,7 @@ gitlab_variables = [
     "CI_COMMIT_SHA",
     "CI_API_V4_URL",
     "CI_PROJECT_DIR",
-    "CI_COMMIT_BRANCH",
+    "CI_MERGE_REQUEST_SOURCE_BRANCH_NAME",
     "CI_MERGE_REQUEST_IID",
     "CI_MERGE_REQUEST_PROJECT_ID",
     "CI_COMMIT_MESSAGE",
@@ -124,11 +124,11 @@ 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]
-        self.branch = ci_commit_branch
+        self.branch = ci_merge_request_source_branch_name
         self.default_branch = ci_default_branch
         if self.branch == self.default_branch:
             self.is_default_branch = True
@@ -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.57 → socketsecurity-0.0.59}/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.57 → socketsecurity-0.0.59}/socketsecurity/socketcli.py

@@ -56,13 +56,7 @@ parser.add_argument(
     help='Path to look for manifest files',
     required=False
 )
-parser.add_argument(
-    '--mode',
-    default='diff',
-    help='Integration mode choices are api, github, gitlab, and bitbucket',
-    choices=["diff", "new", "license"],
-    required=False
-)
+
 parser.add_argument(
     '--scm',
     default='api',
@@ -107,7 +101,6 @@ def cli():
     default_branch = False
     if default_branch_int == 1:
         default_branch = True
-    mode = arguments.mode
     pr_number = arguments.pr_number
     target_path = arguments.target_path
     scm_type = arguments.scm
@@ -131,6 +124,8 @@ def cli():
     elif scm_type == 'gitlab':
         from socketsecurity.core.glitlab import Gitlab
         scm = Gitlab()
+    if scm is not None:
+        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)
     set_as_pending_head = False

{socketsecurity-0.0.57 → socketsecurity-0.0.59}/socketsecurity.egg-info/PKG-INFO

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

socketsecurity-0.0.57/socketsecurity/__init__.py

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