Fix ++api++/++api++/++api++ calls with Traefik filter rule

plone · Sep 13, 2023 · 1b27f2e · 1b27f2e
1 parent aaf2498
commit 1b27f2e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,9 @@
 2023-09-10 unreleased
 ---------------------
 
+- Fix ++api++/++api++/++api++ calls with Traefik filter rule
+  [ericof, fredvd]
+
 - Update Plone backend to 6.0.6, Volto frontend to 16.23.0
 - Update docker compose stack versions to 3.8
 - Update workflow actions

diff --git a/devops/stacks/2023.ploneconf.org.yml b/devops/stacks/2023.ploneconf.org.yml
@@ -54,6 +54,8 @@ services:
         ### ClassicUI Access Authentication
         - traefik.http.middlewares.2023_ploneconf-backend-auth.basicauth.users=ploneconf:$$2y$$05$$SLsKIKgK.NlD.64HMV42hOUNi3pQM/T.iW4qziWs0xcKHzkaa8T8C
         ### Backend ++api++ VHM
+        - "traefik.http.middlewares.2023_ploneconf-vhm-cleanup.replacepathregex.regex=^/((\\+\\+api\\+\\+/){1,})($$|.*)"
+        - "traefik.http.middlewares.2023_ploneconf-vhm-cleanup.replacepathregex.replacement=/VirtualHostBase/https/2023.ploneconf.org/Plone/++api++/VirtualHostRoot/$$3"
         - "traefik.http.middlewares.2023_ploneconf-vhm.replacepathregex.regex=^/\\+\\+api\\+\\+($$|/.*)"
         - "traefik.http.middlewares.2023_ploneconf-vhm.replacepathregex.replacement=/VirtualHostBase/https/2023.ploneconf.org/Plone/++api++/VirtualHostRoot/$$1"
         ### Backend ClassicUI VHM
@@ -65,7 +67,7 @@ services:
         - traefik.http.routers.2023_ploneconf-backend.entrypoints=https
         - traefik.http.routers.2023_ploneconf-backend.tls=true
         - traefik.http.routers.2023_ploneconf-backend.service=2023_ploneconf-backend
-        - traefik.http.routers.2023_ploneconf-backend.middlewares=gzip,2023_ploneconf-vhm
+        - traefik.http.routers.2023_ploneconf-backend.middlewares=gzip,2023_ploneconf-vhm-cleanup,2023_ploneconf-vhm
         ### ploneconf.org /ClassicUI - protected with basic auth (prevent SEOs from crawl it)
         - traefik.http.routers.2023_ploneconf-classicui.rule=Host(`2023.ploneconf.org`) && (PathPrefix(`/ClassicUI`))
         - traefik.http.routers.2023_ploneconf-classicui.entrypoints=https

diff --git a/devops/stacks/testing.ploneconf.org.yml b/devops/stacks/testing.ploneconf.org.yml
@@ -55,6 +55,8 @@ services:
         - traefik.http.middlewares.testing_ploneconf-backend-auth.basicauth.users=ploneconf:$$2y$$05$$SLsKIKgK.NlD.64HMV42hOUNi3pQM/T.iW4qziWs0xcKHzkaa8T8C
         - traefik.http.middlewares.testing_ploneconf-zope-auth.basicauth.users=zopeadmin:$$apr1$$7jQv8Qcp$$IzN7fnLaFrWJR7Ob5cljK/
         ### Backend ++api++ VHM
+        - "traefik.http.middlewares.testing_ploneconf-vhm-cleanup.replacepathregex.regex=^/((\\+\\+api\\+\\+/){1,})($$|.*)"
+        - "traefik.http.middlewares.testing_ploneconf-vhm-cleanup.replacepathregex.replacement=/VirtualHostBase/https/testing.ploneconf.org/Plone/++api++/VirtualHostRoot/$$3"
         - "traefik.http.middlewares.testing_ploneconf-vhm.replacepathregex.regex=^/\\+\\+api\\+\\+($$|/.*)"
         - "traefik.http.middlewares.testing_ploneconf-vhm.replacepathregex.replacement=/VirtualHostBase/https/testing.ploneconf.org/Plone/++api++/VirtualHostRoot/$$1"
         ### Backend ClassicUI VHM
@@ -69,7 +71,7 @@ services:
         - traefik.http.routers.testing_ploneconf-backend.entrypoints=https
         - traefik.http.routers.testing_ploneconf-backend.tls=true
         - traefik.http.routers.testing_ploneconf-backend.service=testing_ploneconf-backend
-        - traefik.http.routers.testing_ploneconf-backend.middlewares=gzip,testing_ploneconf-vhm
+        - traefik.http.routers.testing_ploneconf-backend.middlewares=gzip,testing_ploneconf-vhm-cleanup,testing_ploneconf-vhm
         ### ploneconf.org /ClassicUI - protected with basic auth (prevent SEOs from crawl it)
         - traefik.http.routers.testing_ploneconf-classicui.rule=Host(`testing.ploneconf.org`) && (PathPrefix(`/ClassicUI`))
         - traefik.http.routers.testing_ploneconf-classicui.entrypoints=https