BBlack has submitted this change and it was merged.
Change subject: VCL: tighten up XFF regex slightly
......................................................................
VCL: tighten up XFF regex slightly
Change-Id: Ia8dfd4d1b3d857dacf5a054dd73b3a08ec7f4f27
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index c299861..92c761b 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -415,7 +415,7 @@
// e.g.:
// "junk2, 123.123.123.123" -> "2, 123.123.123.123"
set req.http.X-Forwarded-For = regsub(req.http.X-Forwarded-For,
- "^.*?([0-9A-Fa-f:.]+(, [0-9A-Fa-f:.]+)*)? *$", "\1");
+ "^.*?([0-9A-Fa-f:.]+(, [0-9A-Fa-f:.]+)*)? ?$", "\1");
}
// There are two possible cases here: either nginx acted as our TLS
--
To view, visit https://gerrit.wikimedia.org/r/258135
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8dfd4d1b3d857dacf5a054dd73b3a08ec7f4f27
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack <[email protected]>
Gerrit-Reviewer: BBlack <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
