Skip to content
Snippets Groups Projects
Commit 18f7f7d8 authored by Gioacchino Vino's avatar Gioacchino Vino
Browse files

Merge branch 'debug_paas_ci' into 'main'

Reviewed scan python code

See merge request !112
parents bf14cf90 69e80a44
No related branches found
No related tags found
1 merge request!112Reviewed scan python code
...@@ -207,13 +207,13 @@ class Task: ...@@ -207,13 +207,13 @@ class Task:
logging.debug(f"Waiting for the task ends. Now {int(time() - start_time)}s from start. Status: {self.status}") logging.debug(f"Waiting for the task ends. Now {int(time() - start_time)}s from start. Status: {self.status}")
sleep(10) sleep(10)
def save_report(self, report_format: str, report_filename: str): def save_report(self, format: str, filename: str):
res = self.client.get_report(self.report_id, res = self.client.get_report(self.report_id,
report_format_id=report_format, report_format_id=format,
ignore_pagination=True, ignore_pagination=True,
details="1") details=True)
code = str(res.xpath('report/text()')[0]) code = str(res.xpath('report/text()')[0])
with open(report_filename, "wb") as fh: with open(filename, "wb") as fh:
fh.write(base64.b64decode(code)) fh.write(base64.b64decode(code))
def get_report_info(self) -> Dict: def get_report_info(self) -> Dict:
......
...@@ -76,7 +76,7 @@ for host,ports in endpoints.items(): ...@@ -76,7 +76,7 @@ for host,ports in endpoints.items():
target_name = f"{auth_name}_target_{host}" target_name = f"{auth_name}_target_{host}"
task_name = f"{auth_name}_task_{host}" task_name = f"{auth_name}_task_{host}"
port_list_name = f"{auth_name}_pl_{host}" port_list_name = f"{auth_name}_pl_{host}"
report_filename = f"{output_dir}/{host}-report.pdf" report_filename = f"{output_dir}/{host}-report"
summary_filename = f"{output_dir}/summary-report.json" summary_filename = f"{output_dir}/summary-report.json"
port_list = gvm_client.get_or_create_port_list(port_list_name, ports) port_list = gvm_client.get_or_create_port_list(port_list_name, ports)
...@@ -91,7 +91,10 @@ for host,ports in endpoints.items(): ...@@ -91,7 +91,10 @@ for host,ports in endpoints.items():
if task.status == 'New': if task.status == 'New':
task.start() task.start()
if task.wait(WAIT_TIMEOUT): if task.wait(WAIT_TIMEOUT):
task.save_report(ReportFormats.pdf, report_filename) task.save_report(format = ReportFormats.pdf,
filename = f"{report_filename}.pdf")
task.save_report(format = ReportFormats.txt,
filename = f"{report_filename}.txt")
reports[host] = task.get_report_info() reports[host] = task.get_report_info()
else: else:
reports[host] = f"ERROR Task: {task.id}" reports[host] = f"ERROR Task: {task.id}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment