diff --git a/Interlace/lib/core/.input.py.swp b/Interlace/lib/core/.input.py.swp new file mode 100644 index 0000000..8b239c6 Binary files /dev/null and b/Interlace/lib/core/.input.py.swp differ diff --git a/Interlace/lib/core/__version__.py b/Interlace/lib/core/__version__.py index 24a343f..c01247e 100644 --- a/Interlace/lib/core/__version__.py +++ b/Interlace/lib/core/__version__.py @@ -1,2 +1,2 @@ -__version__ = '0.01' +__version__ = '1.0' diff --git a/Interlace/lib/core/input.py b/Interlace/lib/core/input.py index 5990cfd..97e30a8 100644 --- a/Interlace/lib/core/input.py +++ b/Interlace/lib/core/input.py @@ -19,8 +19,10 @@ class InputHelper(object): return arg @staticmethod - def expand_targets(targets): - # expand CIDR from net addr + def expand_targets(targets, dont_expand_cidr): + if not dont_expand_cidr: + # expand CIDR from net addr + pass # expand comma notation # return list of unique hosts @@ -38,7 +40,7 @@ class InputHelper(object): targets.add(target.strip()) # take list of targets and expand CIDR / comma notation - targets = set(arguments.expand_targets(targets)) + targets = set(arguments.expand_targets(targets, arguments.nocidr)) return targets @@ -69,7 +71,8 @@ class InputParser(object): targets.add_argument( '-t', dest='target', required=False, - help='Specify a target or domain name.' + help='Specify a target or domain name either in comma format, ' + 'CIDR notation, or a single target.' ) targets.add_argument( @@ -108,6 +111,12 @@ class InputParser(object): ) + parser.add_argument( + '--no-cidr', dest='nocidr', action='store_true', default=False, + help='If set then CIDR notation in a target file will not be automatically ' + 'be expanded into individual hosts.' + ) + parser.add_argument( '--no-color', dest='nocolor', action='store_true', default=False, help='If set then any foreground or background colours will be ' diff --git a/README.md b/README.md index 48b19d7..657059e 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ A threading management application that allows controlled execution of multiple | Argument | Description | |------------|--------------------------------------------------------------------------------------------------------------| -| -t | Specify a target or domain name | +| -t | Specify a target or domain name either in comma format, CIDR notation, or as an individual host. | | -tL | Specify a list of targets or domain names | | -threads | Specify the maximum number of threads to run at any one time (DEFAULT:5) | | -timeout | Specify a timeout value in seconds for any one thread (DEFAULT:600) |