added outdir option; install/scan colors match

This commit is contained in:
epi052
2020-01-19 13:51:24 -06:00
parent 1390303989
commit bc0c975d69
16 changed files with 150 additions and 48 deletions

View File

@@ -29,6 +29,7 @@ class AquatoneScan(luigi.Task):
interface: use the named raw network interface, such as "eth0" *--* Required by upstream Task
rate: desired rate for transmitting packets (packets per second) *--* Required by upstream Task
target_file: specifies the file on disk containing a list of ips or domains *--* Required by upstream Task
results_dir: specifes the directory on disk to which all Task results are written *--* Required by upstream Task
"""
threads = luigi.Parameter(default=defaults.get("threads", ""))
@@ -44,6 +45,7 @@ class AquatoneScan(luigi.Task):
luigi.Task - GatherWebTargets
"""
args = {
"results_dir": self.results_dir,
"rate": self.rate,
"target_file": self.target_file,
"top_ports": self.top_ports,
@@ -61,7 +63,7 @@ class AquatoneScan(luigi.Task):
Returns:
luigi.local_target.LocalTarget
"""
return luigi.LocalTarget(f"aquatone-{self.target_file}-results")
return luigi.LocalTarget(f"{self.results_dir}/aquatone-{self.target_file}-results")
def run(self):
""" Defines the options/arguments sent to aquatone after processing.