Merge pull request #46 from yvonneKim/master

Convert scan output to strings from bytes

Author: codingo

reconnoitre/find_dns.py

@@ -27,7 +27,7 @@ def find_dns(target_hosts, output_directory, quiet):
 
         print("   [>] Testing %s for DNS" % ip_address)
         DNSSCAN = "nmap -n -sV -Pn -vv -p53 %s" % (ip_address)
-        results = subprocess.check_output(DNSSCAN, shell=True)
+        results = subprocess.check_output(DNSSCAN, shell=True).decode("utf-8")
         lines = results.split("\n")
 
         for line in lines:

reconnoitre/hostname_scan.py

@@ -21,7 +21,7 @@ def hostname_scan(target_hosts, output_directory, quiet):
     else:
         SWEEP = "nbtscan -q %s" % (target_hosts)
 
-    results = subprocess.check_output(SWEEP, shell=True)
+    results = subprocess.check_output(SWEEP, shell=True).decode("utf-8")
     lines = results.split("\n")
 
     for line in lines:

reconnoitre/ping_sweeper.py

@@ -23,6 +23,7 @@ def ping_sweeper(target_hosts, output_directory, quiet):
 
 def call_nmap_sweep(target_hosts):
     SWEEP = "nmap -n -sP %s" % (target_hosts)
+
     results = subprocess.check_output(SWEEP, shell=True)
     lines = str(results, "utf-8").split("\n")
     return lines
@@ -42,5 +43,4 @@ def get_ip_from_nmap_line(line):
 def write_live_hosts_list_to_file(output_file, live_hosts):
     print("[+] Writing discovered targets to: %s" % output_file)
     with open(output_file, 'w') as f:
-        f.write("\n".join(live_hosts))
-
+        f.write("\n".join(live_hosts))

reconnoitre/service_scan.py

@@ -15,7 +15,7 @@ def nmap_scan(ip_address, output_directory, dns_server, quick, no_udp_service_sc
 
    print("[+] Starting quick nmap scan for %s" % (ip_address))
    QUICKSCAN = "nmap -sC -sV %s -oA '%s/%s.quick'"  % (ip_address, output_directory, ip_address)
-   quickresults = subprocess.check_output(QUICKSCAN, shell=True)
+   quickresults = subprocess.check_output(QUICKSCAN, shell=True).decode("utf-8")
 
    write_recommendations(quickresults, ip_address, output_directory)
    print("[*] TCP quick scans completed for %s" % ip_address)
@@ -33,8 +33,8 @@ def nmap_scan(ip_address, output_directory, dns_server, quick, no_udp_service_sc
        TCPSCAN = "nmap -vv -Pn -sS -A -sC -p- -T 3 -script-args=unsafe=1 -n %s -oN '%s/%s.nmap' -oX '%s/%s_nmap_scan_import.xml' %s"  % (dns_server, output_directory, ip_address, output_directory, ip_address, ip_address)
        UDPSCAN = "nmap -sC -sV -sU %s -oA '%s/%s-udp'" % (ip_address, output_directory, ip_address)
 
-   udpresults = "" if no_udp_service_scan is True else subprocess.check_output(UDPSCAN, shell=True)
-   tcpresults = subprocess.check_output(TCPSCAN, shell=True)
+   udpresults = "" if no_udp_service_scan is True else subprocess.check_output(UDPSCAN, shell=True).decode("utf-8")
+   tcpresults = subprocess.check_output(TCPSCAN, shell=True).decode("utf-8")
 
    write_recommendations(tcpresults + udpresults, ip_address, output_directory)
    print("[*] TCP%s scans completed for %s" % (("" if no_udp_service_scan is True else "/UDP"), ip_address))

reconnoitre/snmp_walk.py

@@ -64,7 +64,7 @@ def snmp_scans(ip_address, output_directory):
     SCAN = "snmpwalk -c public -v1 %s 1.3.6.1.2.1.25.1.6.0 > '%s%s-systemprocesses.txt'"  % (ip_address, output_directory, ip_address)
 
     try:
-        results = subprocess.check_output(SCAN, stderr=subprocess.STDOUT, shell=True).decode('utf-8')
+        results = subprocess.check_output(SCAN, stderr=subprocess.STDOUT, shell=True).decode("utf-8").decode('utf-8')
     except Exception as e:
         print("[+] No Response from %s" % ip_address)
     except subprocess.CalledProcessError as cpe: