aljaz/Interlace
1
1
Fork 0
mirror of https://github.com/codingo/Interlace.git synced 2025-12-18 07:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed target itteration bug

Browse Source
This commit is contained in:
codingo
2019-01-06 14:23:10 +10:00
parent 3222f0d716
commit fee10dd466
2 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Interlace/interlace.py
View File

@@ -7,9 +7,8 @@ from Interlace.lib.threader import Pool
def build_queue(arguments, output): def build_queue(arguments, output):
queue = list() queue = list()
for target in InputHelper.process_targets(arguments):
for command in InputHelper.process_commands(arguments): for command in InputHelper.process_commands(arguments):
output.terminal(Level.VERBOSE, target, command, "Added to Queue") output.terminal(Level.VERBOSE, command, "Added to Queue")
queue.append(command) queue.append(command)
return queue return queue

24
Interlace/lib/core/input.py
View File

@@ -19,10 +19,12 @@ class InputHelper(object):
return arg return arg
@staticmethod @staticmethod
def process_targets(arguments): def process_commands(arguments):
commands = set()
targets = set() targets = set()
final_commands = set()
# build list of targets from file/input # process targets first
if arguments.target: if arguments.target:
targets.add(arguments.target) targets.add(arguments.target)
else: else:
@@ -30,20 +32,12 @@ class InputHelper(object):
targets.add(target.strip()) targets.add(target.strip())
print('[DEBUG] Added Target %s' % target.strip()) print('[DEBUG] Added Target %s' % target.strip())
# take list of targets and expand CIDR / comma notation # todo: take list of targets and expand CIDR / comma notation
if not arguments.nocidr: if not arguments.nocidr:
# expand CIDR from net addr # todo: expand CIDR from net addr
pass pass
# expand comma notation # todo: expand comma notation
# return list of unique hosts
return targets
@staticmethod
def process_commands(arguments):
commands = set()
final_commands = set()
print("[DEBUG] Commands argument: %s" % arguments.command) print("[DEBUG] Commands argument: %s" % arguments.command)
if arguments.command: if arguments.command:
@@ -54,8 +48,8 @@ class InputHelper(object):
commands.add(command.strip()) commands.add(command.strip())
print("[DEBUG] Added command %s" % command) print("[DEBUG] Added command %s" % command)
targets = InputHelper.process_targets(arguments) # expand commands to all known targets
print("[DEBUG] Targets length: %s" % len(targets))
for target in targets: for target in targets:
# replace flags # replace flags
print("[DEBUG] ............................................") print("[DEBUG] ............................................")