socketsecurity 0.0.76__tar.gz → 0.0.78__tar.gz

{socketsecurity-0.0.76/socketsecurity.egg-info → socketsecurity-0.0.78}/PKG-INFO

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

{socketsecurity-0.0.76 → socketsecurity-0.0.78}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "socketsecurity"
-version = "0.0.76"
+dynamic = ["version"]
 requires-python = ">= 3.9"
 dependencies = [
     'requests',
@@ -40,4 +40,7 @@ Homepage = "https://socket.dev"
 include = [
     "socketsecurity",
     "socketsecurity.core"
-]
+]
+
+[tool.setuptools.dynamic]
+version = {attr = "socketsecurity.__version__"}

socketsecurity-0.0.78/socketsecurity/__init__.py

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

{socketsecurity-0.0.76 → socketsecurity-0.0.78}/socketsecurity/core/__init__.py

@@ -6,6 +6,7 @@ import json
 from socketsecurity.core.exceptions import (
     APIFailure, APIKeyMissing, APIAccessDenied, APIInsufficientQuota, APIResourceNotFound, APICloudflareError
 )
+from socketsecurity import __version__
 from socketsecurity.core.licenses import Licenses
 from socketsecurity.core.issues import AllIssues
 from socketsecurity.core.classes import (
@@ -23,9 +24,6 @@ import platform
 from glob import glob
 import time
 
-
-__author__ = 'socket.dev'
-__version__ = '0.0.76'
 __all__ = [
     "Core",
     "log",
@@ -93,6 +91,18 @@ def do_request(
         files=files,
         timeout=timeout
     )
+    output_headers = headers
+    output_headers['Authorization'] = "Basic API_KEY_REDACTED"
+    output = {
+        "url": url,
+        "headers": output_headers,
+        "status_code": response.status_code,
+        "body": response.text,
+        "payload": payload,
+        "files": files,
+        "timeout": timeout
+    }
+    log.debug(output)
     if response.status_code <= 399:
         return response
     elif response.status_code == 400:
@@ -672,7 +682,9 @@ class Core:
                 title=title,
                 suggestion=suggestion,
                 next_step_title=next_step_title,
-                introduced_by=introduced_by
+                introduced_by=introduced_by,
+                purl=package.purl,
+                url=package.url
             )
             if issue_alert.key not in alerts:
                 alerts[issue_alert.key] = [issue_alert]
@@ -732,7 +744,9 @@ class Core:
             introduced_by=introduced_by,
             author=package.author or [],
             size=package.size,
-            transitives=package.transitives
+            transitives=package.transitives,
+            url=package.url,
+            purl=package.purl
         )
         return purl, package
 

{socketsecurity-0.0.76 → socketsecurity-0.0.78}/socketsecurity/core/classes.py

@@ -86,6 +86,7 @@ class Package:
     transitives: int
     license: str
     license_text: str
+    purl: str
 
     def __init__(self, **kwargs):
         if kwargs:
@@ -122,6 +123,8 @@ class Package:
             self.license = "NoLicenseFound"
         if not hasattr(self, "license_text"):
             self.license_text = ""
+        self.url = f"https://socket.dev/{self.type}/package/{self.name}/overview/{self.version}"
+        self.purl = f"{self.type}/{self.name}@{self.version}"
 
     def __str__(self):
         return json.dumps(self.__dict__)
@@ -159,8 +162,6 @@ class Issue:
             self.introduced_by = []
         if not hasattr(self, "manifests"):
             self.manifests = ""
-        self.url = f"https://socket.dev/{self.pkg_type}/{self.pkg_name}/overview/{self.pkg_version}"
-        self.purl = f"{self.pkg_type}/{self.pkg_name}@{self.pkg_version}"
 
     def __str__(self):
         return json.dumps(self.__dict__)
@@ -324,12 +325,15 @@ class Purl:
     version: str
     ecosystem: str
     direct: bool
-    author: str
+    author: list
     size: int
     transitives: int
     introduced_by: list
     capabilities: dict
     is_new: bool
+    author_url: str
+    url: str
+    purl: str
 
     def __init__(self, **kwargs):
         if kwargs:
@@ -341,6 +345,22 @@ class Purl:
             self.capabilities = {}
         if not hasattr(self, "is_new"):
             self.is_new = False
+        self.author_url = Purl.generate_author_data(self.author, self.ecosystem)
+
+    @staticmethod
+    def generate_author_data(authors: list, ecosystem: str) -> str:
+        """
+        Creates the Author links for the package
+        :param authors:
+        :param ecosystem:
+        :return:
+        """
+        authors_str = ""
+        for author in authors:
+            author_url = f"https://socket.dev/{ecosystem}/user/{author}"
+            authors += f"[{author}]({author_url}),"
+        authors_str = authors_str.rstrip(",")
+        return authors_str
 
     def __str__(self):
         return json.dumps(self.__dict__)

