Merge pull request ecamp#5910 from BacLuc/varnish-dont-forward-header

http-cache: allow to disable sending X-Key headers downstream
BacLuc · Sep 27, 2024 · e0534da · e0534da
2 parents 531f1ca + 16882cd
commit e0534da
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/reusable-dev-deployment.yml b/.github/workflows/reusable-dev-deployment.yml
@@ -94,6 +94,7 @@ jobs:
             --set ingress.basicAuth.username=${{ secrets.BASIC_AUTH_USERNAME }} \
             --set ingress.basicAuth.password='${{ secrets.BASIC_AUTH_PASSWORD }}' \
             --set apiCache.enabled=${{ vars.API_CACHE_ENABLED || false }} \
+            --set apiCache.sendXKeyHeadersDownstream=${{ vars.SEND_XKEY_HEADERS_DOWNSTREAM != null && format('''{0}''', vars.SEND_XKEY_HEADERS_DOWNSTREAM) || null }} \
             --set mail.dummyEnabled=true \
             --set postgresql.url='${{ secrets.POSTGRES_URL }}/ecamp3${{ inputs.name }}?sslmode=require' \
             --set postgresql.adminUrl='${{ secrets.POSTGRES_ADMIN_URL }}/ecamp3${{ inputs.name }}?sslmode=require' \

diff --git a/.helm/ecamp3/templates/api_cache_deployment.yaml b/.helm/ecamp3/templates/api_cache_deployment.yaml
@@ -47,6 +47,8 @@ spec:
               value: "{{ .Values.apiCache.varnishHttpPort }}"
             - name: COOKIE_PREFIX
               value: {{ include "api.cookiePrefix" . | quote }}
+            - name: SEND_XKEY_HEADERS_DOWNSTREAM
+              value: {{ .Values.apiCache.sendXKeyHeadersDownstream | quote }}
           args:
             - -a
             - {{ printf ":%d,HTTP" (.Values.apiCache.varnishPurgePort | int) }}

diff --git a/.helm/ecamp3/values.yaml b/.helm/ecamp3/values.yaml
@@ -226,6 +226,7 @@ apiCache:
   varnishSize: 50M
   varnishHttpPort: 8080
   varnishPurgePort: 8081
+  sendXKeyHeadersDownstream: false
   resources:
     requests:
       cpu: 10m

diff --git a/api/docker/varnish/vcl/fos_tags_xkey.vcl b/api/docker/varnish/vcl/fos_tags_xkey.vcl
@@ -38,8 +38,8 @@ sub fos_tags_xkey_recv {
 }
 
 sub fos_tags_xkey_deliver {
-    if (!resp.http.X-Cache-Debug) {
-        // Remove tag headers when delivering to non debug client
+    if (std.getenv("SEND_XKEY_HEADERS_DOWNSTREAM") != "true" || !resp.http.X-Cache-Debug) {
+        // Remove tag headers
         unset resp.http.xkey;
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -65,6 +65,7 @@ services:
     command: -a :8081,HTTP -p http_max_hdr=96
     environment:
       - COOKIE_PREFIX=localhost_
+      - SEND_XKEY_HEADERS_DOWNSTREAM=${SEND_XKEY_HEADERS_DOWNSTREAM:-true}
       - VARNISH_HTTP_PORT=8080
 
   pdf: