diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ba0430d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +__pycache__/ \ No newline at end of file diff --git a/apachetomcatscanner/Reporter.py b/apachetomcatscanner/Reporter.py index 82b1709..4733502 100644 --- a/apachetomcatscanner/Reporter.py +++ b/apachetomcatscanner/Reporter.py @@ -32,8 +32,7 @@ def report_result(self, computer_ip, computer_port, result, credentials_found): finding["computer_port"] = computer_port finding["credentials_found"] = credentials_found - cve_list = self.vulns_db.get_vulnerabilities_of_version_sorted_by_criticity(finding["version"], colors=False, reverse=True) - finding["cves"] = [cve["cve"]["id"] for cve in cve_list] + finding["cves"] = self.vulns_db.get_vulnerabilities_of_version_sorted_by_criticity(finding["version"], colors=False, reverse=True) if computer_ip not in self.data.keys(): self.data[computer_ip] = {} @@ -116,7 +115,7 @@ def export_xlsx(self, path_to_file): for computername in self.data.keys(): computer = self.data[computername] for _, finding in computer.items(): - cve_str = ', '.join(finding["cves"]) + cve_str = ', '.join([cve["cve"]["id"] for cve in finding["cves"]]) credentials_str = ', '.join([f"{cred[1]} ({cred[0]})" for cred in finding["credentials_found"]]) data = [ @@ -163,7 +162,7 @@ def export_sqlite(self, path_to_file): for computername in self.data.keys(): computer = self.data[computername] for _, finding in computer.items(): - cve_str = ', '.join(finding["cves"]) + cve_str = ', '.join([cve["cve"]["id"] for cve in finding["cves"]]) credentials_str = ', '.join([f"{cred[1]} ({cred[0]})" for cred in finding["credentials_found"]]) cursor.execute("INSERT INTO results VALUES (?, ?, ?, ?, ?, ?)", (