wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-13 17:27:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split checking vs setting throttle

Browse source 
This is still not very useful, but it's going to come up handy when
we'll be refactoring this code.

Additionally, fix a shortcircuit issue which caused additional throttle
types to not be processed if a type was already triggered.

Change-Id: Ied44d9300b3fa2ad00fe95c9c3da3c3f8faa650b
This commit is contained in:
Daimona Eaytoy 2020-10-17 15:24:08 +02:00
parent ec5b9bef44
commit 7dd10ff348
1 changed files with 34 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
includes/AbuseFilterRunner.php
View file

@ -524,8 +524,9 @@ class AbuseFilterRunner {
// The rest are throttle-types.
foreach ( $parameters as $throttleType ) {
$hitThrottle = $hitThrottle || $this->isThrottled(
$throttleId, $throttleType, $rateCount, $ratePeriod, $isGlobalFilter );
$hitThrottle = $this->isThrottled( $throttleId, $throttleType, $rateCount, $isGlobalFilter )
|| $hitThrottle;
$this->setThrottled( $throttleId, $throttleType, $ratePeriod, $isGlobalFilter );
}
unset( $actions['throttle'] );
@ -651,35 +652,49 @@ class AbuseFilterRunner {
}
/**
* Determines whether the throttle has been hit with the given parameters
*
* @param string $throttleId
* @param string $types
* @param int $rateCount
* @param int $ratePeriod
* @param bool $global
* @return bool
*/
protected function isThrottled(
$throttleId,
$types,
int $rateCount,
int $ratePeriod,
$global = false
) {
protected function isThrottled( string $throttleId, string $types, int $rateCount, bool $global = false ) : bool {
$stash = MediaWikiServices::getInstance()->getMainObjectStash();
$key = $this->throttleKey( $throttleId, $types, $global );
$count = (int)$stash->get( $key );
$newCount = (int)$stash->get( $key ) + 1;
$logger = LoggerFactory::getInstance( 'AbuseFilter' );
$logger->debug( "Got value $count for throttle key $key" );
$logger->debug(
'New value is {newCount} for throttle key {key}. Maximum is {rateCount}.',
[
'newCount' => $newCount,
'key' => $key,
'rateCount' => $rateCount,
]
);
$count = $stash->incrWithInit( $key, $ratePeriod );
return $newCount > $rateCount;
}
if ( $count > $rateCount ) {
$logger->debug( "Throttle $key hit value $count -- maximum is $rateCount." );
return true;
}
$logger->debug( "Throttle $key not hit!" );
return false;
/**
* Updates the throttle status with the given parameters
*
* @param string $throttleId
* @param string $types
* @param int $ratePeriod
* @param bool $global
*/
protected function setThrottled( string $throttleId, string $types, int $ratePeriod, bool $global = false ) : void {
$stash = MediaWikiServices::getInstance()->getMainObjectStash();
$key = $this->throttleKey( $throttleId, $types, $global );
$logger = LoggerFactory::getInstance( 'AbuseFilter' );
$logger->debug(
'Increasing throttle key {key}',
[ 'key' => $key ]
);
$stash->incrWithInit( $key, $ratePeriod );
}
/**