Fix WAFv2 AndStatement and OrStatement validation (Fixes #2026)

cloudtools · Apr 4, 2022 · 42d48cd · 42d48cd
1 parent f287fa8
commit 42d48cd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/tests/test_wafv2.py b/tests/test_wafv2.py
@@ -61,12 +61,11 @@ def test_statement_validator(self):
 
     def test_statements_validator(self):
         validate_statements([Statement(), Statement()])
+        validate_statements([Statement(), Statement(), Statement()])
         with self.assertRaises(TypeError):
-            validate_statements(
-                [
-                    Statement(),
-                ]
-            )
+            validate_statements([])
+        with self.assertRaises(TypeError):
+            validate_statements([Statement()])
         with self.assertRaises(TypeError):
             validate_statements("foo")
         with self.assertRaises(TypeError):

diff --git a/troposphere/validators/wafv2.py b/troposphere/validators/wafv2.py
@@ -29,8 +29,8 @@ def validate_statements(statements):
     Property: OrStatement.Statements
     """
 
-    if not isinstance(statements, list) or len(statements) != 2:
-        raise TypeError("Statements must be a list of 2 Statement elements")
+    if not isinstance(statements, list) or len(statements) < 2:
+        raise TypeError("Statements must be a list of at least 2 Statement elements")
 
     for s in statements:
         validate_statement(s)