From 901ffd215b00534f55b745bad0ea95fdc9f57f76 Mon Sep 17 00:00:00 2001 From: Eric Hibbs Date: Thu, 13 Feb 2025 14:33:00 -0800 Subject: [PATCH 1/3] timeout fixes and fallback for missing directDeps key --- socketdev/__init__.py | 4 ++-- socketdev/fullscans/__init__.py | 4 ++-- socketdev/version.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/socketdev/__init__.py b/socketdev/__init__.py index 0c97b24..7ddb98b 100644 --- a/socketdev/__init__.py +++ b/socketdev/__init__.py @@ -28,13 +28,13 @@ encoded_key: str api_url = "https://api.socket.dev/v0" -request_timeout = 30 +request_timeout = 1200 log = logging.getLogger("socketdev") log.addHandler(logging.NullHandler()) class socketdev: - def __init__(self, token: str, timeout: int = 30): + def __init__(self, token: str, timeout: int = 1200): self.api = API() self.token = token + ":" self.api.encode_key(self.token) diff --git a/socketdev/fullscans/__init__.py b/socketdev/fullscans/__init__.py index 4ba2a65..262b848 100644 --- a/socketdev/fullscans/__init__.py +++ b/socketdev/fullscans/__init__.py @@ -506,7 +506,7 @@ def from_dict(cls, data: dict) -> "CommitInfo": class FullScanDiffReport: before: CommitInfo after: CommitInfo - directDependenciesChanged: bool + directDependenciesChanged: bool = False diff_report_url: str artifacts: DiffArtifacts @@ -518,7 +518,7 @@ def from_dict(cls, data: dict) -> "FullScanDiffReport": return cls( before=CommitInfo.from_dict(data["before"]), after=CommitInfo.from_dict(data["after"]), - directDependenciesChanged=data["directDependenciesChanged"], + directDependenciesChanged=data.get("directDependenciesChanged", False), diff_report_url=data["diff_report_url"], artifacts=DiffArtifacts.from_dict(data["artifacts"]) ) diff --git a/socketdev/version.py b/socketdev/version.py index 9790358..b0747c8 100644 --- a/socketdev/version.py +++ b/socketdev/version.py @@ -1 +1 @@ -__version__ = "2.0.4" \ No newline at end of file +__version__ = "2.0.5" \ No newline at end of file From 5cdc2e17e3cea37011a13e82b120660e0a09cf1c Mon Sep 17 00:00:00 2001 From: Eric Hibbs Date: Thu, 13 Feb 2025 15:53:40 -0800 Subject: [PATCH 2/3] updated with findings supporting SARIF --- socketdev/fullscans/__init__.py | 2 +- socketdev/version.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/socketdev/fullscans/__init__.py b/socketdev/fullscans/__init__.py index 262b848..68caea9 100644 --- a/socketdev/fullscans/__init__.py +++ b/socketdev/fullscans/__init__.py @@ -506,9 +506,9 @@ def from_dict(cls, data: dict) -> "CommitInfo": class FullScanDiffReport: before: CommitInfo after: CommitInfo - directDependenciesChanged: bool = False diff_report_url: str artifacts: DiffArtifacts + directDependenciesChanged: bool = False def __getitem__(self, key): return getattr(self, key) def to_dict(self): return asdict(self) diff --git a/socketdev/version.py b/socketdev/version.py index b0747c8..d8972c5 100644 --- a/socketdev/version.py +++ b/socketdev/version.py @@ -1 +1 @@ -__version__ = "2.0.5" \ No newline at end of file +__version__ = '2.0.5' \ No newline at end of file From 274a3d37adccb29428a0b7e9845fd27b70303904 Mon Sep 17 00:00:00 2001 From: Eric Hibbs Date: Thu, 13 Feb 2025 16:01:21 -0800 Subject: [PATCH 3/3] double quotes in the version file --- socketdev/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/socketdev/version.py b/socketdev/version.py index d8972c5..b0747c8 100644 --- a/socketdev/version.py +++ b/socketdev/version.py @@ -1 +1 @@ -__version__ = '2.0.5' \ No newline at end of file +__version__ = "2.0.5" \ No newline at end of file