Merge pull request zaproxy#7850 from psiinon/itests/auth-verif

Integration tests: check verif autodetect
thc202 · May 4, 2023 · 37ac081 · 37ac081
2 parents a7bc3b9 + 32b6942
commit 37ac081
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 26 deletions.
diff --git a/docker/integration_tests/configs/plans/auth-json-bearer-cookie.yaml b/docker/integration_tests/configs/plans/auth-json-bearer-cookie.yaml
@@ -14,13 +14,8 @@ env:
         loginPageWait: 5
         browserId: "firefox-headless"
       verification:
-        method: "poll"
-        loggedInRegex: "\\Q\"result\":\"OK\\E"
-        loggedOutRegex: "\\Q\"result\":\"FAIL\\E"
-        pollFrequency: 60
-        pollUnits: "requests"
-        pollUrl: "http://localhost:9091/auth/simple-json-bearer-cookie/user"
-        pollPostData: ""
+        # Checking 2.13+ compatibility
+        method: "autodetect"
     sessionManagement:
       method: "autodetect"
       parameters: {}
@@ -50,6 +45,9 @@ jobs:
   - id: 10112
     name: "Session Management Response Identified"
     threshold: "medium"
+  - id: 10113
+    name: "Verification Request Identified"
+    threshold: "medium"
   name: "passiveScan-config"
   type: "passiveScan-config"
 - parameters:
@@ -87,6 +85,11 @@ jobs:
     operator: ">="
     value: 1
     onFail: "error"
+  - type: "stats"
+    statistic: "stats.auth.configure.verification"
+    operator: ">="
+    value: 1
+    onFail: "error"
   - type: "stats"
     statistic: "stats.auth.detect.auth.json"
     operator: ">="

diff --git a/docker/integration_tests/configs/plans/auth-json-bearer.yaml b/docker/integration_tests/configs/plans/auth-json-bearer.yaml
@@ -14,13 +14,8 @@ env:
         loginPageWait: 5
         browserId: "firefox-headless"
       verification:
+        # Checking 2.12 compatibility
         method: "poll"
-        loggedInRegex: "\\Q\"result\":\"OK\\E"
-        loggedOutRegex: "\\Q\"result\":\"FAIL\\E"
-        pollFrequency: 60
-        pollUnits: "requests"
-        pollUrl: "http://localhost:9091/auth/simple-json-bearer/user"
-        pollPostData: ""
     sessionManagement:
       method: "autodetect"
       parameters: {}
@@ -50,6 +45,9 @@ jobs:
   - id: 10112
     name: "Session Management Response Identified"
     threshold: "medium"
+  - id: 10113
+    name: "Verification Request Identified"
+    threshold: "medium"
   name: "passiveScan-config"
   type: "passiveScan-config"
 - parameters:
@@ -87,6 +85,11 @@ jobs:
     operator: ">="
     value: 1
     onFail: "error"
+  - type: "stats"
+    statistic: "stats.auth.configure.verification"
+    operator: ">="
+    value: 1
+    onFail: "error"
   - type: "stats"
     statistic: "stats.auth.detect.auth.json"
     operator: ">="

diff --git a/docker/integration_tests/configs/plans/auth-non-std-json-bearer.yaml b/docker/integration_tests/configs/plans/auth-non-std-json-bearer.yaml
@@ -14,13 +14,8 @@ env:
         loginPageWait: 5
         browserId: "firefox-headless"
       verification:
+        # Checking 2.12 compatibility
         method: "poll"
-        loggedInRegex: "\\Q\"result\":\"OK\\E"
-        loggedOutRegex: "\\Q\"result\":\"FAIL\\E"
-        pollFrequency: 60
-        pollUnits: "requests"
-        pollUrl: "http://localhost:9091/auth/non-std-json-bearer/user"
-        pollPostData: ""
     sessionManagement:
       method: "autodetect"
       parameters: {}
@@ -50,6 +45,9 @@ jobs:
   - id: 10112
     name: "Session Management Response Identified"
     threshold: "medium"
+  - id: 10113
+    name: "Verification Request Identified"
+    threshold: "medium"
   name: "passiveScan-config"
   type: "passiveScan-config"
 - parameters:
@@ -76,6 +74,11 @@ jobs:
     operator: ">="
     value: 1
     onFail: "error"
+  - type: "stats"
+    statistic: "stats.auth.configure.verification"
+    operator: ">="
+    value: 1
+    onFail: "error"
   - type: "stats"
     statistic: "stats.auth.sessiontoken.nonstd"
     site: "http://localhost:9091"

diff --git a/docker/integration_tests/configs/plans/auth-simple-json.yaml b/docker/integration_tests/configs/plans/auth-simple-json.yaml
@@ -14,13 +14,8 @@ env:
         loginPageWait: 5
         browserId: "firefox-headless"
       verification:
-        method: "poll"
-        loggedInRegex: "\\Q\"result\":\"OK\\E"
-        loggedOutRegex: "\\Q\"result\":\"FAIL\\E"
-        pollFrequency: 60
-        pollUnits: "requests"
-        pollUrl: "http://localhost:9091/auth/simple-json/user"
-        pollPostData: ""
+        # Checking 2.13+ compatibility
+        method: "autodetect"
     sessionManagement:
       method: "autodetect"
       parameters: {}
@@ -50,6 +45,9 @@ jobs:
   - id: 10112
     name: "Session Management Response Identified"
     threshold: "medium"
+  - id: 10113
+    name: "Verification Request Identified"
+    threshold: "medium"
   name: "passiveScan-config"
   type: "passiveScan-config"
 - parameters:
@@ -87,6 +85,11 @@ jobs:
     operator: ">="
     value: 1
     onFail: "error"
+  - type: "stats"
+    statistic: "stats.auth.configure.verification"
+    operator: ">="
+    value: 1
+    onFail: "error"
   - type: "stats"
     statistic: "stats.auth.detect.auth.json"
     operator: ">="