[MediaWiki-commits] [Gerrit] Do XFF appends, use pass for POST requests - change (operations/puppet)

[Mark Bergsma (Code Review)]

Mark Bergsma has submitted this change and it was merged.

Change subject: Do XFF appends, use pass for POST requests
......................................................................


Do XFF appends, use pass for POST requests

Change-Id: Icf85552e900080c077eff78485ad1db0973e5808
---
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
2 files changed, 14 insertions(+), 2 deletions(-)

Approvals:
  Mark Bergsma: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/templates/varnish/text-backend.inc.vcl.erb 
b/templates/varnish/text-backend.inc.vcl.erb
index 5ed6291..35501d2 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -4,6 +4,7 @@
 include "text-common.inc.vcl";
 
 sub vcl_recv {
+       call vcl_recv_append_xff;
        call vcl_recv_purge;
        call restrict_access;
 
@@ -14,15 +15,20 @@
        }
 
 <% end -%>
-       call cookie_munging;
-
 <% if vcl_config.fetch("cluster_tier", "1") == "1" -%>
        if (req.url ~ "^/w/api\.php") {
                set req.backend = api;
        } else if (req.url ~ "^/w/thumb(_handler)?\.php") {
                set req.backend = rendering;
        }
+
 <% end -%>
+       if (req.request != "GET" && req.request != "HEAD") {
+               return (pass);
+       }
+
+       call cookie_munging;
+
        return(lookup);
 }
 
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 797f7c5..0a4487b 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -19,6 +19,8 @@
 }
 
 sub vcl_recv {
+       call vcl_recv_append_xff;
+
        /* Allow purging */
        call vcl_recv_purge;
 
@@ -32,6 +34,10 @@
 
        call mobile_redirect;
 
+       if (req.request != "GET" && req.request != "HEAD") {
+               return (pass);
+       }
+
        call cookie_munging;
 
        /* Users that just logged out, should not get a 304 for their

-- 
To view, visit https://gerrit.wikimedia.org/r/75587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf85552e900080c077eff78485ad1db0973e5808
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits