Ema has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357557 )
Change subject: VCL: basic support to return HTTP 429, apply it to UA:wikiScrape/0.0.0 ...................................................................... VCL: basic support to return HTTP 429, apply it to UA:wikiScrape/0.0.0 Add basic VCL support to return HTTP 429 in cache_text VCL. Return 429 for "User-Agent: wikiScrape/0.0.0" Change-Id: I9edc318528d5557d58533546b2dcd4b77e1d96c0 --- M modules/varnish/templates/text-frontend.inc.vcl.erb 1 file changed, 10 insertions(+), 0 deletions(-) Approvals: Ema: Verified; Looks good to me, approved diff --git a/modules/varnish/templates/text-frontend.inc.vcl.erb b/modules/varnish/templates/text-frontend.inc.vcl.erb index cc02258..d6e50bc 100644 --- a/modules/varnish/templates/text-frontend.inc.vcl.erb +++ b/modules/varnish/templates/text-frontend.inc.vcl.erb @@ -150,6 +150,10 @@ return (synth(741, "Buggy request, please report at https://phabricator.wikimedia.org/T141786")); } + if (req.http.User-Agent ~ "wikiScrape/0.0.0") { + return (synth(742, "Too many requests")); + } + call mobile_redirect; # normalize all /static to the same hostname for caching @@ -303,6 +307,12 @@ return (deliver); } + // Clients performing too many requests + if (resp.status == 742) { + set resp.status = 429; + return (deliver); + } + // Browser sec warning // Note we're using status 418, which is the teapot code. Most other // 4xx codes would be inappropriate, and generic ones like 400 would be -- To view, visit https://gerrit.wikimedia.org/r/357557 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9edc318528d5557d58533546b2dcd4b77e1d96c0 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ema <e...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits