Add AffectsGeneric definition option

WithSecureLabs · Jul 25, 2021 · 6c09fcc · 6c09fcc
1 parent eb6f822
commit 6c09fcc
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/lib/aws/attacks.py b/lib/aws/attacks.py
@@ -706,15 +706,16 @@ def _pattern_cypher(self, name, definition,
         }
 
         options = {
+            "AffectsGeneric": False,
             "CreateAction": False,
             "Transitive": True,
-            ** dict(definition["Options"]
-                    if "Options" in definition
-                    else {}),
             "Admin": bool(True
                           if "Grants" in attack
                           and attack["Grants"] == "Admin"
                           else False),
+            ** dict(definition["Options"]
+                    if "Options" in definition
+                    else {}),
         }
 
         def cypher_resolve_commands(history=False):
@@ -1099,7 +1100,7 @@ def cypher_inject():
         # Assert: cypher includes source, targets, options, grants, admin; where options, targets
         #         and grants comprise of (destination, commands) tuples.
 
-        if options["CreateAction"]:
+        if options["AffectsGeneric"] or options["CreateAction"]:
 
             # Reduce result set to Generics only when a CreateAction has been specified.