ftw ignore first iteration, CI (envoyproxy#34)

arminabf · Oct 13, 2022 · 2084271 · 2084271
1 parent 12b7087
commit 2084271
Show file tree

Hide file tree

Showing 10 changed files with 372 additions and 41 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -72,6 +72,11 @@ jobs:
               ENVOY_IMAGE=$image go run mage.go e2e
           done
 
+      # Currently excluded, go-ftw fails to find the destination after a while. Locally works fine.
+      # - name: Run regression tests (ftw)
+      #   shell: bash
+      #   run: go run mage.go ftw
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 

diff --git a/example/docker-compose.yml b/example/docker-compose.yml
@@ -11,7 +11,6 @@ services:
       - chown -R 101:101 /home/envoy/logs
     volumes:
       - logs:/home/envoy/logs:rw
-
   envoy:
     depends_on:
       - chown

diff --git a/ftw/docker-compose.yml b/ftw/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   httpbin:
-    image: ealen/echo-server:latest
+    image: kennethreitz/httpbin:latest
   chown:
     image: alpine:3.16
     command:

diff --git a/ftw/envoy-config.yaml b/ftw/envoy-config.yaml
@@ -33,11 +33,12 @@ static_resources:
                         root_id: ""
                         configuration:
                           "@type": "type.googleapis.com/google.protobuf.StringValue"
+                          # NB: inline rules order matter. Some ftw-config rules override the coraza-recommended default ones.
                           value: |
                             {
                               "rules": [
+                                {"inline": "Include coraza.conf-recommended.conf"},
                                 {"inline": "Include ftw-config.conf"},
-                                {"inline": "Include coraza.conf-recommended"},
                                 {"inline": "Include crs-setup.conf.example"},
                                 {"inline": "Include crs/*.conf"}
                               ]

diff --git a/ftw/ftw.yml b/ftw/ftw.yml
diff --git a/ftw/tests.sh b/ftw/tests.sh
@@ -31,4 +31,4 @@ echo -e "\n[Ok] Got status code $status_code, expected 200. Ready to start."
 
 FTW_CLOUDMODE=${FTW_CLOUDMODE:-false}
 
-go-ftw run -d coreruleset/tests/regression/tests --config ftw.yml --read-timeout=10s --cloud=$FTW_CLOUDMODE || (echo "Envoy Logs:" && cat /home/envoy/logs/envoy.log)
+go-ftw run -d coreruleset/tests/regression/tests --config ftw.yml --read-timeout=10s --cloud=$FTW_CLOUDMODE || (echo "Envoy Logs:" && cat /home/envoy/logs/envoy.log; exit 1)
diff --git a/main.go b/main.go
@@ -273,7 +273,6 @@ func (ctx *httpContext) OnHttpResponseBody(bodySize int, endOfStream bool) types
 			proxywasm.LogCriticalf("failed to get response body: %v", err)
 			return types.ActionContinue
 		}
-
 		_, err = tx.ResponseBodyWriter().Write(body)
 		if err != nil {
 			proxywasm.LogCriticalf("failed to read response body: %v", err)

diff --git a/main_test.go b/main_test.go
@@ -611,7 +611,7 @@ func TestParseCRS(t *testing.T) {
 		opt := proxytest.
 			NewEmulatorOption().
 			WithVMContext(vm).
-			WithPluginConfiguration([]byte(`{ "rules": [ {"inline": "Include ftw-config.conf\nInclude coraza.conf-recommended\nInclude crs-setup.conf.example\nInclude crs/*.conf"} ] }`))
+			WithPluginConfiguration([]byte(`{ "rules": [ {"inline": "Include ftw-config.conf\nInclude coraza.conf-recommended.conf\nInclude crs-setup.conf.example\nInclude crs/*.conf"} ] }`))
 
 		host, reset := proxytest.NewHostEmulator(opt)
 		defer reset()

diff --git a/rules/coraza.conf-recommended → rules/coraza.conf-recommended.conf b/rules/coraza.conf-recommended → rules/coraza.conf-recommended.conf
diff --git a/rules/ftw-config.conf b/rules/ftw-config.conf
@@ -1,3 +1,6 @@
+# Overrides default SecResponseBodyMimeType in order to add application/json (httpbin response Content-Type)
+SecResponseBodyMimeType text/plain text/html text/xml application/json
+
 SecAction "id:900005,\
   phase:1,\
   nolog,\