aljaz/Interlace
1
1
Fork 0
mirror of https://github.com/codingo/Interlace.git synced 2025-12-17 23:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix $ to _var_ bug

Browse Source
This commit is contained in:
codingo
2019-01-06 13:59:05 +10:00
parent ef48e8b21b
commit 99155df6ab
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ class InputHelper(object):
else: else:
for target in arguments.target_list: for target in arguments.target_list:
targets.add(target.strip()) targets.add(target.strip())
print('[DEBUG] Added Target')
# take list of targets and expand CIDR / comma notation # take list of targets and expand CIDR / comma notation
if not arguments.nocidr: if not arguments.nocidr:
@@ -42,16 +43,26 @@ class InputHelper(object):
@staticmethod @staticmethod
def process_commands(arguments): def process_commands(arguments):
commands = set() commands = set()
print("[DEBUG] Commands argument: %s" % arguments.command)
if arguments.command:
commands.add(arguments.command)
print("[DEBUG] Added command")
else:
for command in arguments.command_list:
commands.add(command.strip())
print("[DEBUG] Added command")
targets = InputHelper.process_targets(arguments) targets = InputHelper.process_targets(arguments)
for target in targets: for target in targets:
# replace flags # replace flags
for command in commands: for command in commands:
command = command.replace("$target", target) command = command.replace("_target_", target)
command = command.replace("$output", arguments.output) command = command.replace("_output_", arguments.output)
command = command.replace("$port", arguments.port) command = command.replace("_port_", arguments.port)
command = command.replace("$realport", arguments.realport) command = command.replace("_realport_", arguments.realport)
commands.add(command) commands.add(command)
print("[DEBUG] Added command")
return commands return commands
@@ -110,17 +121,17 @@ class InputParser(object):
parser.add_argument( parser.add_argument(
'-o', dest='output', '-o', dest='output',
help='Specify an output folder variable that can be used in commands as $output' help='Specify an output folder variable that can be used in commands as _output_'
) )
parser.add_argument( parser.add_argument(
'-p', dest='port', '-p', dest='port',
help='Specify a port variable that can be used in commands as $port' help='Specify a port variable that can be used in commands as _port_'
) )
parser.add_argument( parser.add_argument(
'-rp', dest='realport', '-rp', dest='realport',
help='Specify a real port variable that can be used in commands as $realport' help='Specify a real port variable that can be used in commands as _realport_'
) )
parser.add_argument( parser.add_argument(