small cleanups

Makefile

@@ -19,4 +19,4 @@ pylint:
 	pylint --rcfile=pylint.rc  *.py app/*.py plugins/base/*.py
 
 mypy:
-	mypy app/
+	mypy --strict-optional app/

app/attack_log.py

@@ -572,7 +572,6 @@ class AttackLog():
                         if "result" in entry:
                             replace_entry["result"] = entry["result"]
 
-
     def get_dict(self):
         """ Return logged data in dict format """
 

app/calderacontrol.py

@@ -626,16 +626,16 @@ class CalderaControl():
         adid = self.get_adversary(adversary_name)["adversary_id"]
 
         logid = self.attack_logger.start_caldera_attack(source=self.url,
-                                                paw=paw,
-                                                group=group,
-                                                ability_id=ability_id,
-                                                ttp=self.get_ability(ability_id)[0]["technique_id"],
-                                                name=self.get_ability(ability_id)[0]["name"],
-                                                description=self.get_ability(ability_id)[0]["description"],
-                                                obfuscator=obfuscator,
-                                                jitter=jitter,
-                                                **kwargs
-                                                )
+                                                        paw=paw,
+                                                        group=group,
+                                                        ability_id=ability_id,
+                                                        ttp=self.get_ability(ability_id)[0]["technique_id"],
+                                                        name=self.get_ability(ability_id)[0]["name"],
+                                                        description=self.get_ability(ability_id)[0]["description"],
+                                                        obfuscator=obfuscator,
+                                                        jitter=jitter,
+                                                        **kwargs
+                                                        )
 
         #  ##### Create / Run Operation
 
@@ -682,7 +682,7 @@ class CalderaControl():
             except CalderaError:
                 pass
 
-        outp=""
+        outp = ""
 
         if output is None:
             outp = str(self.get_operation_by_id(opid))

doc_generator.py

@@ -35,11 +35,10 @@ if __name__ == "__main__":
 
     #  generate("loot/2021_08_30___14_40_23/attack.json",
     #          "tools/human_readable_documentation/contents.rst")  # FIN 7 With genereated files added
-    #  generate("removeme/loot/2021_09_07___08_59_42/attack.json",
-    #         "tools/human_readable_documentation/source/contents.rst")  # FIN 7 first run on environment
-    generate("loot/2021_09_07___16_20_48/attack.json",
-             "tools/human_readable_documentation/source/contents.rst")  # FIN 7 locally with extended data  (older: loot/2021_09_07___14_38_14)
-
+    generate("removeme/loot/2021_09_08___07_41_35/attack.json",
+             "tools/human_readable_documentation/source/contents.rst")  # FIN 7 first run on environment
+    # generate("loot/2021_09_07___16_20_48/attack.json",
+    #        "tools/human_readable_documentation/source/contents.rst")  # FIN 7 locally with extended data  (older: loot/2021_09_07___14_38_14)
 
     # generate("loot/2021_07_19___15_10_45/attack.json", "tools/human_readable_documentation/contents.rst")
     # generate("removeme.json", "tools/human_readable_documentation/contents.rst")