wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-24 06:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Factor out get(Local|Global)Filters methods"

Browse source
This commit is contained in:
jenkins-bot 2020-02-27 20:33:56 +00:00 committed by Gerrit Code Review
parent 793d7e0a0f d8cb1a33a0
commit 7e66b01cf3
1 changed files with 51 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
includes/AbuseFilterRunner.php
View file

@ -325,56 +325,14 @@ class AbuseFilterRunner {
// Ensure that we start fresh, see T193374
$this->parser->resetCondCount();
// Fetch filters to check from the database.
$matchedFilters = [];
$dbr = wfGetDB( DB_REPLICA );
$res = $dbr->select(
'abuse_filter',
AbuseFilter::ALL_ABUSE_FILTER_FIELDS,
[
'af_enabled' => 1,
'af_deleted' => 0,
'af_group' => $this->group,
],
__METHOD__
);
foreach ( $res as $row ) {
foreach ( $this->getLocalFilters() as $row ) {
$matchedFilters[$row->af_id] = $this->checkFilter( $row );
}
if ( $wgAbuseFilterCentralDB && !$wgAbuseFilterIsCentral ) {
// Global filters
$globalRulesKey = AbuseFilter::getGlobalRulesKey( $this->group );
$fname = __METHOD__;
$res = MediaWikiServices::getInstance()->getMainWANObjectCache()->getWithSetCallback(
$globalRulesKey,
WANObjectCache::TTL_WEEK,
function () use ( $fname ) {
$fdb = AbuseFilter::getCentralDB( DB_REPLICA );
return iterator_to_array( $fdb->select(
'abuse_filter',
AbuseFilter::ALL_ABUSE_FILTER_FIELDS,
[
'af_enabled' => 1,
'af_deleted' => 0,
'af_global' => 1,
'af_group' => $this->group,
],
$fname
) );
},
[
'checkKeys' => [ $globalRulesKey ],
'lockTSE' => 300,
'version' => 1
]
);
foreach ( $res as $row ) {
foreach ( $this->getGlobalFilters() as $row ) {
$matchedFilters[ AbuseFilter::buildGlobalName( $row->af_id ) ] =
$this->checkFilter( $row, true );
}
@ -389,6 +347,55 @@ class AbuseFilterRunner {
return $matchedFilters;
}
/**
* @return array abuse_filter DB rows
*/
protected function getLocalFilters() : array {
return iterator_to_array( wfGetDB( DB_REPLICA )->select(
'abuse_filter',
AbuseFilter::ALL_ABUSE_FILTER_FIELDS,
[
'af_enabled' => 1,
'af_deleted' => 0,
'af_group' => $this->group,
],
__METHOD__
) );
}
/**
* @return array abuse_filter rows from the foreign DB
*/
protected function getGlobalFilters() : array {
$globalRulesKey = AbuseFilter::getGlobalRulesKey( $this->group );
$fname = __METHOD__;
return MediaWikiServices::getInstance()->getMainWANObjectCache()->getWithSetCallback(
$globalRulesKey,
WANObjectCache::TTL_WEEK,
function () use ( $fname ) {
$fdb = AbuseFilter::getCentralDB( DB_REPLICA );
return iterator_to_array( $fdb->select(
'abuse_filter',
AbuseFilter::ALL_ABUSE_FILTER_FIELDS,
[
'af_enabled' => 1,
'af_deleted' => 0,
'af_global' => 1,
'af_group' => $this->group,
],
$fname
) );
},
[
'checkKeys' => [ $globalRulesKey ],
'lockTSE' => 300,
'version' => 1
]
);
}
/**
* Check the conditions of a single filter, and profile it if $this->executeMode is true
*