Skip to content

Fix regex in schema validator in alpine importer #347

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

Merged
sbs2001 merged 2 commits into from
Feb 13, 2021
Merged

Fix regex in schema validator in alpine importer #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a75884b
Fix regex in schema validator in alpine importer
sbs2001 Feb 12, 2021
57481fc
Update deps to fix tests on latest python
sbs2001 Feb 12, 2021
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
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ptyprocess==0.6.0
py==1.8.0
pycodestyle==2.5.0
pycparser==2.20
pygit2==1.2.0
pygit2==1.5.0
Pygments==2.6.1
pyparsing==2.4.5
pytest==5.3.2
Expand All @@ -43,7 +43,7 @@ pytest-django==3.7.0
pytest-mock==1.13.0
python-dateutil==2.8.1
pytz==2019.3
schema==0.7.1
schema==0.7.4
six==1.13.0
soupsieve==1.9.5
sqlparse==0.3.0
Expand Down
5 changes: 3 additions & 2 deletions vulnerabilities/importers/alpine_linux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
# for any legal advice.
# VulnerableCode is a free software code scanning tool from nexB Inc. and others.
# Visit https://github.com/nexB/vulnerablecode/ for support and download.
from re import IGNORECASE
from typing import Any
from typing import Iterable
from typing import List
Expand Down Expand Up @@ -54,7 +55,7 @@ def validate_schema(advisory_dict):
str: Or(
[
Or(
Regex(r"CVE.\d+-\d+"),
Regex(r"CVE.\d+-\d+", flags=IGNORECASE),
Regex(r"XSA-\d{3}"),
Regex(r"ZBX-\d{4}"),
Regex(r"wnpa-sec-\d{4}-\d{2}"),
Expand Down Expand Up @@ -187,7 +188,7 @@ def _load_advisories(
impacted_package_urls=[],
resolved_package_urls=resolved_purls,
vuln_references=references,
cve_id=vuln_ids[0] if vuln_ids[0] != "CVE-????-?????" else None,
cve_id=vuln_ids[0].upper() if vuln_ids[0] != "CVE-????-?????" else None,
)
)

Expand Down