Yurik has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119795
Change subject: Enhanced X-Analytics header for zero
......................................................................
Enhanced X-Analytics header for zero
* Added X-Forwarded-Proto and X-Forwarded-By values to X-Analytics hdr
* Since X-Analytics is used exclusivelly by zero, moved it to zero.vcl
Change-Id: I4fe500ce34973df63fb67dc22b0ffa1b3d3b0557
---
M templates/varnish/mobile-frontend.inc.vcl.erb
M templates/varnish/zero.inc.vcl.erb
2 files changed, 18 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/119795/1
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 3f01384..8a239ae 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -31,11 +31,6 @@
}
}
- /* Assemble X-Analytics header */
- if (req.http.X-CS) {
- set req.http.X-Analytics = "zero=" + req.http.X-CS;
- }
-
/* Rewrite m.mediawiki.org to mediawiki.org etc */
if (req.http.host == "m.mediawiki.org") {
set req.http.host = "www.mediawiki.org";
@@ -150,12 +145,6 @@
set resp.http.X-CS = req.http.X-CS;
} else {
unset resp.http.X-CS;
- }
-
- if (resp.http.X-Analytics) {
- # do nothing, MediaWiki has handled X-Analytics
- } else if (req.http.X-Analytics) {
- set resp.http.X-Analytics = req.http.X-Analytics;
}
if (resp.http.Cache-Control ~ "s-maxage=[1-9]") {
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 2088cd0..49cd2dd 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -225,6 +225,18 @@
}
unset req.http.X-CS2;
} // end of if(X-CS2)
+
+ /* Assemble X-Analytics header */
+ if (req.http.X-CS) {
+ set req.http.X-Analytics = "zero=" + req.http.X-CS;
+ if (req.http.X-Forwarded-Proto) {
+ set req.http.X-Analytics = req.http.X-Analytics +
";https=1";
+ }
+ if (req.http.X-Forwarded-By) {
+ set req.http.X-Analytics = req.http.X-Analytics +
";proxy=" + req.http.X-Forwarded-By;
+ }
+ }
+
unset req.http.X-Forwarded-By;
}
@@ -241,4 +253,10 @@
header.remove(resp.http.Set-Cookie,"ZeroOpts=");
header.append(resp.http.Set-Cookie,"ZeroOpts=tls");
}
+
+ if (resp.http.X-Analytics) {
+ # do nothing, MediaWiki has handled X-Analytics
+ } else if (req.http.X-Analytics) {
+ set resp.http.X-Analytics = req.http.X-Analytics;
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/119795
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4fe500ce34973df63fb67dc22b0ffa1b3d3b0557
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
