BBlack has submitted this change and it was merged.
Change subject: align text+mobile on filter_(headers|noise) in shared code
......................................................................
align text+mobile on filter_(headers|noise) in shared code
Bug: T109286
Change-Id: Ic38e9724019a1ec604a1679e1456b837a7e66ebb
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
M templates/varnish/mobile-frontend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
3 files changed, 33 insertions(+), 31 deletions(-)
Approvals:
BBlack: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index db436a1..526a7bc 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -159,6 +159,38 @@
# Functions
+<% if @vcl_config.fetch("layer", "") == "frontend" -%>
+// filter_headers + filter_noise are used (consistently) by the text+mobile
frontends
+
+sub filter_headers {
+ if (req.restarts == 0) {
+ unset req.http.Orig-Cookie;
+ unset req.http.X-Orig-Cookie;
+ }
+}
+
+sub filter_noise {
+ if (req.url ~ "Special:RecordImpression.*&campaign=wm2015register") {
+ error 403 "Noise";
+ }
+
+ // Forged UAs on zerodot. This largely handles lazywebtools below,
incidentally.
+ if (req.http.host ~ "zero\.wikipedia\.org" && req.http.User-Agent &&
req.http.User-Agent ~ "Facebookbot|Googlebot") {
+ error 403 "Noise";
+ }
+
+ if (req.http.referer && req.http.referer ~
"^http://(www\.(keeprefreshing|refreshthis|refresh-page|urlreload)\.com|tuneshub\.blogspot\.com|itunes24x7\.blogspot\.com|autoreload\.net|www\.lazywebtools\.co\.uk)/")
{
+ error 403 "Noise";
+ }
+}
+ if (req.request == "POST" && req.url ~
"index\.php\?option=com_jce&task=plugin&plugin=imgmanager&file=imgmanager&method=form&cid=")
{
+ error 403 "Noise";
+ }
+}
+
+// end frontend block
+<% end -%>
+
// start frontend-only block for HTTPS
<% if @vcl_config.fetch("layer", "") == "frontend" &&
@cluster_options.fetch("https_redirects", false) -%>
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index b7599aa..f8fd4d4 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -18,23 +18,8 @@
// address) in X-Forwarded-For, even if it's the only value, as in
// the example of traffic sourced directly by satellite or something.
-
-sub filter_noise {
- if (req.request == "POST" && req.url ~
"index\.php\?option=com_jce&task=plugin&plugin=imgmanager&file=imgmanager&method=form&cid=")
{
- error 403 "Noise";
- }
-
- // Forged UAs on zerodot. This largely handles lazywebtools below,
incidentally.
- if (req.http.host ~ "zero\.wikipedia\.org" && req.http.User-Agent &&
req.http.User-Agent ~ "Facebookbot|Googlebot") {
- error 403 "Noise";
- }
-
- if (req.http.referer && req.http.referer ~
"^http://(www\.(keeprefreshing|refreshthis|refresh-page|urlreload)\.com|tuneshub\.blogspot\.com|itunes24x7\.blogspot\.com|autoreload\.net|www\.lazywebtools\.co\.uk)/")
{
- error 403 "Noise";
- }
-}
-
sub vcl_recv {
+ call filter_headers;
call filter_noise;
// FIXME: we're seeing an issue with Range requests and gzip/gunzip.
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index b0d1e66..a24b447 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -53,21 +53,6 @@
}
}
-sub filter_headers {
- if (req.restarts == 0) {
- unset req.http.Orig-Cookie;
- }
-}
-
-sub filter_noise {
- if (req.url ~ "Special:RecordImpression.*&campaign=wm2015register") {
- error 403 "Noise";
- }
- if (req.request == "POST" && req.url ~
"index\.php\?option=com_jce&task=plugin&plugin=imgmanager&file=imgmanager&method=form&cid=")
{
- error 403 "Noise";
- }
-}
-
sub vcl_recv {
call filter_headers;
call filter_noise;
--
To view, visit https://gerrit.wikimedia.org/r/232028
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic38e9724019a1ec604a1679e1456b837a7e66ebb
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
