Skip to content

Commit

Permalink
Format the code using make valid
Browse files Browse the repository at this point in the history
Signed-off-by: ambuj <kulshreshthaak.12@gmail.com>
  • Loading branch information
ambuj-1211 committed Apr 13, 2024
1 parent 428edd9 commit 2f84bec
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 20 deletions.
32 changes: 14 additions & 18 deletions vulnerabilities/importers/curl.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,16 +105,14 @@ def parse_advisory_data(raw_data) -> AdvisoryData:

ranges = get_item(affected, "ranges")[0] if len(get_item(affected, "ranges")) > 0 else []
events = get_item(ranges, "events")[1] if len(get_item(ranges, "events")) > 1 else {}
type_of_version = get_item(ranges, "type") if get_item(ranges, "type") else ""
# fixed_version = ""
if type_of_version=="SEMVER":
fixed_version = SemverVersion(events.get("fixed") or "")
version_type = get_item(ranges, "type") if get_item(ranges, "type") else ""
fixed_version = events.get("fixed")
if version_type == "SEMVER" and fixed_version:
fixed_version = SemverVersion(fixed_version)

purl = PackageURL(type="generic", namespace="curl.se", name="curl")
versions = affected.get("versions") or []
affected_version_range = GenericVersionRange.from_versions(
versions
)
affected_version_range = GenericVersionRange.from_versions(versions)

affected_package = AffectedPackage(
package=purl, affected_version_range=affected_version_range, fixed_version=fixed_version
Expand All @@ -133,7 +131,6 @@ def parse_advisory_data(raw_data) -> AdvisoryData:
if ref_issue:
references.append(Reference(url=ref_issue))


date_published = datetime.strptime(
raw_data.get("published") or "", "%Y-%m-%dT%H:%M:%S.%fZ"
).replace(tzinfo=timezone.utc)
Expand All @@ -152,18 +149,17 @@ def parse_advisory_data(raw_data) -> AdvisoryData:

def get_cwe_from_curl_advisory(raw_data):
"""
Extracts CWE IDs from the given raw_data and returns a list of CWE IDs.
Extracts CWE IDs from the given raw_data and returns a list of CWE IDs.
>>> get_cwe_from_curl_advisory({"database_specific": {"CWE": {"id": "CWE-333"}}})
["333"]
>>> get_cwe_from_curl_advisory({"database_specific": {"CWE": {"id": "CWE-333"}}})
["333"]
>>> get_cwe_from_curl_advisory({"database_specific": {"CWE": {"id": "CWE-123333"}}})
Invalid CWE id
>>> get_cwe_from_curl_advisory({"database_specific": {"CWE": {"id": "CWE-123333"}}})
Invalid CWE id
>>> get_cwe_from_curl_advisory({"database_specific": {"CWE": {"id": ""}}})
[]
"""
>>> get_cwe_from_curl_advisory({"database_specific": {"CWE": {"id": ""}}})
[]
"""
weaknesses = []
db = Database()
cwe_string = get_item(raw_data, "database_specific", "CWE", "id") or ""
Expand All @@ -175,4 +171,4 @@ def get_cwe_from_curl_advisory(raw_data):
weaknesses.append(cwe_id)
except Exception:
logger.error("Invalid CWE id")
return weaknesses
return weaknesses
2 changes: 1 addition & 1 deletion vulnerabilities/improvers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
valid_versions.RubyImprover,
valid_versions.GithubOSVImprover,
vulnerability_status.VulnerabilityStatusImprover,
valid_versions.CurlImprover
valid_versions.CurlImprover,
]

IMPROVERS_REGISTRY = {x.qualified_name: x for x in IMPROVERS_REGISTRY}
1 change: 1 addition & 0 deletions vulnerabilities/improvers/valid_versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,7 @@ class GithubOSVImprover(ValidVersionImprover):
importer = GithubOSVImporter
ignorable_versions = []


class CurlImprover(ValidVersionImprover):
importer = CurlImporter
ignorable_versions = []
2 changes: 1 addition & 1 deletion vulnerabilities/tests/test_curl.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ def test_get_cwe_from_curl_advisory(self):
mock_cwe_list = []
for advisory in mock_advisory:
mock_cwe_list.extend(get_cwe_from_curl_advisory(advisory))
assert mock_cwe_list == [311]
assert mock_cwe_list == [311]

0 comments on commit 2f84bec

Please sign in to comment.