From 3f164b24aa5ac948762b86bee0738231ea9cae17 Mon Sep 17 00:00:00 2001 From: Gioacchino Vino <gioacchino.vino@infn.it> Date: Mon, 29 Apr 2024 16:15:26 +0200 Subject: [PATCH] Added logic accepted/know issues during oid validation --- files/gvm_library.py | 7 +++++-- files/scan.py | 10 +++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/files/gvm_library.py b/files/gvm_library.py index 902e678..b3558c4 100644 --- a/files/gvm_library.py +++ b/files/gvm_library.py @@ -449,7 +449,7 @@ class Task: def get_report_info(self, accepted_issues: List[str], - known_issues: List[str]) -> Tuple[Dict,List[str]]: + known_issues: List[str]) -> Tuple[Dict,List[str],List[str]]: report = dict() accepted_oids = [] new_oids = [] @@ -489,7 +489,10 @@ class Task: glob_severity = s glob_threat = t report['global'] = {'threat': glob_threat, 'severity': glob_severity} - + logging.debug("accepted") + logging.debug(accepted_oids) + logging.debug("new") + logging.debug(new_oids) return report, accepted_oids, new_oids class GVMClient(): diff --git a/files/scan.py b/files/scan.py index 2a98c2f..b4e9083 100644 --- a/files/scan.py +++ b/files/scan.py @@ -132,6 +132,14 @@ for host,ports in endpoints.items(): task.get_report_info(accepted_issues, known_issues) accepted_oids += task_accepted_oids new_oids += task_new_oids + logging.debug("task_accepted_oids") + logging.debug(task_accepted_oids) + logging.debug("task_new_oids") + logging.debug(task_new_oids) + logging.debug("accepted_oids") + logging.debug(accepted_oids) + logging.debug("new_oids") + logging.debug(new_oids) else: reports[host] = {'global': {"severity": -1, "threat": f"Scan Error. task.id: {task.id}"} } @@ -153,7 +161,7 @@ if len(accepted_oids) > 1: f.writelines([msg + "\n" for msg in accepted_oids]) f.write("\n") -if len(accepted_oids) > 1: +if len(new_oids) > 1: with open(oids_filename, "a") as f: f.write("NEW OIDs\n") f.writelines([msg + "\n" for msg in new_oids]) \ No newline at end of file -- GitLab