Skip to content

Commit fbde42f

Browse files
committed
Resolve migration conflicts.
Address the exploit in the API extension. Signed-off-by: ziadhany <ziadhany2016@gmail.com>
1 parent c513713 commit fbde42f

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

vulnerabilities/api_extension.py

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from rest_framework.throttling import AnonRateThrottle
2727

2828
from vulnerabilities.api import BaseResourceSerializer
29-
from vulnerabilities.models import Kev
29+
from vulnerabilities.models import Exploit
3030
from vulnerabilities.models import Package
3131
from vulnerabilities.models import Vulnerability
3232
from vulnerabilities.models import VulnerabilityReference
@@ -105,8 +105,21 @@ class Meta:
105105

106106
class V2ExploitSerializer(ModelSerializer):
107107
class Meta:
108-
model = Kev
109-
fields = ("description", "required_action", "date_added", "due_date", "resources_and_notes")
108+
model = Exploit
109+
fields = [
110+
"date_added",
111+
"description",
112+
"required_action",
113+
"due_date",
114+
"notes",
115+
"known_ransomware_campaign_use",
116+
"source_date_published",
117+
"exploit_type",
118+
"platform",
119+
"source_date_updated",
120+
"data_source",
121+
"source_url",
122+
]
110123

111124

112125
class V2VulnerabilitySerializer(ModelSerializer):

vulnerabilities/improvers/__init__.py

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

1010
from vulnerabilities.improvers import valid_versions
11-
from vulnerabilities.improvers import vulnerability_kev
1211
from vulnerabilities.improvers import vulnerability_status
12+
from vulnerabilities.pipelines import enhance_with_exploitdb
13+
from vulnerabilities.pipelines import enhance_with_kev
14+
from vulnerabilities.pipelines import enhance_with_metasploit
1315
from vulnerabilities.pipelines import flag_ghost_packages
1416

1517
IMPROVERS_REGISTRY = [
@@ -30,8 +32,10 @@
3032
valid_versions.GithubOSVImprover,
3133
vulnerability_status.VulnerabilityStatusImprover,
3234
valid_versions.CurlImprover,
33-
vulnerability_kev.VulnerabilityKevImprover,
3435
flag_ghost_packages.FlagGhostPackagePipeline,
36+
enhance_with_kev.VulnerabilityKevPipeline,
37+
enhance_with_metasploit.MetasploitImproverPipeline,
38+
enhance_with_exploitdb.ExploitDBImproverPipeline,
3539
]
3640

3741
IMPROVERS_REGISTRY = {x.qualified_name: x for x in IMPROVERS_REGISTRY}

0 commit comments

Comments
 (0)