Skip to content

Commit

Permalink
🐛 Fix RedHatSatellite components
Browse files Browse the repository at this point in the history
  • Loading branch information
@manuel-sommer
manuel-sommer committed May 2, 2024
1 parent 55ee81d commit 0c53a41
Show file tree
Hide file tree
Showing 3 changed files with 266 additions and 1 deletion.
2 changes: 1 addition & 1 deletion dojo/tools/redhatsatellite/parser.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,13 @@ def get_findings(self, filename, test):
description += "**installable:** " + str(installable) + "\n"
description += "**bugs:** " + str(bugs) + "\n"
description += "**module_streams:** " + str(module_streams) + "\n"
description += "**packages:** " + ', '.join(packages)
find = Finding(
title=title,
test=test,
description=description,
severity=self.severity_mapping(input=severity),
mitigation=solution,
component_name=packages,
dynamic_finding=True,
)
if errata_id is not None:
Expand Down
258 changes: 258 additions & 0 deletions unittests/scans/redhatsatellite/many_packages.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,258 @@
{
"total": 24,
"subtotal": 24,
"selectable": 24,
"page": "1",
"per_page": "100",
"error": null,
"search": null,
"sort": {
"by": "updated",
"order": "desc"
},
"results": [
{
"id": 1234,
"pulp_id": "RHBA-1999:5678",
"title": "glibc bug fix update",
"errata_id": "RHBA-1999:5678",
"issued": "1999-03-05",
"updated": "1999-03-05",
"severity": "None",
"description": "description",
"solution": "solution",
"summary": "summary",
"reboot_suggested": true,
"uuid": "RHBA-1999:5678",
"name": "bug fix update",
"type": "bugfix",
"cves": [],
"bugs": [],
"hosts_available_count": 9,
"hosts_applicable_count": 9,
"packages": [
"asdf-1.11-11.el1_1.11.i111",
"asdf-1.11-11.el1_1.11.x11_11",
"asdf-asdf-fjewios-1.11-11.el1_1.11.x11_11",
"asdf-asdf-1.11-11.el1_1.11.x11_11",
"asdf-asdf-1.11-11.el1_1.11.x11_11",
"asdf-asdf-1.11-11.el1_1.11.i111",
"asdf-asdf-1.11-11.el1_1.11.x11_11",
"asdf-asdf-1.11-11.el1_1.11.asdf",
"asdf-asdf-asdf-1.11-11.el1_1.11.i111",
"asdf-asdf-asdf-1.11-11.el1_1.11.x11_11",
"asdf-asdf-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-aa-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-af-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-agr-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ak-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-am-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-an-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-anp-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ar-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-as-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ast-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ayc-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-az-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-be-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-bem-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ber-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-bg-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-bhb-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-bho-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-bi-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-bn-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-bo-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-br-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-brx-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-bs-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-byn-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ca-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ce-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-chr-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ckb-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-cmn-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-crh-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-cs-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-csb-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-cv-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-cy-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-da-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-de-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-doi-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-dsb-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-dv-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-dz-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-el-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-en-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-eo-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-es-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-et-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-eu-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-fa-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ff-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-fi-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-fil-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-fo-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-fr-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-fur-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-fy-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ga-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-gd-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-gez-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-gl-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-gu-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-gv-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ha-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-hak-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-he-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-hi-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-hif-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-hne-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-hr-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-hsb-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ht-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-hu-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-hy-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ia-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-id-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ig-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ik-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-is-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-it-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-iu-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ja-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ka-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-kab-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-kk-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-kl-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-km-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-kn-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ko-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-kok-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ks-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ku-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-kw-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ky-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-lb-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-lg-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-li-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-lij-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ln-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-lo-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-lt-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-lv-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-lzh-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mag-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mai-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mfe-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mg-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mhr-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mi-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-miq-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mjw-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mk-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ml-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mn-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mni-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mnw-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mr-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ms-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-mt-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-my-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-nan-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-nb-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-nds-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ne-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-nhn-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-niu-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-nl-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-nn-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-nr-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-nso-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-oc-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-om-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-or-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-os-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-pa-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-pap-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-pl-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ps-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-pt-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-quz-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-raj-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ro-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ru-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-rw-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sa-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sah-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sat-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sc-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sd-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-se-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sgs-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-shn-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-shs-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-si-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sid-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sk-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sl-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sm-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-so-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sq-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sr-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ss-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-st-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sv-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-sw-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-szl-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ta-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-tcy-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-te-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-tg-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-th-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-the-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ti-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-tig-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-tk-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-tl-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-tn-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-to-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-tpi-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-tr-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ts-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-tt-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ug-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-uk-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-unm-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ur-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-uz-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-ve-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-vi-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-wa-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-wae-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-wal-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-wo-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-xh-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-yi-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-yo-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-yue-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-yuw-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-zh-1.11-11.el1_1.11.x11_11",
"asdf-fjewio-zu-1.11-11.el1_1.11.x11_11",
"asdf-locale-source-1.11-11.el1_1.11.x11_11",
"asdf-asdf-fjewio-1.11-11.el1_1.11.x11_11",
"asdf-asdf-1.11-11.el1_1.11.i111",
"asdf-asdf-1.11-11.el1_1.11.x11_11",
"asdf--1.11-11.el1_1.11.i111",
"asdf--1.11-11.el1_1.11.x11_11",
"asdf-1.11-11.el1_1.11.x11_11",
"asfd-1.11-11.el1_1.11.i111",
"asdf-1.11-11.el1_1.11.x11_11",
"asdf-1.11-11.el1_1.11.x11_11"
],
"module_streams": [],
"installable": true
}
]
}
7 changes: 7 additions & 0 deletions unittests/tools/test_redhatsatellite_parser.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,10 @@ def test_parse_file_with_multiple_findingse(self):
self.assertEqual("RHSA-1966:12313", findings[0].unsaved_vulnerability_ids[0])
self.assertEqual("CVE-1990-1", findings[0].unsaved_vulnerability_ids[1])
self.assertEqual("CVE-1990-2", findings[0].unsaved_vulnerability_ids[2])

def test_parse_file_with_many_packages(self):
with open("unittests/scans/redhatsatellite/many_packages.json") as testfile:
parser = RedHatSatelliteParser()
findings = parser.get_findings(testfile, Test())
self.assertEqual(1, len(findings))
self.assertEqual("RHBA-1999:5678", findings[0].unsaved_vulnerability_ids[0])

0 comments on commit 0c53a41

Please sign in to comment.