Added command line option to provide a list of targets in a file.

README.md

@@ -76,12 +76,12 @@ wkhtmltoimage
 AutoRecon uses Python 3 specific functionality and does not support Python 2.
 
 ```
-usage: autorecon.py [-h] [-ct <number>] [-cs <number>] [--profile PROFILE]
-                    [-o OUTPUT] [--single-target] [--only-scans-dir]
-                    [--heartbeat HEARTBEAT]
+usage: autorecon.py [-h] [-t TARGET_FILE] [-ct <number>] [-cs <number>]
+                    [--profile PROFILE_NAME] [-o OUTPUT_DIR] [--single-target]
+                    [--only-scans-dir] [--heartbeat HEARTBEAT]
                     [--nmap NMAP | --nmap-append NMAP_APPEND] [-v]
                     [--disable-sanity-checks]
-                    targets [targets ...]
+                    [targets [targets ...]]
 
 Network reconnaissance tool to port scan and automatically enumerate services
 found on multiple targets.
@@ -93,15 +93,18 @@ positional arguments:
 
 optional arguments:
   -h, --help            show this help message and exit
+  -t TARGET_FILE, --targets TARGET_FILE
+                        Read targets from file.
   -ct <number>, --concurrent-targets <number>
                         The maximum number of target hosts to scan
                         concurrently. Default: 5
   -cs <number>, --concurrent-scans <number>
                         The maximum number of scans to perform per target
                         host. Default: 10
-  --profile PROFILE     The port scanning profile to use (defined in port-
+  --profile PROFILE_NAME
+                        The port scanning profile to use (defined in port-
                         scan-profiles.toml). Default: default
-  -o OUTPUT, --output OUTPUT
+  -o OUTPUT_DIR, --output OUTPUT_DIR
                         The output directory for results. Default: results
   --single-target       Only scan a single target. A directory named after the
                         target will not be created. Instead, the directory

autorecon.py

@@ -648,11 +648,12 @@ def __init__(self, address):
 if __name__ == '__main__':
 
     parser = argparse.ArgumentParser(description='Network reconnaissance tool to port scan and automatically enumerate services found on multiple targets.')
-    parser.add_argument('targets', action='store', help='IP addresses (e.g. 10.0.0.1), CIDR notation (e.g. 10.0.0.1/24), or resolvable hostnames (e.g. foo.bar) to scan.', nargs="+")
+    parser.add_argument('targets', action='store', help='IP addresses (e.g. 10.0.0.1), CIDR notation (e.g. 10.0.0.1/24), or resolvable hostnames (e.g. foo.bar) to scan.', nargs="*")
+    parser.add_argument('-t', '--targets', action='store', type=str, default='', dest='target_file', help='Read targets from file.')
     parser.add_argument('-ct', '--concurrent-targets', action='store', metavar='<number>', type=int, default=5, help='The maximum number of target hosts to scan concurrently. Default: %(default)s')
     parser.add_argument('-cs', '--concurrent-scans', action='store', metavar='<number>', type=int, default=10, help='The maximum number of scans to perform per target host. Default: %(default)s')
-    parser.add_argument('--profile', action='store', default='default', help='The port scanning profile to use (defined in port-scan-profiles.toml). Default: %(default)s')
-    parser.add_argument('-o', '--output', action='store', default='results', help='The output directory for results. Default: %(default)s')
+    parser.add_argument('--profile', action='store', default='default', dest='profile_name', help='The port scanning profile to use (defined in port-scan-profiles.toml). Default: %(default)s')
+    parser.add_argument('-o', '--output', action='store', default='results', dest='output_dir', help='The output directory for results. Default: %(default)s')
     parser.add_argument('--single-target', action='store_true', default=False, help='Only scan a single target. A directory named after the target will not be created. Instead, the directory structure will be created within the output directory. Default: false')
     parser.add_argument('--only-scans-dir', action='store_true', default=False, help='Only create the "scans" directory for results. Other directories (e.g. exploit, loot, report) will not be created. Default: false')
     parser.add_argument('--heartbeat', action='store', type=int, default=60, help='Specifies the heartbeat interval (in seconds) for task status messages. Default: %(default)s')
@@ -679,7 +680,7 @@ def __init__(self, address):
         error('Argument -ct/--concurrent-scans: must be at least 1.')
         errors = True
 
-    port_scan_profile = args.profile
+    port_scan_profile = args.profile_name
 
     found_scan_profile = False
     for profile in port_scan_profiles_config:
@@ -730,21 +731,29 @@ def __init__(self, address):
     if args.nmap_append:
         nmap += " " + args.nmap_append
 
-    outdir = args.output
+    outdir = args.output_dir
     srvname = ''
     verbose = args.verbose
 
-    if len(args.targets) == 0:
-        error('You must specify at least one target to scan!')
-        errors = True
-
-    if single_target and len(args.targets) != 1:
-        error('You cannot provide more than one target when scanning in single-target mode.')
-        sys.exit(1)
-
+    raw_targets = args.targets
     targets = []
 
-    for target in args.targets:
+    if len(args.target_file) > 0:
+        if not os.path.isfile(args.target_file):
+            error('The target file {args.target_file} was not found.')
+            sys.exit(1)
+        try:
+            with open(args.target_file, 'r') as f:
+                lines = f.read()
+                for line in lines.splitlines():
+                    if line.startswith('#') or len(line) == 0: continue
+                    if line not in raw_targets:
+                        raw_targets.append(line)
+        except OSError:
+            error('The target file {args.target_file} could not be read.')
+            sys.exit(1)
+
+    for target in raw_targets:
         try:
             ip = str(ipaddress.ip_address(target))
 
@@ -773,6 +782,14 @@ def __init__(self, address):
                     error(target + ' does not appear to be a valid IP address, IP range, or resolvable hostname.')
                     errors = True
 
+    if len(targets) == 0:
+        error('You must specify at least one target to scan!')
+        errors = True
+
+    if single_target and len(targets) != 1:
+        error('You cannot provide more than one target when scanning in single-target mode.')
+        sys.exit(1)
+
     if not args.disable_sanity_checks and len(targets) > 256:
         error('A total of ' + str(len(targets)) + ' targets would be scanned. If this is correct, re-run with the --disable-sanity-checks option to suppress this check.')
         errors = True