Strip query string before testing which urls to strip cookies on

collective · Aug 29, 2017 · 18c692f · 18c692f
1 parent 4e7a50c
commit 18c692f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 2.0a8 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Stripped query string before testing which urls to strip cookies on.
+  https://github.com/collective/plone.recipe.varnish/issues/42 [instification]
 
 
 2.0a7 (2017-08-16)

diff --git a/plone/recipe/varnish/templates/varnish4.vcl.jinja2 b/plone/recipe/varnish/templates/varnish4.vcl.jinja2
@@ -133,8 +133,9 @@ sub vcl_recv {
     /* cookies for pass */
     {% for rule in cookiepass %}
     {# this part need review #}
+    set req.http.UrlNoQs = regsub(req.url, "\?.*$", "");
     if (req.http.Cookie && req.http.Cookie ~ "{{rule['match']}}") {
-        if (req.url ~ "{{rule['exclude']}}") {
+        if (req.http.UrlNoQs ~ "{{rule['exclude']}}") {
             unset req.http.cookie;
             return(pipe);
         }