Skip to content

Commit f911eea

Browse files
committed
Update OSV to catch error constraints correctly
Signed-off-by: ziad hany <ziadhany2016@gmail.com>
1 parent 142dbc0 commit f911eea

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

vulnerabilities/importers/osv_v2.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,7 @@ def parse_advisory_data_v3(
133133
if affected_constraints:
134134
try:
135135
valid_affected_constraints = VersionConstraint.simplify(affected_constraints)
136-
if not validate_comparators(valid_affected_constraints):
137-
raise InvalidConstraintsError(
138-
f"Failed to build Affected VersionRange Constraints for {advisory_id}: {valid_affected_constraints}"
139-
)
136+
validate_comparators(valid_affected_constraints)
140137
affected_version_range = version_range_class(constraints=valid_affected_constraints)
141138
except Exception as e:
142139
logger.error(f"Failed to build VersionRange for {advisory_id}: {e}")
@@ -145,10 +142,7 @@ def parse_advisory_data_v3(
145142
if fixed_constraints:
146143
try:
147144
valid_fixed_constraints = VersionConstraint.simplify(fixed_constraints)
148-
if not validate_comparators(valid_fixed_constraints):
149-
raise InvalidConstraintsError(
150-
f"Failed to build Fixed VersionRange Constraints for {advisory_id}: {valid_fixed_constraints}"
151-
)
145+
validate_comparators(valid_fixed_constraints)
152146
fixed_version_range = version_range_class(constraints=valid_fixed_constraints)
153147
except Exception as e:
154148
logger.error(f"Failed to build VersionRange for {advisory_id}: {e}")

vulnerabilities/pipelines/v2_importers/github_osv_importer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from pathlib import Path
1212
from typing import Iterable
1313

14-
from fetchcode.vcs import VCSResponse
1514
from fetchcode.vcs import fetch_via_vcs
1615

1716
from vulnerabilities.importer import AdvisoryData

0 commit comments

Comments
 (0)