Skip to content

Commit 5506812

Browse files
committed
Fix purl and vers for photon importer
Signed-off-by: Sampurna Pyne <sampurnapyne1710@gmail.com>
1 parent 451753d commit 5506812

2 files changed

Lines changed: 65 additions & 57 deletions

File tree

‎vulnerabilities/pipelines/v2_importers/vmware_photon_importer_v2.py‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,21 +104,29 @@ def collect_advisories(self) -> Iterable[AdvisoryDataV2]:
104104
aff_ver = record.get("aff_ver")
105105
res_ver = record.get("res_ver")
106106

107-
# Example PURL Format: pkg:rpm/vmware/apache-ant?distro=photon
108-
purl = PackageURL(
109-
type="rpm",
110-
namespace="vmware",
111-
name=pkg_name,
112-
qualifiers={"distro": "photon"},
113-
)
114-
107+
# In this datasource the aff_ver is either "N/A" or in the format "all versions before <version> are vulnerable"
115108
ver_match = re.match(r"all versions before (.+) are vulnerable", aff_ver)
116109

117110
if not ver_match:
118111
self.log(f"Could not extract affected version from aff_ver: {aff_ver!r}")
119112
continue
120113

121-
aff_ver = ver_match.group(1)
114+
original_aff_ver = ver_match.group(1)
115+
116+
qualifiers = {}
117+
qualifiers["photon"] = "ph" + original_aff_ver.split(".ph")[-1]
118+
119+
# Example PURL Format: pkg:rpm/photon/apache-ant?photon=ph4
120+
purl = PackageURL(
121+
type="rpm",
122+
namespace="photon",
123+
name=pkg_name,
124+
qualifiers=qualifiers,
125+
)
126+
127+
# Get the version string (e.g. "4.0.0-1.ph2" -> "4.0.0")
128+
aff_ver = original_aff_ver.split("-")[0]
129+
res_ver = res_ver.split("-")[0]
122130
affected_version_range = RpmVersionRange(
123131
constraints=[
124132
VersionConstraint(

‎vulnerabilities/tests/test_data/vmware_photon/expected.json‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -7,154 +7,154 @@
77
{
88
"package": {
99
"type": "rpm",
10-
"namespace": "vmware",
10+
"namespace": "photon",
1111
"name": "linux",
1212
"version": "",
13-
"qualifiers": "distro=photon",
13+
"qualifiers": "photon=ph4",
1414
"subpath": ""
1515
},
16-
"affected_version_range": "vers:rpm/<5.10.224-4.ph4",
17-
"fixed_version_range": "vers:rpm/5.10.224-4.ph4",
16+
"affected_version_range": "vers:rpm/<5.10.224",
17+
"fixed_version_range": "vers:rpm/5.10.224",
1818
"introduced_by_commit_patches": [],
1919
"fixed_by_commit_patches": []
2020
},
2121
{
2222
"package": {
2323
"type": "rpm",
24-
"namespace": "vmware",
24+
"namespace": "photon",
2525
"name": "linux-devel",
2626
"version": "",
27-
"qualifiers": "distro=photon",
27+
"qualifiers": "photon=ph4",
2828
"subpath": ""
2929
},
30-
"affected_version_range": "vers:rpm/<5.10.224-4.ph4",
31-
"fixed_version_range": "vers:rpm/5.10.224-4.ph4",
30+
"affected_version_range": "vers:rpm/<5.10.224",
31+
"fixed_version_range": "vers:rpm/5.10.224",
3232
"introduced_by_commit_patches": [],
3333
"fixed_by_commit_patches": []
3434
},
3535
{
3636
"package": {
3737
"type": "rpm",
38-
"namespace": "vmware",
38+
"namespace": "photon",
3939
"name": "linux-drivers-gpu",
4040
"version": "",
41-
"qualifiers": "distro=photon",
41+
"qualifiers": "photon=ph4",
4242
"subpath": ""
4343
},
44-
"affected_version_range": "vers:rpm/<5.10.224-4.ph4",
45-
"fixed_version_range": "vers:rpm/5.10.224-4.ph4",
44+
"affected_version_range": "vers:rpm/<5.10.224",
45+
"fixed_version_range": "vers:rpm/5.10.224",
4646
"introduced_by_commit_patches": [],
4747
"fixed_by_commit_patches": []
4848
},
4949
{
5050
"package": {
5151
"type": "rpm",
52-
"namespace": "vmware",
52+
"namespace": "photon",
5353
"name": "linux-drivers-sound",
5454
"version": "",
55-
"qualifiers": "distro=photon",
55+
"qualifiers": "photon=ph4",
5656
"subpath": ""
5757
},
58-
"affected_version_range": "vers:rpm/<5.10.224-4.ph4",
59-
"fixed_version_range": "vers:rpm/5.10.224-4.ph4",
58+
"affected_version_range": "vers:rpm/<5.10.224",
59+
"fixed_version_range": "vers:rpm/5.10.224",
6060
"introduced_by_commit_patches": [],
6161
"fixed_by_commit_patches": []
6262
},
6363
{
6464
"package": {
6565
"type": "rpm",
66-
"namespace": "vmware",
66+
"namespace": "photon",
6767
"name": "linux-docs",
6868
"version": "",
69-
"qualifiers": "distro=photon",
69+
"qualifiers": "photon=ph4",
7070
"subpath": ""
7171
},
72-
"affected_version_range": "vers:rpm/<5.10.224-4.ph4",
73-
"fixed_version_range": "vers:rpm/5.10.224-4.ph4",
72+
"affected_version_range": "vers:rpm/<5.10.224",
73+
"fixed_version_range": "vers:rpm/5.10.224",
7474
"introduced_by_commit_patches": [],
7575
"fixed_by_commit_patches": []
7676
},
7777
{
7878
"package": {
7979
"type": "rpm",
80-
"namespace": "vmware",
80+
"namespace": "photon",
8181
"name": "linux-drivers-intel-sgx",
8282
"version": "",
83-
"qualifiers": "distro=photon",
83+
"qualifiers": "photon=ph4",
8484
"subpath": ""
8585
},
86-
"affected_version_range": "vers:rpm/<5.10.224-4.ph4",
87-
"fixed_version_range": "vers:rpm/5.10.224-4.ph4",
86+
"affected_version_range": "vers:rpm/<5.10.224",
87+
"fixed_version_range": "vers:rpm/5.10.224",
8888
"introduced_by_commit_patches": [],
8989
"fixed_by_commit_patches": []
9090
},
9191
{
9292
"package": {
9393
"type": "rpm",
94-
"namespace": "vmware",
94+
"namespace": "photon",
9595
"name": "linux-oprofile",
9696
"version": "",
97-
"qualifiers": "distro=photon",
97+
"qualifiers": "photon=ph4",
9898
"subpath": ""
9999
},
100-
"affected_version_range": "vers:rpm/<5.10.224-4.ph4",
101-
"fixed_version_range": "vers:rpm/5.10.224-4.ph4",
100+
"affected_version_range": "vers:rpm/<5.10.224",
101+
"fixed_version_range": "vers:rpm/5.10.224",
102102
"introduced_by_commit_patches": [],
103103
"fixed_by_commit_patches": []
104104
},
105105
{
106106
"package": {
107107
"type": "rpm",
108-
"namespace": "vmware",
108+
"namespace": "photon",
109109
"name": "linux-tools",
110110
"version": "",
111-
"qualifiers": "distro=photon",
111+
"qualifiers": "photon=ph4",
112112
"subpath": ""
113113
},
114-
"affected_version_range": "vers:rpm/<5.10.224-4.ph4",
115-
"fixed_version_range": "vers:rpm/5.10.224-4.ph4",
114+
"affected_version_range": "vers:rpm/<5.10.224",
115+
"fixed_version_range": "vers:rpm/5.10.224",
116116
"introduced_by_commit_patches": [],
117117
"fixed_by_commit_patches": []
118118
},
119119
{
120120
"package": {
121121
"type": "rpm",
122-
"namespace": "vmware",
122+
"namespace": "photon",
123123
"name": "linux-python3-perf",
124124
"version": "",
125-
"qualifiers": "distro=photon",
125+
"qualifiers": "photon=ph4",
126126
"subpath": ""
127127
},
128-
"affected_version_range": "vers:rpm/<5.10.224-4.ph4",
129-
"fixed_version_range": "vers:rpm/5.10.224-4.ph4",
128+
"affected_version_range": "vers:rpm/<5.10.224",
129+
"fixed_version_range": "vers:rpm/5.10.224",
130130
"introduced_by_commit_patches": [],
131131
"fixed_by_commit_patches": []
132132
},
133133
{
134134
"package": {
135135
"type": "rpm",
136-
"namespace": "vmware",
136+
"namespace": "photon",
137137
"name": "bpftool",
138138
"version": "",
139-
"qualifiers": "distro=photon",
139+
"qualifiers": "photon=ph4",
140140
"subpath": ""
141141
},
142-
"affected_version_range": "vers:rpm/<5.10.224-4.ph4",
143-
"fixed_version_range": "vers:rpm/5.10.224-4.ph4",
142+
"affected_version_range": "vers:rpm/<5.10.224",
143+
"fixed_version_range": "vers:rpm/5.10.224",
144144
"introduced_by_commit_patches": [],
145145
"fixed_by_commit_patches": []
146146
},
147147
{
148148
"package": {
149149
"type": "rpm",
150-
"namespace": "vmware",
150+
"namespace": "photon",
151151
"name": "linux-aws",
152152
"version": "",
153-
"qualifiers": "distro=photon",
153+
"qualifiers": "photon=ph4",
154154
"subpath": ""
155155
},
156-
"affected_version_range": "vers:rpm/<5.10.224-3.ph4",
157-
"fixed_version_range": "vers:rpm/5.10.224-3.ph4",
156+
"affected_version_range": "vers:rpm/<5.10.224",
157+
"fixed_version_range": "vers:rpm/5.10.224",
158158
"introduced_by_commit_patches": [],
159159
"fixed_by_commit_patches": []
160160
}
@@ -180,14 +180,14 @@
180180
{
181181
"package": {
182182
"type": "rpm",
183-
"namespace": "vmware",
183+
"namespace": "photon",
184184
"name": "aide",
185185
"version": "",
186-
"qualifiers": "distro=photon",
186+
"qualifiers": "photon=ph4",
187187
"subpath": ""
188188
},
189-
"affected_version_range": "vers:rpm/<0.16.2-3.ph4",
190-
"fixed_version_range": "vers:rpm/0.16.2-3.ph4",
189+
"affected_version_range": "vers:rpm/<0.16.2",
190+
"fixed_version_range": "vers:rpm/0.16.2",
191191
"introduced_by_commit_patches": [],
192192
"fixed_by_commit_patches": []
193193
}

0 commit comments

Comments
 (0)