From 1e40494a5f0af31feb5f7a08138b2a75a0aae991 Mon Sep 17 00:00:00 2001 From: BrashEndeavours Date: Sun, 28 Jul 2019 13:03:37 -0400 Subject: [PATCH 1/3] Update reconnoitre.py --- Reconnoitre/reconnoitre.py | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/Reconnoitre/reconnoitre.py b/Reconnoitre/reconnoitre.py index 1054f4e..d6802fb 100644 --- a/Reconnoitre/reconnoitre.py +++ b/Reconnoitre/reconnoitre.py @@ -65,6 +65,8 @@ def util_checks(util=None): def main(): parser = CliArgumentParser() arguments = parser.parse(sys.argv[1:]) + dns_servers = '' + if arguments.output_directory.endswith('/' or '\\'): arguments.output_directory = arguments.output_directory[:-1] @@ -96,29 +98,20 @@ def main(): if arguments.find_dns_servers is True: print("[#] Identifying DNS Servers") - find_dns( + dns_servers = find_dns( arguments.target_hosts, arguments.output_directory, arguments.quiet) if arguments.perform_service_scan is True: print("[#] Performing service scans") - if arguments.find_dns_servers is True: - service_scan( - arguments.target_hosts, - arguments.output_directory, - arguments.find_dns_servers, - arguments.quiet, - arguments.quick, - arguments.no_udp_service_scan) - else: - service_scan( - arguments.target_hosts, - arguments.output_directory, - '', - arguments.quiet, - arguments.quick, - arguments.no_udp_service_scan) + service_scan( + arguments.target_hosts, + arguments.output_directory, + arguments.find_dns_servers, + arguments.quiet, + arguments.quick, + arguments.no_udp_service_scan) if arguments.perform_snmp_walk is True: print("[#] Performing SNMP walks") From 4889dfb44e3354de9cd2ad4e505a0722a427c7aa Mon Sep 17 00:00:00 2001 From: BrashEndeavours Date: Sun, 28 Jul 2019 13:07:14 -0400 Subject: [PATCH 2/3] Add support for return value to find_dns() --- Reconnoitre/lib/find_dns.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Reconnoitre/lib/find_dns.py b/Reconnoitre/lib/find_dns.py index c7085ed..45dc213 100644 --- a/Reconnoitre/lib/find_dns.py +++ b/Reconnoitre/lib/find_dns.py @@ -6,6 +6,7 @@ def find_dns(target_hosts, output_directory, quiet): check_directory(output_directory) + dns_server_list = [] results = 0 hostcount = 0 dnscount = 0 @@ -42,8 +43,10 @@ def find_dns(target_hosts, output_directory, quiet): (ip_address)) output_file.write(" [>] %s\n" % (line)) output_targets.write("%s\n" % (ip_address)) + dns_server_list.append(ip_address) dnscount += 1 print("[*] Found %s DNS servers within %s hosts" % (str(dnscount), str(hostcount))) output_file.close() output_targets.close() + return '' if len(dns_server_list) == 0 else ','.join(dns_server_list) From acecc1703f07b71335ed42705b3ba66f7e8fd2e4 Mon Sep 17 00:00:00 2001 From: BrashEndeavours Date: Sun, 28 Jul 2019 13:19:49 -0400 Subject: [PATCH 3/3] Update reconnoitre.py --- Reconnoitre/reconnoitre.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reconnoitre/reconnoitre.py b/Reconnoitre/reconnoitre.py index d6802fb..6d3d6df 100644 --- a/Reconnoitre/reconnoitre.py +++ b/Reconnoitre/reconnoitre.py @@ -108,7 +108,7 @@ def main(): service_scan( arguments.target_hosts, arguments.output_directory, - arguments.find_dns_servers, + dns_servers, arguments.quiet, arguments.quick, arguments.no_udp_service_scan)