Skip to content

Commit af02c1d

Browse files
committed
Add a filter to ensure that only malformed avid from alpine_linux, mattermost_importer_v2, fireeye_importer_v2, and istio_importer_v2 are deleted
Signed-off-by: ziad hany <ziadhany2016@gmail.com>
1 parent cb2eee0 commit af02c1d

4 files changed

Lines changed: 6 additions & 3 deletions

File tree

‎vulnerabilities/migrations/0122_advisoryv2_remove_malformed_aliases_and_dvisory_id.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def drop_malformed_advisory_v2(apps, _):
2323
query |= Q(alias__istartswith=alias_prefix)
2424

2525
malformed_aliases = AdvisoryAlias.objects.exclude(query)
26-
AdvisoryV2.objects.filter(aliases__in=malformed_aliases).delete()
26+
AdvisoryV2.objects.filter(aliases__in=malformed_aliases, datasource_id__in=["alpine_linux_importer_v2", "fireeye_importer_v2", "istio_importer_v2", "mattermost_importer_v2"]).delete()
2727
malformed_aliases.delete()
2828

2929
operations = [

‎vulnerabilities/pipelines/v2_importers/alpine_linux_importer.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,10 @@ def parse_vuln_ids(vuln_ids_string, logger=print):
286286
"ZBX-",
287287
"ALPINE-",
288288
"TS-",
289+
"OSEC-",
289290
"wnpa-sec-",
290291
)
292+
291293
for alias in cleaned_vuln_ids:
292294
if alias and (
293295
(alias.startswith("CVE-") and is_cve(alias)) or alias.startswith(valid_prefixes)

‎vulnerabilities/tests/pipelines/v2_importers/test_alpine_linux_importer_pipeline.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ def test_load_advisories_package_with_invalid_alpine_version(test_case):
120120
),
121121
("CVE-2023-44441 ZDI-CAN-22093", "CVE-2023-44441", ["CVE-2023-44441", "ZDI-CAN-22093"]),
122122
("CVE-2022-45059 VSV00010", "CVE-2022-45059", ["CVE-2022-45059", "VSV00010"]),
123+
("OSEC-2026-03", "OSEC-2026-03", ["OSEC-2026-03"]),
123124
("CVE-2021-35940.patch", "CVE-2021-35940", ["CVE-2021-35940"]),
124125
("XSA-207", "XSA-207", ["XSA-207"]),
125126
("ALPINE-13661", "ALPINE-13661", ["ALPINE-13661"]),

‎vulnerabilities/tests/test_data_migrations.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,8 +1164,8 @@ def setUpBeforeMigration(self, apps):
11641164
url="https://example.com",
11651165
summary=f"Advisory for {raw_input}",
11661166
advisory_id=raw_input,
1167-
avid=f"test_pipeline/{raw_input}",
1168-
datasource_id="test_pipeline",
1167+
avid=f"alpine_linux_importer_v2/{raw_input}",
1168+
datasource_id="alpine_linux_importer_v2",
11691169
)
11701170
alias = AdvisoryAlias.objects.create(alias=raw_input)
11711171
adv.aliases.add(alias)

0 commit comments

Comments
 (0)