Rewrote zircolite with classes to be less monolithic

Added the ability to forward events asynchronously
wagga40 · Jul 18, 2021 · 4f65f99 · 4f65f99
1 parent d3ab95f
commit 4f65f99
Show file tree

Hide file tree

Showing 3 changed files with 534 additions and 412 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,6 @@
 jinja2>=2.11.3
 colorama>=0.4.4
 tqdm>=4.58.0
-requests>=2.24.0
+requests>=2.24.0
+evtx>=0.7
+aiohttp[speedups]~=3.7
diff --git a/tools/genEmbed/genEmbed.py b/tools/genEmbed/genEmbed.py
@@ -80,9 +80,9 @@ def genTemplatesCode(self):
             templateNameFiltered = ''.join(filter(str.isalpha, template.name.replace(".tmpl", "").lower()))
             self.templatesArgs.append(f'parser.add_argument("--{templateNameFiltered}", help="Use {templateNameFiltered} template", action="store_true")')
             templatesB64FnLines.append(f'if args.{templateNameFiltered}:')
-            templatesB64FnLines.append(f'   randomName = "export-{templateNameFiltered}" + "".join(random.SystemRandom().choice(string.ascii_uppercase + string.digits) for _ in range(4)) + ".out"')
+            templatesB64FnLines.append(f'   randomName = "export-{templateNameFiltered}-" + "".join(random.SystemRandom().choice(string.ascii_uppercase + string.digits) for _ in range(4)) + ".out"')
             templatesB64FnLines.append(f'   consoleLogger.info("[+] Applying template, output to :" + randomName)')
-            templatesB64FnLines.append(f'   generateFromTemplate({templateNameFiltered}, randomName, fullResults)')
+            templatesB64FnLines.append(f'   generateFromTemplate({templateNameFiltered}, randomName, zircoliteCore.fullResults)')
             self.templatesB64Fn.append(templatesB64FnLines)
             self.templatesB64.append(f'{templateNameFiltered} = zlib.decompress(base64.b64decode(b\'{self.fileToB64String(template)}\'))')
             templatesB64FnLines = []
@@ -119,6 +119,7 @@ def render(self):
                                         templates=self.templatesArgs,
                                         templatesB64=self.templatesB64,
                                         templatesB64Fn=self.templatesB64Fn,
+                                        templateOpenCode = 'template = Template(str(templateFile.decode("utf-8")))',
                                         rules=self.rulesArgs,
                                         rulesB64=self.rulesArgsB64,
                                         rulesIf=self.rulesIf,