Merge pull request #251 from datum-cloud/fix/250-paranoia-cel-validation

Author: ecv

api/v1alpha/trafficprotectionpolicy_types.go

@@ -110,6 +110,7 @@ type OWASPCRS struct {
 	RuleExclusions *OWASPRuleExclusions `json:"ruleExclusions,omitempty"`
 }
 
+// +kubebuilder:validation:XValidation:message="detection paranoia level must be greater than or equal to blocking paranoia level",rule="self.detection >= self.blocking"
 type ParanoiaLevels struct {
 	// Blocking specifies the paranoia level for blocking requests or responses.
 	//

config/crd/bases/networking.datumapis.com_trafficprotectionpolicies.yaml

@@ -89,6 +89,10 @@ spec:
                               minimum: 1
                               type: integer
                           type: object
+                          x-kubernetes-validations:
+                          - message: detection paranoia level must be greater than
+                              or equal to blocking paranoia level
+                            rule: self.detection >= self.blocking
                         ruleExclusions:
                           description: |-
                             RuleExclusions can be used to disable specific OWASP ModSecurity Rules.

docs/api/trafficprotectionpolicies.md

@@ -191,6 +191,7 @@ Core Rule Set (CRS).
           ParanoiaLevels specifies the OWASP ModSecurity Core Rule Set (CRS)
 paranoia levels to use.<br/>
           <br/>
+            <i>Validations</i>:<li>self.detection >= self.blocking: detection paranoia level must be greater than or equal to blocking paranoia level</li>
             <i>Default</i>: map[]<br/>
         </td>
         <td>false</td>

test/e2e/trafficprotectionpolicy-paranoia-validation/chainsaw-test.yaml

@@ -0,0 +1,92 @@
+# yaml-language-server: $schema=https://raw.githubusercontent.com/kyverno/chainsaw/main/.schemas/json/test-chainsaw-v1alpha1.json
+apiVersion: chainsaw.kyverno.io/v1alpha1
+kind: Test
+metadata:
+  name: trafficprotectionpolicy-paranoia-validation
+# Regression for issue #250: a TrafficProtectionPolicy whose blocking paranoia
+# level exceeds its detection paranoia level is an illegal CRS configuration
+# (CRS rule 901500 denies every request with HTTP 500). The CRD now carries a
+# CEL rule requiring detection >= blocking, so the illegal combination must be
+# rejected at admission rather than silently 500ing all traffic.
+spec:
+  cluster: nso-standard
+  steps:
+    - name: Reject blocking > detection at admission
+      try:
+        - apply:
+            expect:
+              - check:
+                  ($error != null): true
+            resource:
+              apiVersion: networking.datumapis.com/v1alpha
+              kind: TrafficProtectionPolicy
+              metadata:
+                name: inverted-paranoia
+              spec:
+                mode: Enforce
+                targetRefs:
+                  - group: gateway.networking.k8s.io
+                    kind: Gateway
+                    name: waf-gw
+                ruleSets:
+                  - type: OWASPCoreRuleSet
+                    owaspCoreRuleSet:
+                      paranoiaLevels:
+                        blocking: 2
+                        detection: 1
+
+    - name: Reject blocking set with detection defaulted at admission
+      try:
+        - apply:
+            expect:
+              - check:
+                  ($error != null): true
+            resource:
+              apiVersion: networking.datumapis.com/v1alpha
+              kind: TrafficProtectionPolicy
+              metadata:
+                name: default-detection-paranoia
+              spec:
+                mode: Enforce
+                targetRefs:
+                  - group: gateway.networking.k8s.io
+                    kind: Gateway
+                    name: waf-gw
+                ruleSets:
+                  - type: OWASPCoreRuleSet
+                    owaspCoreRuleSet:
+                      paranoiaLevels:
+                        blocking: 2
+
+    - name: Accept detection >= blocking
+      try:
+        - apply:
+            resource:
+              apiVersion: networking.datumapis.com/v1alpha
+              kind: TrafficProtectionPolicy
+              metadata:
+                name: valid-paranoia
+              spec:
+                mode: Enforce
+                targetRefs:
+                  - group: gateway.networking.k8s.io
+                    kind: Gateway
+                    name: waf-gw
+                ruleSets:
+                  - type: OWASPCoreRuleSet
+                    owaspCoreRuleSet:
+                      paranoiaLevels:
+                        blocking: 2
+                        detection: 3
+      catch:
+        - delete:
+            ref:
+              apiVersion: networking.datumapis.com/v1alpha
+              kind: TrafficProtectionPolicy
+              name: valid-paranoia
+      finally:
+        - delete:
+            ref:
+              apiVersion: networking.datumapis.com/v1alpha
+              kind: TrafficProtectionPolicy
+              name: valid-paranoia