From 4e988dca38c644c72e535d8bfaacd343672df12a Mon Sep 17 00:00:00 2001 From: daniel_sagi Date: Mon, 23 Jul 2018 16:45:13 +0300 Subject: [PATCH] moved all start status logging to the default module --- kube-hunter.py | 1 - report/default.py | 14 ++++++++++++-- src/modules/discovery/hosts.py | 4 +--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/kube-hunter.py b/kube-hunter.py index a7703a6..1814c68 100644 --- a/kube-hunter.py +++ b/kube-hunter.py @@ -65,7 +65,6 @@ def main(): if not any(scan_options): if not interactive_set_config(): return - logging.info("~ Started") hunt_started = True handler.publish_event(HuntStarted()) handler.publish_event(HostScanEvent()) diff --git a/report/default.py b/report/default.py index 2889518..9a59dd4 100644 --- a/report/default.py +++ b/report/default.py @@ -8,7 +8,7 @@ from prettytable import ALL, PrettyTable from __main__ import config from src.core.events import handler -from src.core.events.types import Service, Vulnerability, HuntFinished +from src.core.events.types import Service, Vulnerability, HuntFinished, HuntStarted # [event, ...] services = list() @@ -97,7 +97,17 @@ class SendFullReport(object): self.event = event def execute(self): - logging.info("\nReport:\n{div}\n{tables}".format(div="-" * MAX_TABLE_WIDTH, tables=reporter.get_tables())) + logging.info("\n{div}\n{tables}".format(div="-" * 10, tables=reporter.get_tables())) + + +@handler.subscribe(HuntStarted) +class StartedInfo(object): + def __init__(self, event): + self.event = event + + def execute(self): + logging.info("~ Started") + logging.info("~ Discovering Open Kubernetes Services...") """ Tables Generation """ diff --git a/src/modules/discovery/hosts.py b/src/modules/discovery/hosts.py index 90fe8b3..14fd6f7 100644 --- a/src/modules/discovery/hosts.py +++ b/src/modules/discovery/hosts.py @@ -47,9 +47,7 @@ class HostDiscovery(Hunter): def __init__(self, event): self.event = event - def execute(self): - logging.info("~ Discovering Open Kubernetes Services...") - + def execute(self): if config.cidr: try: ip, sn = config.cidr.split('/')