socketsecurity 2.2.23__tar.gz → 2.2.27__tar.gz

socketsecurity-2.2.27/Dockerfile

@@ -0,0 +1,41 @@
+FROM python:3-alpine
+LABEL org.opencontainers.image.authors="socket.dev"
+ARG CLI_VERSION
+ARG SDK_VERSION
+ARG PIP_INDEX_URL=https://pypi.org/simple
+ARG PIP_EXTRA_INDEX_URL=https://pypi.org/simple
+ARG USE_LOCAL_INSTALL=false
+
+RUN apk update \
+    && apk add --no-cache git nodejs npm yarn curl \
+    && npm install @coana-tech/cli -g
+
+# Install uv
+COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
+
+# Install CLI based on build mode
+RUN if [ "$USE_LOCAL_INSTALL" = "true" ]; then \
+        echo "Using local development install"; \
+    else \
+        for i in $(seq 1 10); do \
+            echo "Attempt $i/10: Installing socketsecurity==$CLI_VERSION"; \
+            if pip install --index-url ${PIP_INDEX_URL} --extra-index-url ${PIP_EXTRA_INDEX_URL} socketsecurity==$CLI_VERSION; then \
+                break; \
+            fi; \
+            echo "Install failed, waiting 30s before retry..."; \
+            sleep 30; \
+        done && \
+        if [ ! -z "$SDK_VERSION" ]; then \
+            pip install --index-url ${PIP_INDEX_URL} --extra-index-url ${PIP_EXTRA_INDEX_URL} socketdev==${SDK_VERSION}; \
+        fi; \
+    fi
+
+# Copy local source and install in editable mode if USE_LOCAL_INSTALL is true
+COPY . /app
+WORKDIR /app
+RUN if [ "$USE_LOCAL_INSTALL" = "true" ]; then \
+        pip install --upgrade -e .; \
+        pip install --upgrade socketdev; \
+    fi
+
+# ENTRYPOINT ["socketcli"]

{socketsecurity-2.2.23 → socketsecurity-2.2.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: socketsecurity
-Version: 2.2.23
+Version: 2.2.27
 Summary: Socket Security CLI for CI/CD
 Project-URL: Homepage, https://socket.dev
 Author-email: Douglas Coburn <douglas@socket.dev>
@@ -40,7 +40,7 @@ Requires-Dist: packaging
 Requires-Dist: prettytable
 Requires-Dist: python-dotenv
 Requires-Dist: requests
-Requires-Dist: socketdev<4.0.0,>=3.0.16
+Requires-Dist: socketdev<4.0.0,>=3.0.17
 Provides-Extra: dev
 Requires-Dist: hatch; extra == 'dev'
 Requires-Dist: pre-commit; extra == 'dev'

{socketsecurity-2.2.23 → socketsecurity-2.2.27}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "socketsecurity"
-version = "2.2.23"
+version = "2.2.27"
 requires-python = ">= 3.10"
 license = {"file" = "LICENSE"}
 dependencies = [
@@ -16,7 +16,7 @@ dependencies = [
     'GitPython',
     'packaging',
     'python-dotenv',
-    'socketdev>=3.0.16,<4.0.0',
+    'socketdev>=3.0.17,<4.0.0',
     "bs4>=0.0.2",
 ]
 readme = "README.md"

{socketsecurity-2.2.23 → socketsecurity-2.2.27}/scripts/build_container.sh

@@ -24,9 +24,15 @@ verify_package() {
 
 echo $VERSION
 if [ -z $ENABLE_PYPI_BUILD ] || [ -z $STABLE_VERSION ]; then
-    echo "$0 pypi-build=enable stable=true"
-    echo "\tpypi-build: Build and publish a new version of the package to pypi. Options are prod or test"
-    echo "\tstable: Only build and publish a new version for the stable docker tag if it has been tested and going on the changelog"
+    echo "$0 pypi-build=<option> stable=<true|false|prod|test>"
+    echo "\tpypi-build: Options are prod, test, or local"
+    echo "\t  - prod: Build and publish to production PyPI, then build Docker images"
+    echo "\t  - test: Build and publish to test PyPI, then build Docker images"
+    echo "\t  - local: Build Docker images only using existing PyPI package (specify prod or test via stable parameter)"
+    echo "\tstable: true/false/prod/test - Also tag as stable; for local builds:"
+    echo "\t  - stable=prod: Use production PyPI package"
+    echo "\t  - stable=test: Use test PyPI package"
+    echo "\t  - stable=false: Use local development install (pip install -e .)"
     exit
 fi
 
@@ -97,3 +103,44 @@ if [ $STABLE_VERSION = "stable=true" ]; then
         && docker push socketdev/cli:stable
 fi
 
+if [ $ENABLE_PYPI_BUILD = "pypi-build=local" ]; then
+    echo "Building local version without publishing to PyPI"
+    
+    # Determine PyPI source based on stable parameter
+    if [ $STABLE_VERSION = "stable=prod" ]; then
+        echo "Using production PyPI"
+        PIP_INDEX_URL="https://pypi.org/simple"
+        PIP_EXTRA_INDEX_URL="https://pypi.org/simple"
+        TAG_SUFFIX="local"
+        USE_LOCAL_INSTALL="false"
+    elif [ $STABLE_VERSION = "stable=test" ]; then
+        echo "Using test PyPI"
+        PIP_INDEX_URL="https://test.pypi.org/simple"
+        PIP_EXTRA_INDEX_URL="https://pypi.org/simple"
+        TAG_SUFFIX="local-test"
+        USE_LOCAL_INSTALL="false"
+    elif [ $STABLE_VERSION = "stable=false" ]; then
+        echo "Using local development install (pip install -e .)"
+        TAG_SUFFIX="local-dev"
+        USE_LOCAL_INSTALL="true"
+    else
+        echo "For local builds, use stable=prod, stable=test, or stable=false"
+        exit 1
+    fi
+    
+    if [ $USE_LOCAL_INSTALL = "true" ]; then
+        docker build --no-cache \
+            --build-arg USE_LOCAL_INSTALL=true \
+            -t socketdev/cli:$VERSION-$TAG_SUFFIX \
+            -t socketdev/cli:$TAG_SUFFIX .
+    else
+        docker build --no-cache \
+            --build-arg CLI_VERSION=$VERSION \
+            --build-arg PIP_INDEX_URL=$PIP_INDEX_URL \
+            --build-arg PIP_EXTRA_INDEX_URL=$PIP_EXTRA_INDEX_URL \
+            -t socketdev/cli:$VERSION-$TAG_SUFFIX \
+            -t socketdev/cli:$TAG_SUFFIX .
+    fi
+    echo "Local build complete. Tagged as socketdev/cli:$VERSION-$TAG_SUFFIX and socketdev/cli:$TAG_SUFFIX"
+fi
+

{socketsecurity-2.2.23 → socketsecurity-2.2.27}/socketsecurity/__init__.py

@@ -1,3 +1,3 @@
 __author__ = 'socket.dev'
-__version__ = '2.2.23'
+__version__ = '2.2.27'
 USER_AGENT = f'SocketPythonCLI/{__version__}'

{socketsecurity-2.2.23 → socketsecurity-2.2.27}/socketsecurity/core/scm/gitlab.py

@@ -1,8 +1,9 @@
 import os
 import sys
 from dataclasses import dataclass
-from typing import Optional
+from typing import Optional, Union
 
+import requests
 from socketsecurity import USER_AGENT
 from socketsecurity.core import log
 from socketsecurity.core.classes import Comment
@@ -128,9 +129,9 @@ class Gitlab:
         try:
             # Try the initial request with the configured headers
             return self.client.request(**kwargs)
-        except Exception as e:
+        except requests.exceptions.HTTPError as e:
             # Check if this is an authentication error (401)
-            if hasattr(e, 'response') and e.response and e.response.status_code == 401:
+            if e.response and e.response.status_code == 401:
                 log.debug(f"Authentication failed with initial headers, trying fallback method")
                 
                 # Determine the fallback headers
@@ -144,6 +145,9 @@ class Gitlab:
             
             # Re-raise the original exception if it's not an auth error or fallback failed
             raise
+        except Exception as e:
+            # Handle other types of exceptions that don't have response attribute
+            raise
 
     def _get_fallback_headers(self, original_headers: dict) -> dict:
         """
@@ -235,13 +239,13 @@ class Gitlab:
             new_security_comment: bool = True,
             new_overview_comment: bool = True
     ) -> None:
-        existing_overview_comment = comments.get("overview", "")
-        existing_security_comment = comments.get("security", "")
+        existing_overview_comment = comments.get("overview")
+        existing_security_comment = comments.get("security")
         if new_overview_comment:
             log.debug("New Dependency Overview comment")
             if existing_overview_comment is not None:
                 log.debug("Previous version of Dependency Overview, updating")
-                existing_overview_comment: Comment
+                # Type narrowing: after None check, mypy knows this is Comment
                 self.update_comment(overview_comment, str(existing_overview_comment.id))
             else:
                 log.debug("No previous version of Dependency Overview, posting")
@@ -250,15 +254,15 @@ class Gitlab:
             log.debug("New Security Issue Comment")
             if existing_security_comment is not None:
                 log.debug("Previous version of Security Issue comment, updating")
-                existing_security_comment: Comment
+                # Type narrowing: after None check, mypy knows this is Comment
                 self.update_comment(security_comment, str(existing_security_comment.id))
             else:
                 log.debug("No Previous version of Security Issue comment, posting")
                 self.post_comment(security_comment)
 
     def remove_comment_alerts(self, comments: dict):
-        security_alert = comments.get("security", "")
+        security_alert = comments.get("security")
         if security_alert is not None:
-            security_alert: Comment
+            # Type narrowing: after None check, mypy knows this is Comment
             new_body = Comments.process_security_comment(security_alert, comments)
             self.update_comment(new_body, str(security_alert.id))

{socketsecurity-2.2.23 → socketsecurity-2.2.27}/socketsecurity/socketcli.py

@@ -251,8 +251,7 @@ def main_code():
                     org_slug=org_slug,
                     file_paths=manifest_files,
                     workspace=config.repo or "default-workspace",
-                    base_path=None,
-                    base_paths=base_paths,
+                    base_paths=[config.target_path],
                     use_lazy_loading=False
                 )
                 log.info(f"Manifest upload successful, tar hash: {tar_hash}")

{socketsecurity-2.2.23 → socketsecurity-2.2.27}/uv.lock

@@ -1052,26 +1052,28 @@ wheels = [
 
 [[package]]
 name = "socketdev"
-version = "3.0.16"
+version = "3.0.17"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "requests" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/02/0d/6da0e0c34b97eef3a926d55470fa4bda2fcbbc42cc9e26ac51a34c6f117d/socketdev-3.0.16.tar.gz", hash = "sha256:5145300945e4e8d2d7f71db9c55cb44cc1449874f9d6416cc1d6ec129c64d638", size = 132505, upload-time = "2025-11-07T03:24:16.231Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/47/60/54b56ac179a9c89b2c9f2ab7eb5ba81220de64d11d52cf19249113ff364d/socketdev-3.0.17.tar.gz", hash = "sha256:a4446a84856c637c312d809d5b8deb25dd20ca38ae7d00a4c8104ea5b890c0af", size = 134013, upload-time = "2025-11-07T22:38:34.354Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/a3/91/8486b2a62ba71d62a8f4f2f9ad22c61fcaabb461c5f269bbe0734eae76f9/socketdev-3.0.16-py3-none-any.whl", hash = "sha256:f5e413f5f2f8c0c938d5654da7f0a157c0be02a25e14d94af62c252e9fb3b502", size = 58567, upload-time = "2025-11-07T03:24:14.965Z" },
+    { url = "https://files.pythonhosted.org/packages/98/56/34ab0e33b5345ca7ada68cd0a9e9d4adcde16051192eb10f8e2c3e0deaa1/socketdev-3.0.17-py3-none-any.whl", hash = "sha256:0986ee0694d5ce879cadb8e06fcfb75a4ca2dfb6f415414593825701593cf991", size = 59317, upload-time = "2025-11-07T22:38:32.704Z" },
 ]
 
 [[package]]
 name = "socketsecurity"
-version = "2.2.18"
+version = "2.2.26"
 source = { editable = "." }
 dependencies = [
     { name = "bs4" },
     { name = "gitpython" },
+    { name = "hatch" },
     { name = "mdutils" },
     { name = "packaging" },
+    { name = "pluggy" },
     { name = "prettytable" },
     { name = "python-dotenv" },
     { name = "requests" },
@@ -1098,9 +1100,11 @@ test = [
 requires-dist = [
     { name = "bs4", specifier = ">=0.0.2" },
     { name = "gitpython" },
+    { name = "hatch", specifier = ">=1.14.1" },
     { name = "hatch", marker = "extra == 'dev'" },
     { name = "mdutils" },
     { name = "packaging" },
+    { name = "pluggy", specifier = ">=1.6.0" },
     { name = "pre-commit", marker = "extra == 'dev'" },
     { name = "prettytable" },
     { name = "pytest", marker = "extra == 'test'", specifier = ">=7.4.0" },
@@ -1111,7 +1115,7 @@ requires-dist = [
     { name = "python-dotenv" },
     { name = "requests" },
     { name = "ruff", marker = "extra == 'dev'", specifier = ">=0.3.0" },
-    { name = "socketdev", specifier = ">=3.0.16,<4.0.0" },
+    { name = "socketdev", specifier = ">=3.0.17,<4.0.0" },
     { name = "twine", marker = "extra == 'dev'" },
     { name = "uv", marker = "extra == 'dev'", specifier = ">=0.1.0" },
 ]

socketsecurity-2.2.23/Dockerfile

@@ -1,27 +0,0 @@
-FROM python:3-alpine
-LABEL org.opencontainers.image.authors="socket.dev"
-ARG CLI_VERSION
-ARG SDK_VERSION
-ARG PIP_INDEX_URL=https://pypi.org/simple
-ARG PIP_EXTRA_INDEX_URL=https://pypi.org/simple
-
-RUN apk update \
-    && apk add --no-cache git nodejs npm yarn curl \
-    && npm install @coana-tech/cli -g
-
-# Install uv
-RUN curl -LsSf https://astral.sh/uv/install.sh | sh
-ENV PATH="/root/.cargo/bin:${PATH}"
-
-# Install CLI with retries for TestPyPI propagation (10 attempts, 30s each = 5 minutes total)
-RUN for i in $(seq 1 10); do \
-        echo "Attempt $i/10: Installing socketsecurity==$CLI_VERSION"; \
-        if pip install --index-url ${PIP_INDEX_URL} --extra-index-url ${PIP_EXTRA_INDEX_URL} socketsecurity==$CLI_VERSION; then \
-            break; \
-        fi; \
-        echo "Install failed, waiting 30s before retry..."; \
-        sleep 30; \
-    done && \
-    if [ ! -z "$SDK_VERSION" ]; then \
-        pip install --index-url ${PIP_INDEX_URL} --extra-index-url ${PIP_EXTRA_INDEX_URL} socketdev==${SDK_VERSION}; \
-    fi