[MediaWiki-commits] [Gerrit] Apply AbuseFilter configuration syntax change - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Apply AbuseFilter configuration syntax change .. Apply AbuseFilter configuration syntax change Due to switching to extension registration, some config keys had to be changed from plain to associative arrays (and were renamed to reduce confusion). Apply the new syntax (and drop drop some lines that just re-stated the default settings). Change-Id: I63e93d0fb299d701e756f2193cbb6473351f9acb --- M wmf-config/abusefilter.php 1 file changed, 38 insertions(+), 24 deletions(-) Approvals: Anomie: Looks good to me, but someone else must approve MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index d3da3d6..932a88a 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -18,9 +18,11 @@ $wgGroupPermissions['sysop']['abusefilter-private'] = false; // Disable some potentially dangerous actions -$wgAbuseFilterAvailableActions = array_diff( - $wgAbuseFilterAvailableActions, - array( 'block', 'rangeblock', 'degroup' ) ); +$wgAbuseFilterActions = array( + 'block' => false, + 'rangeblock' => false, + 'degroup' => false, +); // T31922 - Prevent anyone being given the abusefilter-private right by removing it $wgAvailableRights = array_diff( $wgAvailableRights, array( 'abusefilter-private' ) ); @@ -53,7 +55,7 @@ $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; $wgGroupPermissions['*']['abusefilter-view'] = false; $wgGroupPermissions['user']['abusefilter-view'] = true; - $wgAbuseFilterAvailableActions[] = 'block'; + $wgAbuseFilterActions['block'] = true; $wgAbuseFilterBlockDuration = '2 hours'; $wgAbuseFilterAnonBlockDuration = '2 hours'; break; @@ -96,7 +98,6 @@ $wgAbuseFilterNotificationsPrivate = true; // T46045 break; case 'enwikibooks': - $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'tag' ); $wgGroupPermissions['*']['abusefilter-view'] = false; $wgGroupPermissions['*']['abusefilter-log'] = false; $wgAbuseFilterNotifications = false; @@ -105,7 +106,7 @@ $wgGroupPermissions['autoconfirmed']['abusefilter-log-detail'] = false; // T44012 break; case 'enwikinews': - $wgAbuseFilterAvailableActions[] = 'block'; // T57868 + $wgAbuseFilterActions['block'] = true; // T57868 break; case 'enwikisource': $wgGroupPermissions['sysop']['abusefilter-modify'] = false; @@ -127,7 +128,7 @@ $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; - $wgAbuseFilterAvailableActions[] = 'block'; + $wgAbuseFilterActions['block'] = true; $wgAbuseFilterBlockDuration = 'indefinite'; // T96669 $wgAbuseFilterAnonBlockDuration = '31 hours'; // T96669 $wgAbuseFilterNotifications = false; @@ -137,13 +138,14 @@ $wgGroupPermissions['abusefilter']['abusefilter-modify'] = true; $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; - $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'tag', 'block' ); + $wgAbuseFilterActions['block'] = true; + $wgAbuseFilterActions['blockautopromote'] = false; $wgAbuseFilterBlockDuration = '2 days'; $wgAbuseFilterAnonBlockDuration = '2 days'; break; case 'eswikivoyage': // T64321 $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; - $wgAbuseFilterAvailableActions[] = 'block'; + $wgAbuseFilterActions['block'] = true; $wgAbuseFilterBlockDuration = '24 hours'; $wgAbuseFilterAnonBlockDuration = '24 hours'; break; @@ -171,7 +173,7 @@ $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; - $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' ); + $wgAbuseFilterActions = array( 'rangeblock' => true );
[MediaWiki-commits] [Gerrit] Apply AbuseFilter configuration syntax change - change (operations/mediawiki-config)
Gergő Tisza has uploaded a new change for review. https://gerrit.wikimedia.org/r/292758 Change subject: Apply AbuseFilter configuration syntax change .. Apply AbuseFilter configuration syntax change Due to switching to extension registration, some config keys had to be changed from plain to associative arrays (and were renamed to reduce confusion). Apply the new syntax (and drop drop some lines that just re-stated the default settings). Change-Id: I63e93d0fb299d701e756f2193cbb6473351f9acb Depends-On: I790d39c2849922d7daf7479f298cd90cf30af129 --- M wmf-config/abusefilter.php 1 file changed, 20 insertions(+), 24 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/58/292758/1 diff --git a/wmf-config/abusefilter.php b/wmf-config/abusefilter.php index d3da3d6..d8b3b6e 100644 --- a/wmf-config/abusefilter.php +++ b/wmf-config/abusefilter.php @@ -18,9 +18,11 @@ $wgGroupPermissions['sysop']['abusefilter-private'] = false; // Disable some potentially dangerous actions -$wgAbuseFilterAvailableActions = array_diff( - $wgAbuseFilterAvailableActions, - array( 'block', 'rangeblock', 'degroup' ) ); +$wgAbuseFilterActions = array( + 'block' => false, + 'rangeblock' => false, + 'degroup' => false, +); // T31922 - Prevent anyone being given the abusefilter-private right by removing it $wgAvailableRights = array_diff( $wgAvailableRights, array( 'abusefilter-private' ) ); @@ -53,7 +55,7 @@ $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; $wgGroupPermissions['*']['abusefilter-view'] = false; $wgGroupPermissions['user']['abusefilter-view'] = true; - $wgAbuseFilterAvailableActions[] = 'block'; + $wgAbuseFilterActions['block'] = true; $wgAbuseFilterBlockDuration = '2 hours'; $wgAbuseFilterAnonBlockDuration = '2 hours'; break; @@ -96,7 +98,6 @@ $wgAbuseFilterNotificationsPrivate = true; // T46045 break; case 'enwikibooks': - $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'tag' ); $wgGroupPermissions['*']['abusefilter-view'] = false; $wgGroupPermissions['*']['abusefilter-log'] = false; $wgAbuseFilterNotifications = false; @@ -105,7 +106,7 @@ $wgGroupPermissions['autoconfirmed']['abusefilter-log-detail'] = false; // T44012 break; case 'enwikinews': - $wgAbuseFilterAvailableActions[] = 'block'; // T57868 + $wgAbuseFilterActions['block'] = true; // T57868 break; case 'enwikisource': $wgGroupPermissions['sysop']['abusefilter-modify'] = false; @@ -127,7 +128,7 @@ $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; - $wgAbuseFilterAvailableActions[] = 'block'; + $wgAbuseFilterActions['block'] = true; $wgAbuseFilterBlockDuration = 'indefinite'; // T96669 $wgAbuseFilterAnonBlockDuration = '31 hours'; // T96669 $wgAbuseFilterNotifications = false; @@ -137,13 +138,13 @@ $wgGroupPermissions['abusefilter']['abusefilter-modify'] = true; $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; - $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'tag', 'block' ); + $wgAbuseFilterActions['block'] = true; $wgAbuseFilterBlockDuration = '2 days'; $wgAbuseFilterAnonBlockDuration = '2 days'; break; case 'eswikivoyage': // T64321 $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; - $wgAbuseFilterAvailableActions[] = 'block'; + $wgAbuseFilterActions['block'] = true; $wgAbuseFilterBlockDuration = '24 hours'; $wgAbuseFilterAnonBlockDuration = '24 hours'; break; @@ -171,7 +172,7 @@ $wgGroupPermissions['sysop']['abusefilter-view-private'] = true; $wgGroupPermissions['sysop']['abusefilter-revert'] = true; $wgGroupPermissions['sysop']['abusefilter-modify-restricted'] = true; - $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag', 'rangeblock' ); + $wgAbuseFilterActions = array( 'rangeblock' => true );
