Skip to content

Continue importing from github on InvalidVersion #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kipz wants to merge 1 commit into from
Closed

Continue importing from github on InvalidVersion #472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions vulnerabilities/importers/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@
import asyncio
import os
import dataclasses
import json
import traceback
import logging

from typing import Set
from typing import Tuple
from typing import List
Expand All @@ -33,7 +35,7 @@
import requests
from packageurl import PackageURL
from univers.version_specifier import VersionSpecifier
from univers.versions import version_class_by_package_type
from univers.versions import version_class_by_package_type, InvalidVersion

from vulnerabilities.data_source import Advisory
from vulnerabilities.data_source import DataSource
Expand All @@ -48,6 +50,8 @@
from vulnerabilities.severity_systems import scoring_systems
from vulnerabilities.helpers import nearest_patched_package

logger = logging.getLogger(__name__)

# set of all possible values of first '%s' = {'MAVEN','COMPOSER', 'NUGET', 'RUBYGEMS', 'PYPI'}
# second '%s' is interesting, it will have the value '' for the first request,
# since we don't have any value for endCursor at the beginning
Expand Down Expand Up @@ -265,9 +269,12 @@ def categorize_versions(
affected_versions = []
unaffected_versions = []
for version in all_versions:
if version_class(version) in version_range:
affected_versions.append(version)
else:
unaffected_versions.append(version)
try:
if version_class(version) in version_range:
affected_versions.append(version)
else:
unaffected_versions.append(version)
except InvalidVersion:
logger.error(f"Failed to parse version: {version!r}:\n" + traceback.format_exc())

return (affected_versions, unaffected_versions)
2 changes: 1 addition & 1 deletion vulnerabilities/tests/test_github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def tearDown(self):

def test_categorize_versions(self):
eg_version_range = ">= 3.3.0, < 3.3.5"
eg_versions = ["3.3.6", "3.3.0", "3.3.4", "3.2.0"]
eg_versions = ["3.3.6", "3.3.0", "3.3.4", "3.2.0", "0.1-charmander"]

aff_vers, safe_vers = self.data_src.categorize_versions(
"pypi", eg_version_range, eg_versions
Expand Down