CSteipp has uploaded a new change for review.
https://gerrit.wikimedia.org/r/63141
Change subject: Enable Local XFF blocking
......................................................................
Enable Local XFF blocking
Bug: 23343
Bug: 48323
Change-Id: Iba5cfdff2f91434f94e546ead0062ff3d016dba8
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 13 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/41/63141/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ee8478d..421087c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2806,6 +2806,14 @@
require_once( "$IP/extensions/AccountAudit/AccountAudit.php" );
}
+if ( $wmgUseXFFBlocks ) {
+ $wgApplyIpBlocksToXff = true;
+ $wgGlobalBlockingBlockXFF = true;
+} else {
+ $wgApplyIpBlocksToXff = false;
+ $wgGlobalBlockingBlockXFF = false;
+}
+
// On Special:Version, link to useful release notes
$wgHooks['SpecialVersionVersionUrl'][] = function( $wgVersion, &$versionUrl ) {
$matches = array();
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 37a527e..5f1896f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12480,6 +12480,11 @@
'metawiki' => true,
),
+// Apply blocks to IPs in XFF (bug 23343)
+'wmgUseXFFBlocks' => array(
+ 'default' => true,
+),
+
'wgUrlProtocols' => array(
'default' => array(
'http://',
--
To view, visit https://gerrit.wikimedia.org/r/63141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba5cfdff2f91434f94e546ead0062ff3d016dba8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: CSteipp <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
