Skip to content

Commit adbe227

Browse files
committed
Fix errors
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent a682a8f commit adbe227

8 files changed

Lines changed: 5 additions & 84 deletions

File tree

‎vulnerabilities/api_v3.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
#
99

1010
from collections import defaultdict
11-
from typing import List
1211
from urllib.parse import urlencode
1312

1413
from django.db.models import Exists
@@ -36,7 +35,6 @@
3635
from vulnerabilities.models import PackageV2
3736
from vulnerabilities.throttling import PermissionBasedUserRateThrottle
3837
from vulnerabilities.utils import TYPES_WITH_MULTIPLE_IMPORTERS
39-
from vulnerabilities.utils import merge_and_save_grouped_advisories
4038

4139

4240
class PackageQuerySerializer(serializers.Serializer):

‎vulnerabilities/pipes/group_advisories.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ def delete_and_save_advisory_set(groups, package, relation=None):
2727
print(f"Grouping advisories for package: {package.purl}")
2828

2929
for group in groups:
30-
3130
try:
32-
advisory_set = AdvisorySet.objects.get_or_create(
31+
advisory_set, _ = AdvisorySet.objects.get_or_create(
3332
package=package,
3433
relation_type=relation,
3534
primary_advisory=group.primary,

‎vulnerabilities/tests/pipelines/v2_improvers/test_compute_advisory_todo_v2.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -381,8 +381,6 @@ def test_todo_conflict_details_partial_curation(self):
381381
result_partial_curation = issue_details["partial_curation_advisory"]
382382
self.assertEqual(1, AdvisoryToDoV2.objects.count())
383383
self.assertEqual("CONFLICTING_FIXED_BY_PACKAGES", todo.issue_type)
384-
print(result_partial_curation)
385-
# breakpoint()
386384
self.assertDictEqual(expected_partial_curation_advisory, result_partial_curation)
387385

388386
def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_affected_and_fixed(

‎vulnerabilities/tests/test_advisory_merge.py‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,11 @@
1818
from vulnerabilities.models import Group
1919
from vulnerabilities.models import ImpactedPackage
2020
from vulnerabilities.models import PackageV2
21+
from vulnerabilities.pipes.group_advisories import delete_and_save_advisory_set
22+
from vulnerabilities.pipes.group_advisories import merge_advisories
2123
from vulnerabilities.utils import compute_advisory_content_hash
22-
from vulnerabilities.utils import delete_and_save_advisory_set
2324
from vulnerabilities.utils import get_advisories_from_groups
2425
from vulnerabilities.utils import get_merged_identifier_groups
25-
from vulnerabilities.utils import merge_advisories
26-
from vulnerabilities.utils import merge_and_save_grouped_advisories
2726

2827

2928
@pytest.mark.django_db
@@ -162,27 +161,6 @@ def test_delete_and_save_advisory_set(self):
162161
assert any(m.is_primary for m in members)
163162
assert any(not m.is_primary for m in members)
164163

165-
def test_merge_and_save_integration(self):
166-
package = PackageV2.objects.from_purl("pkg:pypi/sample@1.0.0")
167-
168-
adv1 = self.create_advisory("A1", ["1.0"], ["2.0"])
169-
adv2 = self.create_advisory("A2", ["1.0"], ["2.0"])
170-
171-
alias = AdvisoryAlias.objects.create(alias="CVE-1")
172-
173-
adv1.aliases.add(alias)
174-
adv2.aliases.add(alias)
175-
176-
result = merge_and_save_grouped_advisories(
177-
package,
178-
[adv1, adv2],
179-
relation="test",
180-
)
181-
182-
assert len(result) == 1
183-
assert AdvisorySet.objects.count() == 1
184-
assert AdvisorySetMember.objects.count() == 2
185-
186164
def test_merge_advisories_separates_different_content(self):
187165
package = PackageV2.objects.from_purl("pkg:pypi/sample@1.0.0")
188166

‎vulnerabilities/tests/test_api_v3.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def test_packages_post_without_details(self):
6767
def test_packages_post_with_details(self):
6868
url = reverse("package-v3-list")
6969

70-
with self.assertNumQueries(31):
70+
with self.assertNumQueries(12):
7171
response = self.client.post(
7272
url,
7373
data={

‎vulnerabilities/tests/test_risk.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525

2626
@pytest.fixture
27-
@pytest.mark.django_db
2827
def vulnerability():
2928
vul = Vulnerability(vulnerability_id="VCID-Existing")
3029
vul.save()
@@ -50,15 +49,13 @@ def vulnerability():
5049

5150

5251
@pytest.fixture
53-
@pytest.mark.django_db
5452
def exploit():
5553
vul = Vulnerability(vulnerability_id="VCID-Exploit")
5654
vul.save()
5755
return Exploit.objects.create(vulnerability=vul, description="exploit description")
5856

5957

6058
@pytest.fixture
61-
@pytest.mark.django_db
6259
def vulnerability_with_exploit_ref():
6360
vul = Vulnerability(vulnerability_id="VCID-Exploit-Ref")
6461
vul.save()
@@ -74,7 +71,6 @@ def vulnerability_with_exploit_ref():
7471

7572

7673
@pytest.fixture
77-
@pytest.mark.django_db
7874
def high_epss_score():
7975
vul = Vulnerability(vulnerability_id="VCID-HIGH-EPSS")
8076
vul.save()
@@ -90,7 +86,6 @@ def high_epss_score():
9086

9187

9288
@pytest.fixture
93-
@pytest.mark.django_db
9489
def low_epss_score():
9590
vul = Vulnerability(vulnerability_id="VCID-LOW-EPSS")
9691
vul.save()

‎vulnerabilities/utils.py‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,17 +1043,6 @@ def get_advisories_from_groups(groups, include_ssvc_trees=False):
10431043
return advisories
10441044

10451045

1046-
def merge_and_save_grouped_advisories(package, advisories, relation):
1047-
"""
1048-
Merge advisories based on their content and identifiers and save the merged advisories to the database.
1049-
"""
1050-
groups = merge_advisories(advisories, package)
1051-
delete_and_save_advisory_set(groups, package, relation)
1052-
advisories = get_advisories_from_groups(groups)
1053-
1054-
return advisories
1055-
1056-
10571046
TYPES_WITH_MULTIPLE_IMPORTERS = [
10581047
"pypi",
10591048
"maven",

‎vulnerabilities/views.py‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
from vulnerabilities.throttling import AnonUserUIThrottle
5454
from vulnerabilities.utils import TYPES_WITH_MULTIPLE_IMPORTERS
5555
from vulnerabilities.utils import get_advisories_from_groups
56-
from vulnerabilities.utils import merge_and_save_grouped_advisories
5756
from vulnerablecode import __version__ as VULNERABLECODE_VERSION
5857
from vulnerablecode.settings import env
5958

@@ -327,6 +326,7 @@ def get_context_data(self, **kwargs):
327326
return context
328327

329328
is_grouped = models.AdvisorySet.objects.filter(package=package).exists()
329+
print(f"Is package {package.purl} grouped? {is_grouped}")
330330

331331
if is_grouped:
332332
context["grouped"] = True
@@ -390,42 +390,6 @@ def get_context_data(self, **kwargs):
390390

391391
return context
392392

393-
# if package.type in TYPES_WITH_MULTIPLE_IMPORTERS:
394-
# affecting_advisories = AdvisoryV2.objects.latest_affecting_advisories_for_purl(
395-
# purl=package.purl
396-
# )
397-
398-
# fixed_by_advisories = AdvisoryV2.objects.latest_fixed_by_advisories_for_purl(
399-
# purl=package.purl
400-
# )
401-
# fixed_pkg_details = get_fixed_package_details(package)
402-
# context["fixed_package_details"] = fixed_pkg_details
403-
# context["grouped"] = True
404-
405-
# affecting_advisories = affecting_advisories.prefetch_related(
406-
# "aliases",
407-
# "impacted_packages__affecting_packages",
408-
# "impacted_packages__fixed_by_packages",
409-
# )
410-
411-
# affected_by_advisories: List[GroupedAdvisory] = merge_and_save_grouped_advisories(
412-
# package, affecting_advisories, "affecting"
413-
# )
414-
415-
# fixed_by_advisories = fixed_by_advisories.prefetch_related(
416-
# "aliases",
417-
# "impacted_packages__affecting_packages",
418-
# "impacted_packages__fixed_by_packages",
419-
# )
420-
421-
# fixing_advisories: List[GroupedAdvisory] = merge_and_save_grouped_advisories(
422-
# package, fixed_by_advisories, "fixing"
423-
# )
424-
425-
# context["affected_by_advisories_v2"] = affected_by_advisories
426-
# context["fixing_advisories_v2"] = fixing_advisories
427-
# return context
428-
429393
def get_object(self, queryset=None):
430394
if queryset is None:
431395
queryset = self.get_queryset()

0 commit comments

Comments
 (0)