PEP8 refactoring

Author: codingo

reconnoitre/directory_helper.py

@@ -8,12 +8,14 @@ def check_directory(output_directory):
         os.mkdir(output_directory)
         print("[!] %s didn't exist and has been created." % output_directory)
 
+
 def load_targets(target_hosts, output_directory, quiet):
     if(os.path.isdir(target_hosts) or os.path.isfile(target_hosts)):
         return target_hosts
     else:
         return output_directory + "/targets.txt"
 
+
 def create_dir_structure(ip_address, output_directory):
     print("[+] Creating directory structure for " + ip_address)
 
@@ -43,7 +45,7 @@ def create_dir_structure(ip_address, output_directory):
         os.stat(lootdir)
     except:
         os.mkdir(lootdir)
-    #todo: check if proof file already exists and don't overwrite if it does
+
     prooffile = hostdir + "/proof.txt"
     print("   [>] Creating proof file at: %s" % prooffile)
     open(prooffile, 'a').close()

reconnoitre/find_dns.py

@@ -9,13 +9,13 @@ def find_dns(target_hosts, output_directory, quiet):
     check_directory(output_directory)
     results = 0
     hostcount = 0
-    
+
     output_file = open(output_directory + "/DNS-Detailed.txt", 'w')
     output_targets = open(output_directory + "/DNS-targets.txt", 'w')
 
     targets = load_targets(target_hosts, output_directory, quiet)
     target_file = open(targets, 'r')
-    
+
     print("[*] Loaded targets from: %s" % targets)
     print("[+] Enumerating TCP port 53 over targets to find dns servers")
 

reconnoitre/ping_sweeper.py

@@ -30,5 +30,4 @@ def ping_sweeper(target_hosts, output_directory, quiet):
             live_hosts += 1
     print("[*] Found %s live hosts" % (live_hosts))
     print("[*] Created target list %s" % (output_file))
-    f.close()
-
+    f.close()

reconnoitre/reconnoitre.py

@@ -11,6 +11,7 @@ def print_banner():
     print("|\"\"\"\-=  RECONNOITRE")
     print("(____)      An OSCP scanner\n")
 
+
 def main():
     parser = ArgumentParser()
     parser.add_argument("-t", dest="target_hosts", required=True, help="Set a target range of addresses to target. Ex 10.11.1.1-255" )
@@ -45,5 +46,7 @@ def main():
             service_scan(arguments.target_hosts, arguments.output_directory, arguments.dns, arguments.quiet)
         else:
             service_scan(arguments.target_hosts, arguments.output_directory, '', arguments.quiet)
+
+
 if __name__ == "__main__":
     main()

reconnoitre/service_scan.py

@@ -128,13 +128,15 @@ def nmapScan(ip_address, outputdir, dns_server):
    print("[*] TCP/UDP Nmap scans completed for %s" % ip_address)
    return
 
+
 def valid_ip(address):
     try:
         socket.inet_aton(address)
         return True
     except socket.error:
         return False
 
+
 def target_file(target_hosts, output_directory, dns_server, quiet):    
     targets = load_targets(target_hosts, output_directory, quiet)
     target_file = open(targets, 'r')
@@ -159,6 +161,7 @@ def target_file(target_hosts, output_directory, dns_server, quiet):
        p.start()
     target_file.close() 
 
+
 def target_ip(target_hosts, output_directory, dns_server, quiet):
     print("[*] Loaded single target: %s" % target_hosts)
     target_hosts = target_hosts.strip()    
@@ -172,6 +175,7 @@ def target_ip(target_hosts, output_directory, dns_server, quiet):
     jobs.append(p)
     p.start()
 
+
 def service_scan(target_hosts, output_directory, dns_server, quiet):
     check_directory(output_directory)