CSteipp has submitted this change and it was merged.
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, 8 insertions(+), 0 deletions(-)
Approvals:
CSteipp: Looks good to me, approved
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index ee8478d..cdeb4b9 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1083,6 +1083,7 @@
include( $IP . '/extensions/GlobalBlocking/GlobalBlocking.php' );
$wgGlobalBlockingDatabase = 'centralauth';
$wgApplyGlobalBlocks = $wmgApplyGlobalBlocks;
+$wgGlobalBlockingBlockXFF = $wmgUseXFFBlocks;
include( $IP . '/extensions/TrustedXFF/TrustedXFF.php' );
if ( function_exists( 'dba_open' ) && file_exists(
"$wmfConfigDir/trusted-xff.cdb" ) ) {
@@ -2806,6 +2807,8 @@
require_once( "$IP/extensions/AccountAudit/AccountAudit.php" );
}
+$wgApplyIpBlocksToXff = $wmgUseXFFBlocks;
+
// 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 494b47e..c8a914c 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: merged
Gerrit-Change-Id: Iba5cfdff2f91434f94e546ead0062ff3d016dba8
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: CSteipp <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: Nemo bis <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
