wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-24 10:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite the method for getting a global emergency value

Browse source 
Currently it barely has any reason to exist, as it's a single-line
method. This patch moves there the global state, and also changes the
signature to allow shorter calls.

Change-Id: I7851fa41cbd96912b3859319ba97a501b1cbaa57
This commit is contained in:
Daimona Eaytoy 2018-12-10 17:56:02 +01:00
parent c496545573
commit db31c6dfea
1 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
includes/AbuseFilter.php
View file

@ -2017,18 +2017,15 @@ class AbuseFilter {
* @param string[] $filters The filters to check
*/
private static function checkEmergencyDisable( $group, $filters ) {
global $wgAbuseFilterEmergencyDisableThreshold, $wgAbuseFilterEmergencyDisableCount,
$wgAbuseFilterEmergencyDisableAge;
$stash = ObjectCache::getMainStashInstance();
// @ToDo this is an amount between 1 and AbuseFilterProfileActionsCap, which means that the
// reliability of this number may strongly vary. We should instead use a fixed one.
$totalActions = $stash->get( self::filterUsedKey( $group ) );
foreach ( $filters as $filter ) {
$threshold = self::getEmergencyValue( $wgAbuseFilterEmergencyDisableThreshold, $group );
$hitCountLimit = self::getEmergencyValue( $wgAbuseFilterEmergencyDisableCount, $group );
$maxAge = self::getEmergencyValue( $wgAbuseFilterEmergencyDisableAge, $group );
$threshold = self::getEmergencyValue( 'threshold', $group );
$hitCountLimit = self::getEmergencyValue( 'count', $group );
$maxAge = self::getEmergencyValue( 'age', $group );
$matchCount = $stash->get( self::filterMatchesKey( $filter ) );
@ -2068,12 +2065,29 @@ class AbuseFilter {
}
/**
* @param array $emergencyValue
* @param string $type The value to get, either "threshold", "count" or "age"
* @param string $group The filter's group (as defined in $wgAbuseFilterValidGroups)
* @return mixed
*/
public static function getEmergencyValue( array $emergencyValue, $group ) {
return $emergencyValue[$group] ?? $emergencyValue['default'];
public static function getEmergencyValue( $type, $group ) {
switch ( $type ) {
case 'threshold':
global $wgAbuseFilterEmergencyDisableThreshold;
$value = $wgAbuseFilterEmergencyDisableThreshold;
break;
case 'count':
global $wgAbuseFilterEmergencyDisableCount;
$value = $wgAbuseFilterEmergencyDisableCount;
break;
case 'age':
global $wgAbuseFilterEmergencyDisableAge;
$value = $wgAbuseFilterEmergencyDisableAge;
break;
default:
throw new InvalidArgumentException( '$type must be either "threshold", "count" or "age"' );
}
return $value[$group] ?? $value['default'];
}
/**