diff --git a/vulnwhisp/frameworks/openvas.py b/vulnwhisp/frameworks/openvas.py index a415f79..8ac4780 100644 --- a/vulnwhisp/frameworks/openvas.py +++ b/vulnwhisp/frameworks/openvas.py @@ -21,6 +21,7 @@ class OpenVAS_API(object): port=None, username=None, password=None, + report_format_id=None, verbose=True): if username is None or password is None: raise Exception('ERROR: Missing username or password.') @@ -30,6 +31,7 @@ class OpenVAS_API(object): self.base = 'https://{hostname}:{port}'.format(hostname=hostname, port=port) self.verbose = verbose self.processed_reports = 0 + self.report_format_id = report_format_id self.headers = { 'Origin': self.base, @@ -155,7 +157,7 @@ class OpenVAS_API(object): ('report_id', report_id), ('filter', 'apply_overrides=0 min_qod=70 autofp=0 levels=hml first=1 rows=50 sort-reverse=severity'), ('ignore_pagination', '1'), - ('report_format_id', 'c1645568-627a-11e3-a660-406186ea4fc5'), + ('report_format_id', '{report_format_id}'.format(report_format_id=self.report_format_id)), ('submit', 'Download'), ) print('Retrieving %s' % report_id) diff --git a/vulnwhisp/vulnwhisp.py b/vulnwhisp/vulnwhisp.py index fdd97bc..f01dbd9 100755 --- a/vulnwhisp/vulnwhisp.py +++ b/vulnwhisp/vulnwhisp.py @@ -653,11 +653,14 @@ class vulnWhispererOpenVAS(vulnWhispererBase): super(vulnWhispererOpenVAS, self).__init__(config=config) self.port = int(self.config.get(self.CONFIG_SECTION, 'port')) - self.template_id = self.config.get(self.CONFIG_SECTION, 'report_format_id') + self.report_format_id = self.config.get(self.CONFIG_SECTION, 'report_format_id') self.develop = True self.purge = purge self.scans_to_process = None - self.openvas_api = OpenVAS_API(hostname=self.hostname, port=self.port, username=self.username, + self.openvas_api = OpenVAS_API(hostname=self.hostname, + port=self.port, + report_format_id=self.report_format_id, + username=self.username, password=self.password) def whisper_reports(self, output_format='json', launched_date=None, report_id=None, cleanup=True):