Merge pull request #84 from neutrinoguy/master

Fixed two runtime errors due to minor syntactic errors.

Author: codingo

Reconnoitre/lib/file_helper.py

@@ -121,8 +121,8 @@ def write_recommendations(results, ip_address, outputdir):
                 for port in ports:
                     port = port.split("/")[0]
 
-                    description = "[*] "
-                    + j["services"][service]["description"]
+                    description = ("[*] " 
+                                   + j["services"][service]["description"])
                     print(description % {"ip": ip_address, "port": port})
                     f.write((description + "\n") %
                             {"ip": ip_address, "port": port})

Reconnoitre/lib/service_scan.py

@@ -36,18 +36,18 @@ def nmap_scan(
              ip_address,
              dns_server))
         print("[+] Using DNS server %s" % (dns_server))
-        TCPSCAN = "nmap -vv -Pn -sS -A -sC -p- -T 3 -script-args=unsafe=1 "
-        "--dns-servers %s -oN '%s/%s.nmap' -oX "
-        "'%s/%s_nmap_scan_import.xml' %s" % (
+        TCPSCAN = "nmap -vv -Pn -sS -A -sC -p- -T 3 -script-args=unsafe=1 \
+        --dns-servers %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 -vv -Pn -A -sC -sU -T 4 --top-ports 200 "
-        "--max-retries 0 --dns-servers %s -oN '%s/%sU.nmap' "
-        "-oX '%s/%sU_nmap_scan_import.xml' %s" % (
+        UDPSCAN = "nmap -vv -Pn -A -sC -sU -T 4 --top-ports 200 \
+        --max-retries 0 --dns-servers %s -oN '%s/%sU.nmap' \
+        -oX '%s/%sU_nmap_scan_import.xml' %s" % (
             dns_server,
             output_directory,
             ip_address,
@@ -57,9 +57,9 @@ def nmap_scan(
     else:
         print("[+] Starting detailed TCP%s nmap scans for %s" % (
             ("" if no_udp_service_scan is True else "/UDP"), ip_address))
-        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" % (
+        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,