BBlack has submitted this change and it was merged.
Change subject: remove clicktracking-session= VCL hacks
......................................................................
remove clicktracking-session= VCL hacks
When sampling varnish logs, the bulk of these have been wiped out
at this point, so removed the unsetter and the session-cookie
workaround for them.
Change-Id: I466b49bebd77f93a9819dcc074d39e1c14aa9da6
---
M templates/varnish/text-common.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
2 files changed, 1 insertion(+), 14 deletions(-)
Approvals:
Ori.livneh: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, but someone else must approve
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/text-common.inc.vcl.erb
b/templates/varnish/text-common.inc.vcl.erb
index b3bf9cb..a620f07 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -29,12 +29,7 @@
// the temporary live deployment on large wikis of:
// https://gerrit.wikimedia.org/r/#/c/176948
// Can be removed when most matching cookies have gone away...
- // I've added another temporary exception here for the
- // clicktracking-session= cookie I've been observing in our traffic
- // lately. I think we haven't set this in a long time, but it's still
- // out there in browsers, possibly due to lack of expiry. We may need
- // to explicitly send out some cookie-deletes for it to fix....
- if (req.http.Cookie ~ "((?<!(mwuser|acking)-)[sS]ession|Token)=") {
+ if (req.http.Cookie ~ "((?<!mwuser-)[sS]ession|Token)=") {
set req.hash_ignore_busy = true;
} else {
call cookie_munging;
diff --git a/templates/varnish/text-frontend.inc.vcl.erb
b/templates/varnish/text-frontend.inc.vcl.erb
index ac3cb5e..66c9aff 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -180,14 +180,6 @@
}
<% end -%>
- // Delete old/stale clicktracking-session cookies.
- // We supposedly stopped setting these back in Apr-2013, but they were
originally
- // set with no expiry (permanent), and we're still seeing a fair number
of them in the wild,
- // and they accidentally match our global session-cookie regex.
- if (req.http.Cookie ~ "clicktracking-session=" || req.http.Orig-Cookie
~ "clicktracking-session=") {
- header.append(resp.http.Set-Cookie, "clicktracking-session=x;
path=/; expires=Thu, 01 Jan 1970 00:00:00 GMT");
- }
-
// Assemble X-Analytics header
// Some of the headers used for X-Analytics are not varied on, so add
them after the backend processing
// Note that vcl_deliver in other files may also modify X-Analytics.
--
To view, visit https://gerrit.wikimedia.org/r/217676
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I466b49bebd77f93a9819dcc074d39e1c14aa9da6
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: BBlack <bbl...@wikimedia.org>
Gerrit-Reviewer: Faidon Liambotis <fai...@wikimedia.org>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
