Added --no-cidr

This commit is contained in:
codingo
2019-01-06 12:16:04 +10:00
parent 950f547008
commit 7b084d73d2
4 changed files with 15 additions and 6 deletions

Binary file not shown.

View File

@@ -1,2 +1,2 @@
__version__ = '0.01' __version__ = '1.0'

View File

@@ -19,8 +19,10 @@ class InputHelper(object):
return arg return arg
@staticmethod @staticmethod
def expand_targets(targets): def expand_targets(targets, dont_expand_cidr):
# expand CIDR from net addr if not dont_expand_cidr:
# expand CIDR from net addr
pass
# expand comma notation # expand comma notation
# return list of unique hosts # return list of unique hosts
@@ -38,7 +40,7 @@ class InputHelper(object):
targets.add(target.strip()) targets.add(target.strip())
# take list of targets and expand CIDR / comma notation # 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 return targets
@@ -69,7 +71,8 @@ class InputParser(object):
targets.add_argument( targets.add_argument(
'-t', dest='target', required=False, '-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( 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( parser.add_argument(
'--no-color', dest='nocolor', action='store_true', default=False, '--no-color', dest='nocolor', action='store_true', default=False,
help='If set then any foreground or background colours will be ' help='If set then any foreground or background colours will be '

View File

@@ -7,7 +7,7 @@ A threading management application that allows controlled execution of multiple
| Argument | Description | | 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 | | -tL | Specify a list of targets or domain names |
| -threads | Specify the maximum number of threads to run at any one time (DEFAULT:5) | | -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) | | -timeout | Specify a timeout value in seconds for any one thread (DEFAULT:600) |