Skip to content

Commit

Permalink
Hotfix parse_version from univers
Browse files Browse the repository at this point in the history
aboutcode-org/univers#10
- parse_version() should accept None and empty strings

Signed-off-by: Hritik Vijay <hritikxx8@gmail.com>
  • Loading branch information
Hritik14 committed Oct 18, 2021
1 parent 6cc494d commit c3ec858
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 8 deletions.
12 changes: 4 additions & 8 deletions vulnerabilities/data_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
from packageurl import PackageURL
from univers.version_specifier import VersionSpecifier
from univers.versions import BaseVersion
from univers.versions import parse_version
from univers.versions import version_class_by_package_type
from vulnerabilities.helpers import nearest_patched_package
from vulnerabilities.oval_parser import OvalParser
from vulnerabilities.severity_systems import ScoringSystem
from vulnerabilities.helpers import is_cve
from vulnerabilities.helpers import nearest_patched_package

# TODO: remove after https://github.com/nexB/univers/issues/10 is fixed
from vulnerabilities.helpers import parse_version

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -119,15 +119,11 @@ def from_dict(aff_pkg: dict):
affected_version_specifier = VersionSpecifier.from_version_spec_string(
aff_pkg["affected_version_specifier"]
)
if "fixed_version" in aff_pkg:
fixed_version = parse_version(aff_pkg["fixed_version"])
else:
fixed_version = None

return AffectedPackage(
package=package,
affected_version_specifier=affected_version_specifier,
fixed_version=fixed_version,
fixed_version=parse_version(aff_pkg["fixed_version"]),
)


Expand Down
10 changes: 10 additions & 0 deletions vulnerabilities/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,13 @@ def split_markdown_front_matter(text: str) -> Tuple[str, str]:
return frontmatter, markdown

return "", text


# TODO: Remove after https://github.com/nexB/univers/issues/10
from univers.versions import parse_version as univers_parse_version


def parse_version(version):
if not version:
return None
return univers_parse_version(version)

0 comments on commit c3ec858

Please sign in to comment.