From 198f16ac96fc7f70330f197604cc66b01154f39f Mon Sep 17 00:00:00 2001 From: thebigbone Date: Sat, 30 Mar 2024 18:04:19 +0530 Subject: [PATCH 1/2] use https.OK Signed-off-by: thebigbone --- vulnerabilities/utils.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/vulnerabilities/utils.py b/vulnerabilities/utils.py index 2e75b59e8..50d17fa2d 100644 --- a/vulnerabilities/utils.py +++ b/vulnerabilities/utils.py @@ -25,6 +25,7 @@ from unittest.mock import MagicMock from urllib.parse import urljoin from uuid import uuid4 +from http import HTTPStatus import requests import saneyaml @@ -167,14 +168,17 @@ def nearest_patched_package( Return a list of Affected Packages for each Patched package. """ - vulnerable_packages = sorted([VersionedPackage(package) for package in vulnerable_packages]) - resolved_packages = sorted([VersionedPackage(package) for package in resolved_packages]) + vulnerable_packages = sorted( + [VersionedPackage(package) for package in vulnerable_packages]) + resolved_packages = sorted([VersionedPackage(package) + for package in resolved_packages]) resolved_package_count = len(resolved_packages) affected_package_with_patched_package_objects = [] for vulnerable_package in vulnerable_packages: - patched_package_index = bisect.bisect_right(resolved_packages, vulnerable_package) + patched_package_index = bisect.bisect_right( + resolved_packages, vulnerable_package) patched_package = None if patched_package_index < resolved_package_count: patched_package = resolved_packages[patched_package_index] @@ -405,7 +409,7 @@ def base32_custom(btes): from_bytes = int.from_bytes for i in range(0, len(btes), 5): - c = from_bytes(btes[i : i + 5], "big") + c = from_bytes(btes[i: i + 5], "big") encoded += ( _base32_table[c >> 30] + _base32_table[(c >> 20) & 0x3FF] # bits 1 - 10 @@ -420,9 +424,10 @@ def fetch_response(url): Fetch and return `response` from the `url` """ response = requests.get(url) - if response.status_code == 200: + if response.status_code == HTTPStatus.OK: return response - raise Exception(f"Failed to fetch data from {url!r} with status code: {response.status_code!r}") + raise Exception( + f"Failed to fetch data from {url!r} with status code: {response.status_code!r}") # This should be a method on PackageURL From 49c840f32c371bf3a51a34371ce544bf1bf15d33 Mon Sep 17 00:00:00 2001 From: thebigbone Date: Mon, 1 Apr 2024 11:17:06 +0530 Subject: [PATCH 2/2] ran make valid Signed-off-by: thebigbone --- vulnerabilities/utils.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/vulnerabilities/utils.py b/vulnerabilities/utils.py index 50d17fa2d..3b3daebe5 100644 --- a/vulnerabilities/utils.py +++ b/vulnerabilities/utils.py @@ -19,13 +19,13 @@ from collections import defaultdict from functools import total_ordering from hashlib import sha256 +from http import HTTPStatus from typing import List from typing import Optional from typing import Tuple from unittest.mock import MagicMock from urllib.parse import urljoin from uuid import uuid4 -from http import HTTPStatus import requests import saneyaml @@ -168,17 +168,14 @@ def nearest_patched_package( Return a list of Affected Packages for each Patched package. """ - vulnerable_packages = sorted( - [VersionedPackage(package) for package in vulnerable_packages]) - resolved_packages = sorted([VersionedPackage(package) - for package in resolved_packages]) + vulnerable_packages = sorted([VersionedPackage(package) for package in vulnerable_packages]) + resolved_packages = sorted([VersionedPackage(package) for package in resolved_packages]) resolved_package_count = len(resolved_packages) affected_package_with_patched_package_objects = [] for vulnerable_package in vulnerable_packages: - patched_package_index = bisect.bisect_right( - resolved_packages, vulnerable_package) + patched_package_index = bisect.bisect_right(resolved_packages, vulnerable_package) patched_package = None if patched_package_index < resolved_package_count: patched_package = resolved_packages[patched_package_index] @@ -409,7 +406,7 @@ def base32_custom(btes): from_bytes = int.from_bytes for i in range(0, len(btes), 5): - c = from_bytes(btes[i: i + 5], "big") + c = from_bytes(btes[i : i + 5], "big") encoded += ( _base32_table[c >> 30] + _base32_table[(c >> 20) & 0x3FF] # bits 1 - 10 @@ -426,8 +423,7 @@ def fetch_response(url): response = requests.get(url) if response.status_code == HTTPStatus.OK: return response - raise Exception( - f"Failed to fetch data from {url!r} with status code: {response.status_code!r}") + raise Exception(f"Failed to fetch data from {url!r} with status code: {response.status_code!r}") # This should be a method on PackageURL