{socketsecurity-0.0.76 → socketsecurity-0.0.78}/socketsecurity/core/github.py

@@ -280,15 +280,23 @@ class Github:
                     ignore_all = True
                 else:
                     command = command.lstrip("ignore").strip()
-                    name, version = command.split("@")
-                    data = f"{name}, {version}"
+                    name, version = command.rsplit("@", 1)
+                    ecosystem, name = name.split("/", 1)
+                    data = (ecosystem, name, version)
                     ignore_commands.append(data)
         return ignore_all, ignore_commands
 
     @staticmethod
-    def is_ignore(pkg_name: str, pkg_version: str, name: str, version: str) -> bool:
+    def is_ignore(
+            pkg_ecosystem: str,
+            pkg_name: str,
+            pkg_version: str,
+            ecosystem: str,
+            name: str,
+            version: str
+    ) -> bool:
         result = False
-        if pkg_name == name and (pkg_version == version or version == "*"):
+        if pkg_ecosystem == ecosystem and pkg_name == name and (pkg_version == version or version == "*"):
             result = True
         return result
 
@@ -317,13 +325,13 @@ class Github:
             if "start-socket-alerts-table" in line:
                 start = True
             elif start and "end-socket-alerts-table" not in line and not Github.is_heading_line(line) and line != '':
-                title, package, introduced_by, manifest = line.lstrip("|").rstrip("|").split("|")
+                title, package, introduced_by, manifest = line.strip("|").split("|")
                 details, _ = package.split("](")
-                ecosystem, details = details.split("/", 1)
+                pkg_ecosystem, details = details.strip("[").split("/", 1)
                 pkg_name, pkg_version = details.split("@")
                 ignore = False
-                for name, version in ignore_commands:
-                    if ignore_all or Github.is_ignore(pkg_name, pkg_version, name, version):
+                for ecosystem, name, version in ignore_commands:
+                    if ignore_all or Github.is_ignore(pkg_ecosystem, pkg_name, pkg_version, ecosystem, name, version):
                         ignore = True
                 if not ignore:
                     lines.append(line)

{socketsecurity-0.0.76 → socketsecurity-0.0.78}/socketsecurity/core/messages.py

@@ -146,9 +146,10 @@ class Messages:
             if ignore not in ignore_commands:
                 ignore_commands.append(ignore)
             manifest_str, sources = Messages.create_sources(alert, "console")
+            purl_url = f"[{alert.purl}]({alert.url})"
             row = [
                 alert.title,
-                alert.url,
+                purl_url,
                 ", ".join(sources),
                 manifest_str
             ]
@@ -219,17 +220,16 @@ class Messages:
             added: Purl
             package_url = Messages.create_purl_link(added)
             capabilities = ", ".join(added.capabilities)
-            if capabilities is not None and capabilities != "":
-                row = [
-                    package_url,
-                    added.direct,
-                    capabilities,
-                    added.transitives,
-                    f"{added.size} KB",
-                    Messages.generate_author_data(added)
-                ]
-                overview_table.extend(row)
-                count += 1
+            row = [
+                package_url,
+                added.direct,
+                capabilities,
+                added.transitives,
+                f"{added.size} KB",
+                added.author_url
+            ]
+            overview_table.extend(row)
+            count += 1
         num_of_overview_rows = count + 1
         md.new_table(
             columns=num_of_overview_columns,
@@ -239,20 +239,6 @@ class Messages:
         )
         return md
 
-    @staticmethod
-    def generate_author_data(package: Purl):
-        """
-        Creates the Author links for the Dependency Overview Template
-        :param package:
-        :return:
-        """
-        authors = ""
-        for author in package.author:
-            author_url = f"https://socket.dev/{package.ecosystem}/user/{author}"
-            authors += f"[{author}]({author_url}),"
-        authors = authors.rstrip(",")
-        return authors
-
     @staticmethod
     def create_purl_link(details: Purl) -> str:
         """
@@ -260,8 +246,7 @@ class Messages:
         :param details: Purl - Details about the package needed to create the URLs
         :return:
         """
-        purl = f"{details.ecosystem}/{details.name}@{details.version}"
-        package_url = f"[{purl}](https://socket.dev/{details.ecosystem}/{details.name}/overview/{details.version})"
+        package_url = f"[{details.purl}]({details.url})"
         return package_url
 
     @staticmethod

{socketsecurity-0.0.76 → socketsecurity-0.0.78/socketsecurity.egg-info}/PKG-INFO

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

socketsecurity-0.0.76/socketsecurity/__init__.py

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