mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git
synced 2024-11-23 13:46:48 +00:00
a5b68cf46d
Why: * When CheckUser asks the AbuseFilter extension for modifications to rows inserted into the CheckUser tables, the AbuseFilter extension attempts to get the Filter user via User::newSystemUser * User::newSystemUser can deadlock if multiple requests to create the system user are being made at once. * The CheckUserHander does not need to create the abuse filter system and instead only needs to know if a given $user is the equal to the FilterUser. * As such the FilterUser service needs to provide a way to check if a given $user is equal without creating the FilterUser. What: * Add FilterUser::isUserSameAs which returns a boolean value indicating whether the Abuse Filter system user is the equal to a given UserIdentity in the same way that UserIdentity::equals is implemented. * Refactor ::getUser to get the username for the filter user in a separate method, so that the ::isUserSameAs method can also use this method. Name this new method ::getFilterUserName. * Add a test for the FilterUser service to ensure consistent test coverage * Convert the @covers and @coversDefaultClass annotations to be a @covers for the class. This is because PHPUnit recommends this in https://docs.phpunit.de/en/9.6/annotations.html#appendixes-annotations-covers-tables-annotations Bug: T356275 Bug: T346967 Change-Id: I8a101781bb47612deabb0f2a06a398ac13e860e6
106 lines
3 KiB
PHP
106 lines
3 KiB
PHP
<?php
|
|
|
|
namespace MediaWiki\Extension\AbuseFilter;
|
|
|
|
use MediaWiki\Permissions\Authority;
|
|
use MediaWiki\User\User;
|
|
use MediaWiki\User\UserGroupManager;
|
|
use MediaWiki\User\UserIdentity;
|
|
use MediaWiki\User\UserNameUtils;
|
|
use MessageLocalizer;
|
|
use Psr\Log\LoggerInterface;
|
|
|
|
class FilterUser {
|
|
public const SERVICE_NAME = 'AbuseFilterFilterUser';
|
|
|
|
private MessageLocalizer $messageLocalizer;
|
|
private UserGroupManager $userGroupManager;
|
|
private UserNameUtils $userNameUtils;
|
|
private LoggerInterface $logger;
|
|
|
|
/**
|
|
* @param MessageLocalizer $messageLocalizer
|
|
* @param UserGroupManager $userGroupManager
|
|
* @param UserNameUtils $userNameUtils
|
|
* @param LoggerInterface $logger
|
|
*/
|
|
public function __construct(
|
|
MessageLocalizer $messageLocalizer,
|
|
UserGroupManager $userGroupManager,
|
|
UserNameUtils $userNameUtils,
|
|
LoggerInterface $logger
|
|
) {
|
|
$this->messageLocalizer = $messageLocalizer;
|
|
$this->userGroupManager = $userGroupManager;
|
|
$this->userNameUtils = $userNameUtils;
|
|
$this->logger = $logger;
|
|
}
|
|
|
|
/**
|
|
* @return Authority
|
|
*/
|
|
public function getAuthority(): Authority {
|
|
return $this->getUser();
|
|
}
|
|
|
|
/**
|
|
* @return UserIdentity
|
|
*/
|
|
public function getUserIdentity(): UserIdentity {
|
|
return $this->getUser();
|
|
}
|
|
|
|
/**
|
|
* Compares the given $user to see if they are the same as the FilterUser.
|
|
*
|
|
* @return bool
|
|
*/
|
|
public function isSameUserAs( UserIdentity $user ): bool {
|
|
// Checking the usernames are equal is enough, as this is what is done by
|
|
// User::equals and UserIdentityValue::equals.
|
|
return $user->getName() === $this->getFilterUserName();
|
|
}
|
|
|
|
/**
|
|
* @todo Stop using the User class when User::newSystemUser is refactored.
|
|
* @return User
|
|
*/
|
|
private function getUser(): User {
|
|
$user = User::newSystemUser( $this->getFilterUserName(), [ 'steal' => true ] );
|
|
'@phan-var User $user';
|
|
|
|
// Promote user to 'sysop' so it doesn't look
|
|
// like an unprivileged account is blocking users
|
|
if ( !in_array( 'sysop', $this->userGroupManager->getUserGroups( $user ) ) ) {
|
|
$this->userGroupManager->addUserToGroup( $user, 'sysop' );
|
|
}
|
|
|
|
return $user;
|
|
}
|
|
|
|
/**
|
|
* Gets the username for the FilterUser.
|
|
*
|
|
* @return string
|
|
*/
|
|
private function getFilterUserName(): string {
|
|
$username = $this->messageLocalizer->msg( 'abusefilter-blocker' )->inContentLanguage()->text();
|
|
if ( !$this->userNameUtils->getCanonical( $username ) ) {
|
|
// User name is invalid. Don't throw because this is a system message, easy
|
|
// to change and make wrong either by mistake or intentionally to break the site.
|
|
$this->logger->warning(
|
|
'The AbuseFilter user\'s name is invalid. Please change it in ' .
|
|
'MediaWiki:abusefilter-blocker'
|
|
);
|
|
// Use the default name to avoid breaking other stuff. This should have no harm,
|
|
// aside from blocks temporarily attributed to another user.
|
|
// Don't use the database in case the English onwiki message is broken, T284364
|
|
$username = $this->messageLocalizer->msg( 'abusefilter-blocker' )
|
|
->inLanguage( 'en' )
|
|
->useDatabase( false )
|
|
->text();
|
|
}
|
|
return $username;
|
|
}
|
|
}
|