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

Convert wfGetDB() calls to using getConnectionRef()

Browse source 
This handles the logic of calling reuseConnection() automatically

Change-Id: I9328e709fe5d81099338a31deef24d34db22d784
This commit is contained in:
Aaron Schulz 2019-06-27 15:55:20 -07:00
parent 0d001e3d6f
commit 2cf7b58434
3 changed files with 35 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
includes/AbuseFilter.php
View file

@ -7,6 +7,7 @@ use MediaWiki\Revision\RevisionRecord;
use MediaWiki\Session\SessionManager;
use MediaWiki\MediaWikiServices;
use Wikimedia\Rdbms\IDatabase;
use Wikimedia\Rdbms\DBError;
/**
* This class contains most of the business logic of AbuseFilter. It consists of mostly
@ -390,15 +391,17 @@ class AbuseFilter {
* @return bool
*/
public static function filterHidden( $filterID, $global = false ) {
global $wgAbuseFilterCentralDB;
if ( $global ) {
global $wgAbuseFilterCentralDB;
if ( !$wgAbuseFilterCentralDB ) {
return false;
}
$dbr = wfGetDB( DB_REPLICA, [], $wgAbuseFilterCentralDB );
$dbr = self::getCentralDB( DB_REPLICA );
} else {
$dbr = wfGetDB( DB_REPLICA );
}
$hidden = $dbr->selectField(
'abuse_filter',
'af_hidden',
@ -595,12 +598,7 @@ class AbuseFilter {
$globalRulesKey,
WANObjectCache::TTL_INDEFINITE,
function () use ( $group, $fname ) {
global $wgAbuseFilterCentralDB;
$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
$fdb = $lbFactory->getMainLB( $wgAbuseFilterCentralDB )->getConnectionRef(
DB_REPLICA, [], $wgAbuseFilterCentralDB
);
$fdb = self::getCentralDB( DB_REPLICA );
return iterator_to_array( $fdb->select(
'abuse_filter',
@ -860,7 +858,6 @@ class AbuseFilter {
}
}
global $wgAbuseFilterCentralDB;
// Load local filter info
$dbr = wfGetDB( DB_REPLICA );
// Retrieve the consequences.
@ -871,9 +868,8 @@ class AbuseFilter {
}
if ( count( $globalFilters ) ) {
$fdb = wfGetDB( DB_REPLICA, [], $wgAbuseFilterCentralDB );
$consequences = $consequences + self::loadConsequencesFromDB(
$fdb,
$consequences += self::loadConsequencesFromDB(
self::getCentralDB( DB_REPLICA ),
$globalFilters,
self::GLOBAL_FILTER_PREFIX
);
@ -1320,10 +1316,7 @@ class AbuseFilter {
if ( !$wgAbuseFilterCentralDB ) {
return null;
}
$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
$lb = $lbFactory->getMainLB( $wgAbuseFilterCentralDB );
$dbr = $lb->getConnectionRef( DB_REPLICA, [], $wgAbuseFilterCentralDB );
$dbr = self::getCentralDB( DB_REPLICA );
} else {
// Local wiki filter
$dbr = wfGetDB( DB_REPLICA );
@ -1523,9 +1516,7 @@ class AbuseFilter {
$central_log_rows[$index]['afl_var_dump'] = $global_var_dump;
}
global $wgAbuseFilterCentralDB;
$fdb = wfGetDB( DB_MASTER, [], $wgAbuseFilterCentralDB );
$fdb = self::getCentralDB( DB_MASTER );
foreach ( $central_log_rows as $row ) {
$fdb->insert( 'abuse_filter_log', $row, __METHOD__ );
$global_log_ids[] = $fdb->insertId();
@ -1618,7 +1609,7 @@ class AbuseFilter {
// Store to text table
if ( $global ) {
$dbw = wfGetDB( DB_MASTER, [], $wgAbuseFilterCentralDB );
$dbw = self::getCentralDB( DB_MASTER );
} else {
$dbw = wfGetDB( DB_MASTER );
}
@ -3284,7 +3275,7 @@ class AbuseFilter {
return $cache[$filterID];
}
$fdb = wfGetDB( DB_REPLICA, [], $wgAbuseFilterCentralDB );
$fdb = self::getCentralDB( DB_REPLICA );
$cache[$filterID] = $fdb->selectField(
'abuse_filter',
@ -3406,4 +3397,23 @@ class AbuseFilter {
return $firstChanges[$filterID];
}
/**
* @param int $index DB_MASTER/DB_REPLICA
* @return IDatabase
* @throws DBerror
* @throws RuntimeException
*/
public static function getCentralDB( $index ) {
global $wgAbuseFilterCentralDB;
if ( !is_string( $wgAbuseFilterCentralDB ) ) {
throw new RuntimeException( '$wgAbuseFilterCentralDB is not configured' );
}
return MediaWikiServices::getInstance()
->getDBLoadBalancerFactory()
->getMainLB( $index )
->getConnectionRef( $index, [], $wgAbuseFilterCentralDB );
}
}

13
includes/AbuseFilterHooks.php
View file

@ -270,12 +270,10 @@ class AbuseFilterHooks {
}
if ( $logs[ 'global' ] ) {
global $wgAbuseFilterCentralDB;
$fdb = wfGetDB( DB_MASTER, [], $wgAbuseFilterCentralDB );
$fdb = AbuseFilter::getCentralDB( DB_MASTER );
$fdb->update( 'abuse_filter_log',
[ 'afl_rev_id' => $revision->getId() ],
[ 'afl_id' => $logs[ 'global' ], 'afl_wiki' => wfWikiID() ],
[ 'afl_id' => $logs['global'], 'afl_wiki' => wfWikiID() ],
__METHOD__
);
}
@ -416,10 +414,8 @@ class AbuseFilterHooks {
$tags = $cache->getWithSetCallback(
// Key to store the cached value under
$cache->makeKey( self::FETCH_ALL_TAGS_KEY, (int)$enabled ),
// Time-to-live (in seconds)
$cache::TTL_MINUTE,
// Function that derives the new key value
function ( $oldValue, &$ttl, array &$setOpts ) use ( $enabled, $tags, $fname ) {
global $wgAbuseFilterCentralDB, $wgAbuseFilterIsCentral;
@ -450,12 +446,11 @@ class AbuseFilterHooks {
}
if ( $wgAbuseFilterCentralDB && !$wgAbuseFilterIsCentral ) {
$dbr = wfGetDB( DB_REPLICA, [], $wgAbuseFilterCentralDB );
$where['af_global'] = 1;
$dbr = AbuseFilter::getCentralDB( DB_REPLICA );
$res = $dbr->select(
[ 'abuse_filter_action', 'abuse_filter' ],
'afa_parameters',
$where,
[ 'af_global' => 1 ] + $where,
$fname,
[],
[ 'abuse_filter' => [ 'INNER JOIN', 'afa_filter=af_id' ] ]

5
tests/phpunit/AbuseFilterConsequencesTest.php
View file

@ -354,11 +354,6 @@ class AbuseFilterConsequencesTest extends MediaWikiTestCase {
protected function tearDown() {
// Paranoia: ensure no fake timestamp leftover
MWTimestamp::setFakeTime( false );
// Close the connection to the "external" database
$externalDBName = $this->db->getDBname() . '-' . $this->dbPrefix() . self::DB_EXTERNAL_PREFIX;
$db = wfGetDB( DB_MASTER, [], $externalDBName );
$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
$lbFactory->getMainLB( $externalDBName )->closeConnection( $db );
parent::tearDown();
}