2008-06-27 06:18:51 +00:00
|
|
|
<?php
|
|
|
|
|
2020-10-13 16:01:18 +00:00
|
|
|
use MediaWiki\Extension\AbuseFilter\AbuseFilterServices;
|
2020-11-10 12:58:11 +00:00
|
|
|
use MediaWiki\Extension\AbuseFilter\EchoNotifier;
|
|
|
|
use MediaWiki\Extension\AbuseFilter\ThrottleFilterPresentationModel;
|
2020-01-11 17:05:30 +00:00
|
|
|
use MediaWiki\Extension\AbuseFilter\VariableGenerator\RunVariableGenerator;
|
2018-10-12 09:39:38 +00:00
|
|
|
use MediaWiki\Logger\LoggerFactory;
|
2016-12-07 23:32:41 +00:00
|
|
|
use MediaWiki\MediaWikiServices;
|
2020-06-16 04:12:38 +00:00
|
|
|
use MediaWiki\Revision\RevisionRecord;
|
2019-01-10 17:32:54 +00:00
|
|
|
use MediaWiki\Revision\SlotRecord;
|
2020-06-16 04:12:38 +00:00
|
|
|
use MediaWiki\User\UserIdentity;
|
2016-05-15 15:35:33 +00:00
|
|
|
|
2008-06-27 06:18:51 +00:00
|
|
|
class AbuseFilterHooks {
|
2015-03-17 13:00:14 +00:00
|
|
|
|
2018-12-09 16:58:57 +00:00
|
|
|
/** @var WikiPage|null Make sure edit filter & edit save hooks match */
|
|
|
|
private static $lastEditPage = null;
|
2011-08-24 22:11:52 +00:00
|
|
|
|
2016-06-03 18:01:56 +00:00
|
|
|
/**
|
|
|
|
* Called right after configuration has been loaded.
|
|
|
|
*/
|
|
|
|
public static function onRegistration() {
|
2019-01-25 13:47:03 +00:00
|
|
|
global $wgAuthManagerAutoConfig, $wgActionFilteredLogs, $wgAbuseFilterProfile,
|
2019-01-07 15:23:21 +00:00
|
|
|
$wgAbuseFilterProfiling, $wgAbuseFilterPrivateLog, $wgAbuseFilterForceSummary,
|
2018-09-22 10:18:50 +00:00
|
|
|
$wgGroupPermissions, $wgAbuseFilterRestrictions, $wgAbuseFilterDisallowGlobalLocalBlocks,
|
2018-09-11 16:57:49 +00:00
|
|
|
$wgAbuseFilterActionRestrictions, $wgAbuseFilterLocallyDisabledGlobalActions,
|
|
|
|
$wgAbuseFilterAflFilterMigrationStage;
|
2019-01-24 12:33:31 +00:00
|
|
|
|
|
|
|
// @todo Remove this in a future release (added in 1.33)
|
2019-01-25 13:47:03 +00:00
|
|
|
if ( isset( $wgAbuseFilterProfile ) || isset( $wgAbuseFilterProfiling ) ) {
|
|
|
|
wfWarn( '$wgAbuseFilterProfile and $wgAbuseFilterProfiling have been removed and ' .
|
|
|
|
'profiling is now enabled by default.' );
|
2019-01-24 12:33:31 +00:00
|
|
|
}
|
2016-05-15 15:35:33 +00:00
|
|
|
|
2019-01-07 15:23:21 +00:00
|
|
|
if ( isset( $wgAbuseFilterPrivateLog ) ) {
|
|
|
|
global $wgAbuseFilterLogPrivateDetailsAccess;
|
|
|
|
$wgAbuseFilterLogPrivateDetailsAccess = $wgAbuseFilterPrivateLog;
|
|
|
|
wfWarn( '$wgAbuseFilterPrivateLog has been renamed to $wgAbuseFilterLogPrivateDetailsAccess. ' .
|
|
|
|
'Please make the change in your settings; the format is identical.'
|
|
|
|
);
|
|
|
|
}
|
|
|
|
if ( isset( $wgAbuseFilterForceSummary ) ) {
|
|
|
|
global $wgAbuseFilterPrivateDetailsForceReason;
|
|
|
|
$wgAbuseFilterPrivateDetailsForceReason = $wgAbuseFilterForceSummary;
|
|
|
|
wfWarn( '$wgAbuseFilterForceSummary has been renamed to ' .
|
|
|
|
'$wgAbuseFilterPrivateDetailsForceReason. Please make the change in your settings; ' .
|
|
|
|
'the format is identical.'
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
|
|
|
$found = false;
|
|
|
|
foreach ( $wgGroupPermissions as &$perms ) {
|
|
|
|
if ( array_key_exists( 'abusefilter-private', $perms ) ) {
|
|
|
|
$perms['abusefilter-privatedetails'] = $perms[ 'abusefilter-private' ];
|
|
|
|
unset( $perms[ 'abusefilter-private' ] );
|
|
|
|
$found = true;
|
|
|
|
}
|
|
|
|
if ( array_key_exists( 'abusefilter-private-log', $perms ) ) {
|
|
|
|
$perms['abusefilter-privatedetails-log'] = $perms[ 'abusefilter-private-log' ];
|
|
|
|
unset( $perms[ 'abusefilter-private-log' ] );
|
|
|
|
$found = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
unset( $perms );
|
|
|
|
|
|
|
|
if ( $found ) {
|
|
|
|
wfWarn( 'The group permissions "abusefilter-private-log" and "abusefilter-private" have ' .
|
|
|
|
'been renamed, respectively, to "abusefilter-privatedetails-log" and ' .
|
2019-08-13 09:09:39 +00:00
|
|
|
'"abusefilter-privatedetails". Please update the names in your settings.'
|
2019-01-07 15:23:21 +00:00
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2018-09-22 10:18:50 +00:00
|
|
|
// @todo Remove this in a future release (added in 1.36)
|
|
|
|
if ( isset( $wgAbuseFilterDisallowGlobalLocalBlocks ) ) {
|
|
|
|
wfWarn( '$wgAbuseFilterDisallowGlobalLocalBlocks has been removed and replaced by ' .
|
|
|
|
'$wgAbuseFilterLocallyDisabledGlobalActions. You can now specify which actions to disable. ' .
|
|
|
|
'If you had set the former to true, you should set to true all of the actions in ' .
|
|
|
|
'$wgAbuseFilterRestrictions (if you were manually setting the variable) or ' .
|
|
|
|
'AbuseFilter::DANGEROUS_ACTIONS. ' .
|
|
|
|
'If you had set it to false (or left the default), just remove it from your wiki settings.'
|
|
|
|
);
|
|
|
|
if ( $wgAbuseFilterDisallowGlobalLocalBlocks === true ) {
|
|
|
|
$wgAbuseFilterLocallyDisabledGlobalActions = [
|
|
|
|
'throttle' => false,
|
|
|
|
'warn' => false,
|
|
|
|
'disallow' => false,
|
|
|
|
'blockautopromote' => true,
|
|
|
|
'block' => true,
|
|
|
|
'rangeblock' => true,
|
|
|
|
'degroup' => true,
|
|
|
|
'tag' => false
|
|
|
|
];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// @todo Remove this in a future release (added in 1.36)
|
|
|
|
if ( isset( $wgAbuseFilterRestrictions ) ) {
|
|
|
|
wfWarn( '$wgAbuseFilterRestrictions has been renamed to $wgAbuseFilterActionRestrictions.' );
|
|
|
|
$wgAbuseFilterActionRestrictions = $wgAbuseFilterRestrictions;
|
|
|
|
}
|
|
|
|
|
2017-08-08 12:03:56 +00:00
|
|
|
$wgAuthManagerAutoConfig['preauth'][AbuseFilterPreAuthenticationProvider::class] = [
|
|
|
|
'class' => AbuseFilterPreAuthenticationProvider::class,
|
2018-04-04 21:14:25 +00:00
|
|
|
// Run after normal preauth providers to keep the log cleaner
|
|
|
|
'sort' => 5,
|
2017-08-08 12:03:56 +00:00
|
|
|
];
|
2017-02-15 18:12:31 +00:00
|
|
|
|
|
|
|
$wgActionFilteredLogs['suppress'] = array_merge(
|
|
|
|
$wgActionFilteredLogs['suppress'],
|
|
|
|
// Message: log-action-filter-suppress-abuselog
|
|
|
|
[ 'abuselog' => [ 'hide-afl', 'unhide-afl' ] ]
|
|
|
|
);
|
2018-07-16 12:10:36 +00:00
|
|
|
$wgActionFilteredLogs['rights'] = array_merge(
|
|
|
|
$wgActionFilteredLogs['rights'],
|
|
|
|
// Messages: log-action-filter-rights-blockautopromote,
|
|
|
|
// log-action-filter-rights-restoreautopromote
|
|
|
|
[
|
|
|
|
'blockautopromote' => [ 'blockautopromote' ],
|
|
|
|
'restoreautopromote' => [ 'restoreautopromote' ]
|
|
|
|
]
|
|
|
|
);
|
2018-09-11 16:57:49 +00:00
|
|
|
|
|
|
|
if ( strpos( $wgAbuseFilterAflFilterMigrationStage, 'Bogus value' ) !== false ) {
|
|
|
|
// Set the value here, because extension.json is very unfriendly towards PHP constants
|
2020-12-08 21:59:37 +00:00
|
|
|
$wgAbuseFilterAflFilterMigrationStage = SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD;
|
2018-09-11 16:57:49 +00:00
|
|
|
}
|
|
|
|
$stage = $wgAbuseFilterAflFilterMigrationStage;
|
|
|
|
// Validation for the afl_filter migration stage, stolen from ActorMigration
|
|
|
|
if ( ( $stage & SCHEMA_COMPAT_WRITE_BOTH ) === 0 ) {
|
|
|
|
throw new InvalidArgumentException( '$stage must include a write mode' );
|
|
|
|
}
|
|
|
|
if ( ( $stage & SCHEMA_COMPAT_READ_BOTH ) === 0 ) {
|
|
|
|
throw new InvalidArgumentException( '$stage must include a read mode' );
|
|
|
|
}
|
|
|
|
if ( ( $stage & SCHEMA_COMPAT_READ_BOTH ) === SCHEMA_COMPAT_READ_BOTH ) {
|
|
|
|
throw new InvalidArgumentException( 'Cannot read both schemas' );
|
|
|
|
}
|
|
|
|
if ( ( $stage & SCHEMA_COMPAT_READ_OLD ) && !( $stage & SCHEMA_COMPAT_WRITE_OLD ) ) {
|
|
|
|
throw new InvalidArgumentException( 'Cannot read the old schema without also writing it' );
|
|
|
|
}
|
|
|
|
if ( ( $stage & SCHEMA_COMPAT_READ_NEW ) && !( $stage & SCHEMA_COMPAT_WRITE_NEW ) ) {
|
|
|
|
throw new InvalidArgumentException( 'Cannot read the new schema without also writing it' );
|
|
|
|
}
|
2016-06-03 18:01:56 +00:00
|
|
|
}
|
|
|
|
|
2013-01-04 15:37:56 +00:00
|
|
|
/**
|
2016-04-07 05:06:02 +00:00
|
|
|
* Entry point for the EditFilterMergedContent hook.
|
2013-01-04 15:37:56 +00:00
|
|
|
*
|
|
|
|
* @param IContextSource $context the context of the edit
|
|
|
|
* @param Content $content the new Content generated by the edit
|
2015-09-28 18:03:35 +00:00
|
|
|
* @param Status $status Error message to return
|
2013-01-04 15:37:56 +00:00
|
|
|
* @param string $summary Edit summary for page
|
|
|
|
* @param User $user the user performing the edit
|
|
|
|
* @param bool $minoredit whether this is a minor edit according to the user.
|
2019-01-10 17:32:54 +00:00
|
|
|
* @param string $slot slot role for the content
|
2013-01-04 15:37:56 +00:00
|
|
|
*/
|
|
|
|
public static function onEditFilterMergedContent( IContextSource $context, Content $content,
|
2019-01-10 17:32:54 +00:00
|
|
|
Status $status, $summary, User $user, $minoredit, $slot = SlotRecord::MAIN
|
2017-07-08 18:49:13 +00:00
|
|
|
) {
|
2019-09-16 16:53:36 +00:00
|
|
|
$startTime = microtime( true );
|
2013-01-04 15:37:56 +00:00
|
|
|
|
2020-08-19 12:24:57 +00:00
|
|
|
$filterResult = self::filterEdit( $context, $user, $content, $summary, $slot );
|
2015-09-28 18:03:35 +00:00
|
|
|
|
Actually return errors for action=edit API
Setting 'apiHookResult' results in a "successful" response; if we want
to report an error, we need to use ApiMessage. We already were doing
this for action=upload. Now our action=edit API responses will be
consistent with MediaWiki and other extensions, and will be able to
take advantage of errorformat=html.
Since this breaks compatibility anyway, also remove some redundant
backwards-compatibility values from the output.
To avoid user interface regressions in VisualEditor, the changes
I3b9c4fef (in VE) and I106dbd3c (in MediaWiki) should be merged first.
Before:
{
"edit": {
"code": "abusefilter-disallowed",
"message": {
"key": "abusefilter-disallowed",
"params": [ ... ]
},
"abusefilter": { ... },
"info": "Hit AbuseFilter: Test filter disallow",
"warning": "This action has been automatically identified ...",
"result": "Failure"
}
}
After:
{
"errors": [
{
"code": "abusefilter-disallowed",
"data": {
"abusefilter": { ... },
},
"module": "edit",
"*": "This action has been automatically identified ..."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
For comparison, a 'readonly' error:
{
"errors": [
{
"code": "readonly",
"data": {
"readonlyreason": "foo bar"
},
"module": "main",
"*": "The wiki is currently in read-only mode."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
Bug: T229539
Depends-On: I106dbd3cbdbf7082b1d1f1c1106ece6b19c22a86
Depends-On: I3b9c4fefc0869ef7999c21cef754434febd852ec
Change-Id: I5424de387cbbcc9c85026b8cfeaf01635eee34a0
2019-08-01 01:48:08 +00:00
|
|
|
if ( !$filterResult->isOK() ) {
|
2016-06-16 15:40:36 +00:00
|
|
|
// Produce a useful error message for API edits
|
Actually return errors for action=edit API
Setting 'apiHookResult' results in a "successful" response; if we want
to report an error, we need to use ApiMessage. We already were doing
this for action=upload. Now our action=edit API responses will be
consistent with MediaWiki and other extensions, and will be able to
take advantage of errorformat=html.
Since this breaks compatibility anyway, also remove some redundant
backwards-compatibility values from the output.
To avoid user interface regressions in VisualEditor, the changes
I3b9c4fef (in VE) and I106dbd3c (in MediaWiki) should be merged first.
Before:
{
"edit": {
"code": "abusefilter-disallowed",
"message": {
"key": "abusefilter-disallowed",
"params": [ ... ]
},
"abusefilter": { ... },
"info": "Hit AbuseFilter: Test filter disallow",
"warning": "This action has been automatically identified ...",
"result": "Failure"
}
}
After:
{
"errors": [
{
"code": "abusefilter-disallowed",
"data": {
"abusefilter": { ... },
},
"module": "edit",
"*": "This action has been automatically identified ..."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
For comparison, a 'readonly' error:
{
"errors": [
{
"code": "readonly",
"data": {
"readonlyreason": "foo bar"
},
"module": "main",
"*": "The wiki is currently in read-only mode."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
Bug: T229539
Depends-On: I106dbd3cbdbf7082b1d1f1c1106ece6b19c22a86
Depends-On: I3b9c4fefc0869ef7999c21cef754434febd852ec
Change-Id: I5424de387cbbcc9c85026b8cfeaf01635eee34a0
2019-08-01 01:48:08 +00:00
|
|
|
$filterResultApi = self::getApiStatus( $filterResult );
|
|
|
|
$status->merge( $filterResultApi );
|
2016-04-07 05:06:02 +00:00
|
|
|
}
|
2019-09-16 16:53:36 +00:00
|
|
|
MediaWikiServices::getInstance()->getStatsdDataFactory()
|
|
|
|
->timing( 'timing.editAbuseFilter', microtime( true ) - $startTime );
|
2013-01-04 15:37:56 +00:00
|
|
|
}
|
|
|
|
|
2019-06-25 10:43:54 +00:00
|
|
|
/**
|
|
|
|
* Implementation for EditFilterMergedContent hook.
|
|
|
|
*
|
|
|
|
* @param IContextSource $context the context of the edit
|
2020-08-19 12:24:57 +00:00
|
|
|
* @param User $user
|
2019-06-25 10:43:54 +00:00
|
|
|
* @param Content $content the new Content generated by the edit
|
|
|
|
* @param string $summary Edit summary for page
|
|
|
|
* @param string $slot slot role for the content
|
|
|
|
* @return Status
|
|
|
|
*/
|
2020-08-19 12:24:57 +00:00
|
|
|
public static function filterEdit(
|
|
|
|
IContextSource $context,
|
|
|
|
User $user,
|
|
|
|
Content $content,
|
Actually return errors for action=edit API
Setting 'apiHookResult' results in a "successful" response; if we want
to report an error, we need to use ApiMessage. We already were doing
this for action=upload. Now our action=edit API responses will be
consistent with MediaWiki and other extensions, and will be able to
take advantage of errorformat=html.
Since this breaks compatibility anyway, also remove some redundant
backwards-compatibility values from the output.
To avoid user interface regressions in VisualEditor, the changes
I3b9c4fef (in VE) and I106dbd3c (in MediaWiki) should be merged first.
Before:
{
"edit": {
"code": "abusefilter-disallowed",
"message": {
"key": "abusefilter-disallowed",
"params": [ ... ]
},
"abusefilter": { ... },
"info": "Hit AbuseFilter: Test filter disallow",
"warning": "This action has been automatically identified ...",
"result": "Failure"
}
}
After:
{
"errors": [
{
"code": "abusefilter-disallowed",
"data": {
"abusefilter": { ... },
},
"module": "edit",
"*": "This action has been automatically identified ..."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
For comparison, a 'readonly' error:
{
"errors": [
{
"code": "readonly",
"data": {
"readonlyreason": "foo bar"
},
"module": "main",
"*": "The wiki is currently in read-only mode."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
Bug: T229539
Depends-On: I106dbd3cbdbf7082b1d1f1c1106ece6b19c22a86
Depends-On: I3b9c4fefc0869ef7999c21cef754434febd852ec
Change-Id: I5424de387cbbcc9c85026b8cfeaf01635eee34a0
2019-08-01 01:48:08 +00:00
|
|
|
$summary, $slot = SlotRecord::MAIN
|
2019-06-25 16:39:57 +00:00
|
|
|
) : Status {
|
2019-06-25 10:43:54 +00:00
|
|
|
self::$lastEditPage = null;
|
|
|
|
|
2019-06-25 16:39:57 +00:00
|
|
|
// @todo is there any real point in passing this in?
|
2020-09-29 18:48:51 +00:00
|
|
|
$text = AbuseFilterServices::getTextExtractor()->contentToString( $content );
|
2019-06-25 16:39:57 +00:00
|
|
|
|
2019-06-25 10:43:54 +00:00
|
|
|
$title = $context->getTitle();
|
2020-09-17 11:54:48 +00:00
|
|
|
$logger = LoggerFactory::getInstance( 'AbuseFilter' );
|
2019-06-25 10:43:54 +00:00
|
|
|
if ( $title === null ) {
|
|
|
|
// T144265: This *should* never happen.
|
|
|
|
$logger->warning( __METHOD__ . ' received a null title.' );
|
|
|
|
return Status::newGood();
|
|
|
|
}
|
2020-09-17 11:54:48 +00:00
|
|
|
if ( !$title->canExist() ) {
|
|
|
|
// This also should be handled in EditPage or whoever is calling the hook.
|
|
|
|
$logger->warning( __METHOD__ . ' received a Title that cannot exist.' );
|
|
|
|
// Note that if the title cannot exist, there's no much point in filtering the edit anyway
|
|
|
|
return Status::newGood();
|
2019-06-25 10:43:54 +00:00
|
|
|
}
|
2012-11-16 17:06:34 +00:00
|
|
|
|
2020-09-17 11:54:48 +00:00
|
|
|
$page = $context->getWikiPage();
|
|
|
|
|
2019-06-25 16:39:57 +00:00
|
|
|
$vars = new AbuseFilterVariableHolder();
|
2020-09-29 18:48:51 +00:00
|
|
|
$converter = AbuseFilterServices::getTextExtractor();
|
|
|
|
$builder = new RunVariableGenerator( $vars, $user, $title, $converter );
|
2019-06-25 16:39:57 +00:00
|
|
|
$vars = $builder->getEditVars( $content, $text, $summary, $slot, $page );
|
2019-06-25 10:43:54 +00:00
|
|
|
if ( $vars === null ) {
|
|
|
|
// We don't have to filter the edit
|
|
|
|
return Status::newGood();
|
|
|
|
}
|
2020-11-27 14:49:41 +00:00
|
|
|
$runnerFactory = AbuseFilterServices::getFilterRunnerFactory();
|
|
|
|
$runner = $runnerFactory->newRunner( $user, $title, $vars, 'default' );
|
Add a new class for methods related to running filters
Currently we strongly abuse (pardon the pun) the AbuseFilter class: its
purpose should be to hold static functions intended as generic utility
functions (e.g. to format messages, determine whether a filter is global
etc.), but we actually use it for all methods related to running filters.
This patch creates a new class, AbuseFilterRunner, containing all such
methods, which have been made non-static. This leads to several
improvements (also for related methods and the parser), and opens the
way to further improve the code.
Aside from making the code prettier, less global and easier to test,
this patch could also produce a performance improvement, although I
don't have tools to measure that.
Also note that many public methods have been removed, and almost any of
them has been made protected; a couple of them (the ones used from outside)
are left for back-compat, and will be removed in the future.
Change-Id: I2eab2e50356eeb5224446ee2d0df9c787ae95b80
2018-12-07 17:46:02 +00:00
|
|
|
$filterResult = $runner->run();
|
|
|
|
if ( !$filterResult->isOK() ) {
|
|
|
|
return $filterResult;
|
2008-06-27 09:26:54 +00:00
|
|
|
}
|
2012-02-10 23:41:05 +00:00
|
|
|
|
2018-12-09 16:58:57 +00:00
|
|
|
self::$lastEditPage = $page;
|
2012-02-10 23:41:05 +00:00
|
|
|
|
2016-06-20 21:58:17 +00:00
|
|
|
return Status::newGood();
|
2012-02-10 23:41:05 +00:00
|
|
|
}
|
|
|
|
|
2016-04-07 05:06:02 +00:00
|
|
|
/**
|
|
|
|
* @param Status $status Error message details
|
Actually return errors for action=edit API
Setting 'apiHookResult' results in a "successful" response; if we want
to report an error, we need to use ApiMessage. We already were doing
this for action=upload. Now our action=edit API responses will be
consistent with MediaWiki and other extensions, and will be able to
take advantage of errorformat=html.
Since this breaks compatibility anyway, also remove some redundant
backwards-compatibility values from the output.
To avoid user interface regressions in VisualEditor, the changes
I3b9c4fef (in VE) and I106dbd3c (in MediaWiki) should be merged first.
Before:
{
"edit": {
"code": "abusefilter-disallowed",
"message": {
"key": "abusefilter-disallowed",
"params": [ ... ]
},
"abusefilter": { ... },
"info": "Hit AbuseFilter: Test filter disallow",
"warning": "This action has been automatically identified ...",
"result": "Failure"
}
}
After:
{
"errors": [
{
"code": "abusefilter-disallowed",
"data": {
"abusefilter": { ... },
},
"module": "edit",
"*": "This action has been automatically identified ..."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
For comparison, a 'readonly' error:
{
"errors": [
{
"code": "readonly",
"data": {
"readonlyreason": "foo bar"
},
"module": "main",
"*": "The wiki is currently in read-only mode."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
Bug: T229539
Depends-On: I106dbd3cbdbf7082b1d1f1c1106ece6b19c22a86
Depends-On: I3b9c4fefc0869ef7999c21cef754434febd852ec
Change-Id: I5424de387cbbcc9c85026b8cfeaf01635eee34a0
2019-08-01 01:48:08 +00:00
|
|
|
* @return Status Status containing the same error messages with extra data for the API
|
2016-04-07 05:06:02 +00:00
|
|
|
*/
|
Actually return errors for action=edit API
Setting 'apiHookResult' results in a "successful" response; if we want
to report an error, we need to use ApiMessage. We already were doing
this for action=upload. Now our action=edit API responses will be
consistent with MediaWiki and other extensions, and will be able to
take advantage of errorformat=html.
Since this breaks compatibility anyway, also remove some redundant
backwards-compatibility values from the output.
To avoid user interface regressions in VisualEditor, the changes
I3b9c4fef (in VE) and I106dbd3c (in MediaWiki) should be merged first.
Before:
{
"edit": {
"code": "abusefilter-disallowed",
"message": {
"key": "abusefilter-disallowed",
"params": [ ... ]
},
"abusefilter": { ... },
"info": "Hit AbuseFilter: Test filter disallow",
"warning": "This action has been automatically identified ...",
"result": "Failure"
}
}
After:
{
"errors": [
{
"code": "abusefilter-disallowed",
"data": {
"abusefilter": { ... },
},
"module": "edit",
"*": "This action has been automatically identified ..."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
For comparison, a 'readonly' error:
{
"errors": [
{
"code": "readonly",
"data": {
"readonlyreason": "foo bar"
},
"module": "main",
"*": "The wiki is currently in read-only mode."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
Bug: T229539
Depends-On: I106dbd3cbdbf7082b1d1f1c1106ece6b19c22a86
Depends-On: I3b9c4fefc0869ef7999c21cef754434febd852ec
Change-Id: I5424de387cbbcc9c85026b8cfeaf01635eee34a0
2019-08-01 01:48:08 +00:00
|
|
|
private static function getApiStatus( Status $status ) {
|
|
|
|
$allActionsTaken = $status->getValue();
|
|
|
|
$statusForApi = Status::newGood();
|
|
|
|
|
|
|
|
foreach ( $status->getErrors() as $error ) {
|
|
|
|
list( $filterDescription, $filter ) = $error['params'];
|
|
|
|
$actionsTaken = $allActionsTaken[ $filter ];
|
|
|
|
|
|
|
|
$code = ( $actionsTaken === [ 'warn' ] ) ? 'abusefilter-warning' : 'abusefilter-disallowed';
|
|
|
|
$data = [
|
|
|
|
'abusefilter' => [
|
|
|
|
'id' => $filter,
|
|
|
|
'description' => $filterDescription,
|
|
|
|
'actions' => $actionsTaken,
|
|
|
|
],
|
|
|
|
];
|
|
|
|
|
|
|
|
$message = ApiMessage::create( $error, $code, $data );
|
|
|
|
$statusForApi->fatal( $message );
|
2016-04-07 05:06:02 +00:00
|
|
|
}
|
|
|
|
|
Actually return errors for action=edit API
Setting 'apiHookResult' results in a "successful" response; if we want
to report an error, we need to use ApiMessage. We already were doing
this for action=upload. Now our action=edit API responses will be
consistent with MediaWiki and other extensions, and will be able to
take advantage of errorformat=html.
Since this breaks compatibility anyway, also remove some redundant
backwards-compatibility values from the output.
To avoid user interface regressions in VisualEditor, the changes
I3b9c4fef (in VE) and I106dbd3c (in MediaWiki) should be merged first.
Before:
{
"edit": {
"code": "abusefilter-disallowed",
"message": {
"key": "abusefilter-disallowed",
"params": [ ... ]
},
"abusefilter": { ... },
"info": "Hit AbuseFilter: Test filter disallow",
"warning": "This action has been automatically identified ...",
"result": "Failure"
}
}
After:
{
"errors": [
{
"code": "abusefilter-disallowed",
"data": {
"abusefilter": { ... },
},
"module": "edit",
"*": "This action has been automatically identified ..."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
For comparison, a 'readonly' error:
{
"errors": [
{
"code": "readonly",
"data": {
"readonlyreason": "foo bar"
},
"module": "main",
"*": "The wiki is currently in read-only mode."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
Bug: T229539
Depends-On: I106dbd3cbdbf7082b1d1f1c1106ece6b19c22a86
Depends-On: I3b9c4fefc0869ef7999c21cef754434febd852ec
Change-Id: I5424de387cbbcc9c85026b8cfeaf01635eee34a0
2019-08-01 01:48:08 +00:00
|
|
|
return $statusForApi;
|
2016-04-07 05:06:02 +00:00
|
|
|
}
|
|
|
|
|
2016-06-13 11:53:50 +00:00
|
|
|
/**
|
2018-06-07 11:29:22 +00:00
|
|
|
* @param WikiPage $wikiPage
|
2020-06-16 04:12:38 +00:00
|
|
|
* @param UserIdentity $userIdentity
|
2016-06-13 11:53:50 +00:00
|
|
|
* @param string $summary
|
2018-06-07 11:29:22 +00:00
|
|
|
* @param int $flags
|
2020-06-16 04:12:38 +00:00
|
|
|
* @param RevisionRecord $revisionRecord
|
2016-06-13 11:53:50 +00:00
|
|
|
*/
|
2020-06-16 04:12:38 +00:00
|
|
|
public static function onPageSaveComplete(
|
|
|
|
WikiPage $wikiPage,
|
|
|
|
UserIdentity $userIdentity,
|
|
|
|
string $summary,
|
|
|
|
int $flags,
|
2020-06-22 09:52:14 +00:00
|
|
|
RevisionRecord $revisionRecord
|
2012-02-10 23:41:05 +00:00
|
|
|
) {
|
2019-01-05 18:28:03 +00:00
|
|
|
$curTitle = $wikiPage->getTitle()->getPrefixedText();
|
2019-09-01 09:23:31 +00:00
|
|
|
if ( !isset( AbuseFilter::$logIds[ $curTitle ] ) ||
|
2020-06-16 04:12:38 +00:00
|
|
|
$wikiPage !== self::$lastEditPage
|
2012-02-10 23:41:05 +00:00
|
|
|
) {
|
2019-01-05 18:28:03 +00:00
|
|
|
// This isn't the edit AbuseFilter::$logIds was set for
|
|
|
|
AbuseFilter::$logIds = [];
|
2018-06-07 11:24:53 +00:00
|
|
|
return;
|
2012-02-10 23:41:05 +00:00
|
|
|
}
|
|
|
|
|
2020-06-16 04:12:38 +00:00
|
|
|
// Ignore null edit.
|
|
|
|
$parentRevId = $revisionRecord->getParentId();
|
|
|
|
if ( $parentRevId !== null ) {
|
|
|
|
$parentRev = MediaWikiServices::getInstance()
|
|
|
|
->getRevisionLookup()
|
|
|
|
->getRevisionById( $parentRevId );
|
|
|
|
if ( $parentRev && $revisionRecord->hasSameContent( $parentRev ) ) {
|
|
|
|
AbuseFilter::$logIds = [];
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-12-09 16:58:57 +00:00
|
|
|
self::$lastEditPage = null;
|
2012-02-10 23:41:05 +00:00
|
|
|
|
2019-01-05 18:28:03 +00:00
|
|
|
$logs = AbuseFilter::$logIds[ $curTitle ];
|
|
|
|
if ( $logs[ 'local' ] ) {
|
2012-02-10 23:41:05 +00:00
|
|
|
// Now actually do our storage
|
2019-01-05 18:28:03 +00:00
|
|
|
$dbw = wfGetDB( DB_MASTER );
|
2012-02-10 23:41:05 +00:00
|
|
|
|
2019-01-05 18:28:03 +00:00
|
|
|
$dbw->update( 'abuse_filter_log',
|
2020-06-16 04:12:38 +00:00
|
|
|
[ 'afl_rev_id' => $revisionRecord->getId() ],
|
2019-01-05 18:28:03 +00:00
|
|
|
[ 'afl_id' => $logs['local'] ],
|
|
|
|
__METHOD__
|
|
|
|
);
|
|
|
|
}
|
2012-02-10 23:41:05 +00:00
|
|
|
|
2019-01-05 18:28:03 +00:00
|
|
|
if ( $logs[ 'global' ] ) {
|
2020-10-16 22:29:41 +00:00
|
|
|
$fdb = AbuseFilterServices::getCentralDBManager()->getConnection( DB_MASTER );
|
2019-01-05 18:28:03 +00:00
|
|
|
$fdb->update( 'abuse_filter_log',
|
2020-06-16 04:12:38 +00:00
|
|
|
[ 'afl_rev_id' => $revisionRecord->getId() ],
|
2020-01-08 13:33:10 +00:00
|
|
|
[ 'afl_id' => $logs['global'], 'afl_wiki' => WikiMap::getCurrentWikiDbDomain()->getId() ],
|
2019-01-05 18:28:03 +00:00
|
|
|
__METHOD__
|
|
|
|
);
|
2012-02-10 23:41:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-06-25 10:43:54 +00:00
|
|
|
/**
|
|
|
|
* @param Title $oldTitle
|
|
|
|
* @param Title $newTitle
|
|
|
|
* @param User $user
|
|
|
|
* @param string $reason
|
|
|
|
* @param Status &$status
|
|
|
|
*/
|
|
|
|
public static function onTitleMove(
|
|
|
|
Title $oldTitle,
|
|
|
|
Title $newTitle,
|
|
|
|
User $user,
|
|
|
|
$reason,
|
|
|
|
Status &$status
|
|
|
|
) {
|
2019-06-25 16:39:57 +00:00
|
|
|
$vars = new AbuseFilterVariableHolder();
|
2020-09-29 18:48:51 +00:00
|
|
|
$converter = AbuseFilterServices::getTextExtractor();
|
|
|
|
$builder = new RunVariableGenerator( $vars, $user, $oldTitle, $converter );
|
2019-06-25 16:39:57 +00:00
|
|
|
$vars = $builder->getMoveVars( $newTitle, $reason );
|
2020-11-27 14:49:41 +00:00
|
|
|
$runnerFactory = AbuseFilterServices::getFilterRunnerFactory();
|
|
|
|
$runner = $runnerFactory->newRunner( $user, $oldTitle, $vars, 'default' );
|
Add a new class for methods related to running filters
Currently we strongly abuse (pardon the pun) the AbuseFilter class: its
purpose should be to hold static functions intended as generic utility
functions (e.g. to format messages, determine whether a filter is global
etc.), but we actually use it for all methods related to running filters.
This patch creates a new class, AbuseFilterRunner, containing all such
methods, which have been made non-static. This leads to several
improvements (also for related methods and the parser), and opens the
way to further improve the code.
Aside from making the code prettier, less global and easier to test,
this patch could also produce a performance improvement, although I
don't have tools to measure that.
Also note that many public methods have been removed, and almost any of
them has been made protected; a couple of them (the ones used from outside)
are left for back-compat, and will be removed in the future.
Change-Id: I2eab2e50356eeb5224446ee2d0df9c787ae95b80
2018-12-07 17:46:02 +00:00
|
|
|
$result = $runner->run();
|
2014-10-27 17:55:33 +00:00
|
|
|
$status->merge( $result );
|
|
|
|
}
|
|
|
|
|
2019-06-25 10:43:54 +00:00
|
|
|
/**
|
|
|
|
* @param WikiPage $article
|
|
|
|
* @param User $user
|
|
|
|
* @param string $reason
|
|
|
|
* @param string &$error
|
|
|
|
* @param Status $status
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
public static function onArticleDelete( WikiPage $article, User $user, $reason, &$error,
|
|
|
|
Status $status ) {
|
2019-06-25 16:39:57 +00:00
|
|
|
$vars = new AbuseFilterVariableHolder();
|
2020-09-29 18:48:51 +00:00
|
|
|
$converter = AbuseFilterServices::getTextExtractor();
|
|
|
|
$builder = new RunVariableGenerator( $vars, $user, $article->getTitle(), $converter );
|
2019-06-25 16:39:57 +00:00
|
|
|
$vars = $builder->getDeleteVars( $reason );
|
2020-11-27 14:49:41 +00:00
|
|
|
$runnerFactory = AbuseFilterServices::getFilterRunnerFactory();
|
|
|
|
$runner = $runnerFactory->newRunner( $user, $article->getTitle(), $vars, 'default' );
|
Add a new class for methods related to running filters
Currently we strongly abuse (pardon the pun) the AbuseFilter class: its
purpose should be to hold static functions intended as generic utility
functions (e.g. to format messages, determine whether a filter is global
etc.), but we actually use it for all methods related to running filters.
This patch creates a new class, AbuseFilterRunner, containing all such
methods, which have been made non-static. This leads to several
improvements (also for related methods and the parser), and opens the
way to further improve the code.
Aside from making the code prettier, less global and easier to test,
this patch could also produce a performance improvement, although I
don't have tools to measure that.
Also note that many public methods have been removed, and almost any of
them has been made protected; a couple of them (the ones used from outside)
are left for back-compat, and will be removed in the future.
Change-Id: I2eab2e50356eeb5224446ee2d0df9c787ae95b80
2018-12-07 17:46:02 +00:00
|
|
|
$filterResult = $runner->run();
|
2009-10-07 13:57:06 +00:00
|
|
|
|
Add a new class for methods related to running filters
Currently we strongly abuse (pardon the pun) the AbuseFilter class: its
purpose should be to hold static functions intended as generic utility
functions (e.g. to format messages, determine whether a filter is global
etc.), but we actually use it for all methods related to running filters.
This patch creates a new class, AbuseFilterRunner, containing all such
methods, which have been made non-static. This leads to several
improvements (also for related methods and the parser), and opens the
way to further improve the code.
Aside from making the code prettier, less global and easier to test,
this patch could also produce a performance improvement, although I
don't have tools to measure that.
Also note that many public methods have been removed, and almost any of
them has been made protected; a couple of them (the ones used from outside)
are left for back-compat, and will be removed in the future.
Change-Id: I2eab2e50356eeb5224446ee2d0df9c787ae95b80
2018-12-07 17:46:02 +00:00
|
|
|
$status->merge( $filterResult );
|
|
|
|
$error = $filterResult->isOK() ? '' : $filterResult->getHTML();
|
2009-10-07 13:57:06 +00:00
|
|
|
|
Add a new class for methods related to running filters
Currently we strongly abuse (pardon the pun) the AbuseFilter class: its
purpose should be to hold static functions intended as generic utility
functions (e.g. to format messages, determine whether a filter is global
etc.), but we actually use it for all methods related to running filters.
This patch creates a new class, AbuseFilterRunner, containing all such
methods, which have been made non-static. This leads to several
improvements (also for related methods and the parser), and opens the
way to further improve the code.
Aside from making the code prettier, less global and easier to test,
this patch could also produce a performance improvement, although I
don't have tools to measure that.
Also note that many public methods have been removed, and almost any of
them has been made protected; a couple of them (the ones used from outside)
are left for back-compat, and will be removed in the future.
Change-Id: I2eab2e50356eeb5224446ee2d0df9c787ae95b80
2018-12-07 17:46:02 +00:00
|
|
|
return $filterResult->isOK();
|
2008-06-27 06:18:51 +00:00
|
|
|
}
|
2009-10-07 13:57:06 +00:00
|
|
|
|
2012-03-11 20:32:31 +00:00
|
|
|
/**
|
2017-08-04 23:14:10 +00:00
|
|
|
* @param RecentChange $recentChange
|
2012-03-11 20:32:31 +00:00
|
|
|
*/
|
2018-10-17 05:15:21 +00:00
|
|
|
public static function onRecentChangeSave( RecentChange $recentChange ) {
|
2020-10-13 16:01:18 +00:00
|
|
|
$tagger = AbuseFilterServices::getChangeTagger();
|
|
|
|
$tags = $tagger->getTagsForRecentChange( $recentChange );
|
|
|
|
if ( $tags ) {
|
|
|
|
$recentChange->addTags( $tags );
|
2009-01-28 19:08:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-11 20:32:31 +00:00
|
|
|
/**
|
2016-08-03 14:30:18 +00:00
|
|
|
* Filter an upload.
|
|
|
|
*
|
2016-06-17 15:23:42 +00:00
|
|
|
* @param UploadBase $upload
|
|
|
|
* @param User $user
|
2019-05-15 18:38:16 +00:00
|
|
|
* @param array|null $props
|
2016-06-17 15:23:42 +00:00
|
|
|
* @param string $comment
|
|
|
|
* @param string $pageText
|
2016-06-20 21:58:17 +00:00
|
|
|
* @param array|ApiMessage &$error
|
2016-06-17 15:23:42 +00:00
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
public static function onUploadVerifyUpload( UploadBase $upload, User $user,
|
2019-05-15 18:38:16 +00:00
|
|
|
$props, $comment, $pageText, &$error
|
2016-06-17 15:23:42 +00:00
|
|
|
) {
|
|
|
|
return self::filterUpload( 'upload', $upload, $user, $props, $comment, $pageText, $error );
|
|
|
|
}
|
|
|
|
|
2016-08-03 14:30:18 +00:00
|
|
|
/**
|
|
|
|
* Filter an upload to stash. If a filter doesn't need to check the page contents or
|
|
|
|
* upload comment, it can use `action='stashupload'` to provide better experience to e.g.
|
|
|
|
* UploadWizard (rejecting files immediately, rather than after the user adds the details).
|
|
|
|
*
|
|
|
|
* @param UploadBase $upload
|
|
|
|
* @param User $user
|
|
|
|
* @param array $props
|
|
|
|
* @param array|ApiMessage &$error
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
public static function onUploadStashFile( UploadBase $upload, User $user,
|
|
|
|
array $props, &$error
|
|
|
|
) {
|
|
|
|
return self::filterUpload( 'stashupload', $upload, $user, $props, null, null, $error );
|
|
|
|
}
|
|
|
|
|
2019-06-25 10:43:54 +00:00
|
|
|
/**
|
|
|
|
* Implementation for UploadStashFile and UploadVerifyUpload hooks.
|
|
|
|
*
|
|
|
|
* @param string $action 'upload' or 'stashupload'
|
|
|
|
* @param UploadBase $upload
|
|
|
|
* @param User $user User performing the action
|
|
|
|
* @param array|null $props File properties, as returned by MWFileProps::getPropsFromPath().
|
|
|
|
* @param string|null $summary Upload log comment (also used as edit summary)
|
|
|
|
* @param string|null $text File description page text (only used for new uploads)
|
|
|
|
* @param array|ApiMessage &$error
|
|
|
|
* @return bool
|
|
|
|
*/
|
|
|
|
public static function filterUpload( $action, UploadBase $upload, User $user,
|
|
|
|
$props, $summary, $text, &$error
|
|
|
|
) {
|
|
|
|
$title = $upload->getTitle();
|
|
|
|
if ( $title === null ) {
|
|
|
|
// T144265: This could happen for 'stashupload' if the specified title is invalid.
|
|
|
|
// Let UploadBase warn the user about that, and we'll filter later.
|
|
|
|
$logger = LoggerFactory::getInstance( 'AbuseFilter' );
|
|
|
|
$logger->warning( __METHOD__ . " received a null title. Action: $action." );
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2019-06-25 16:39:57 +00:00
|
|
|
$vars = new AbuseFilterVariableHolder();
|
2020-09-29 18:48:51 +00:00
|
|
|
$converter = AbuseFilterServices::getTextExtractor();
|
|
|
|
$builder = new RunVariableGenerator( $vars, $user, $title, $converter );
|
2019-06-25 16:39:57 +00:00
|
|
|
$vars = $builder->getUploadVars( $action, $upload, $summary, $text, $props );
|
2019-06-25 10:43:54 +00:00
|
|
|
if ( $vars === null ) {
|
|
|
|
return true;
|
|
|
|
}
|
2020-11-27 14:49:41 +00:00
|
|
|
$runnerFactory = AbuseFilterServices::getFilterRunnerFactory();
|
|
|
|
$runner = $runnerFactory->newRunner( $user, $title, $vars, 'default' );
|
Add a new class for methods related to running filters
Currently we strongly abuse (pardon the pun) the AbuseFilter class: its
purpose should be to hold static functions intended as generic utility
functions (e.g. to format messages, determine whether a filter is global
etc.), but we actually use it for all methods related to running filters.
This patch creates a new class, AbuseFilterRunner, containing all such
methods, which have been made non-static. This leads to several
improvements (also for related methods and the parser), and opens the
way to further improve the code.
Aside from making the code prettier, less global and easier to test,
this patch could also produce a performance improvement, although I
don't have tools to measure that.
Also note that many public methods have been removed, and almost any of
them has been made protected; a couple of them (the ones used from outside)
are left for back-compat, and will be removed in the future.
Change-Id: I2eab2e50356eeb5224446ee2d0df9c787ae95b80
2018-12-07 17:46:02 +00:00
|
|
|
$filterResult = $runner->run();
|
2009-10-07 13:57:06 +00:00
|
|
|
|
Add a new class for methods related to running filters
Currently we strongly abuse (pardon the pun) the AbuseFilter class: its
purpose should be to hold static functions intended as generic utility
functions (e.g. to format messages, determine whether a filter is global
etc.), but we actually use it for all methods related to running filters.
This patch creates a new class, AbuseFilterRunner, containing all such
methods, which have been made non-static. This leads to several
improvements (also for related methods and the parser), and opens the
way to further improve the code.
Aside from making the code prettier, less global and easier to test,
this patch could also produce a performance improvement, although I
don't have tools to measure that.
Also note that many public methods have been removed, and almost any of
them has been made protected; a couple of them (the ones used from outside)
are left for back-compat, and will be removed in the future.
Change-Id: I2eab2e50356eeb5224446ee2d0df9c787ae95b80
2018-12-07 17:46:02 +00:00
|
|
|
if ( !$filterResult->isOK() ) {
|
Actually return errors for action=edit API
Setting 'apiHookResult' results in a "successful" response; if we want
to report an error, we need to use ApiMessage. We already were doing
this for action=upload. Now our action=edit API responses will be
consistent with MediaWiki and other extensions, and will be able to
take advantage of errorformat=html.
Since this breaks compatibility anyway, also remove some redundant
backwards-compatibility values from the output.
To avoid user interface regressions in VisualEditor, the changes
I3b9c4fef (in VE) and I106dbd3c (in MediaWiki) should be merged first.
Before:
{
"edit": {
"code": "abusefilter-disallowed",
"message": {
"key": "abusefilter-disallowed",
"params": [ ... ]
},
"abusefilter": { ... },
"info": "Hit AbuseFilter: Test filter disallow",
"warning": "This action has been automatically identified ...",
"result": "Failure"
}
}
After:
{
"errors": [
{
"code": "abusefilter-disallowed",
"data": {
"abusefilter": { ... },
},
"module": "edit",
"*": "This action has been automatically identified ..."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
For comparison, a 'readonly' error:
{
"errors": [
{
"code": "readonly",
"data": {
"readonlyreason": "foo bar"
},
"module": "main",
"*": "The wiki is currently in read-only mode."
}
],
"*": "See http://localhost:3080/w/api.php for API usage. ..."
}
Bug: T229539
Depends-On: I106dbd3cbdbf7082b1d1f1c1106ece6b19c22a86
Depends-On: I3b9c4fefc0869ef7999c21cef754434febd852ec
Change-Id: I5424de387cbbcc9c85026b8cfeaf01635eee34a0
2019-08-01 01:48:08 +00:00
|
|
|
// Produce a useful error message for API edits
|
|
|
|
$filterResultApi = self::getApiStatus( $filterResult );
|
|
|
|
// @todo Return all errors instead of only the first one
|
|
|
|
$error = $filterResultApi->getErrors()[0]['message'];
|
2013-02-28 01:25:59 +00:00
|
|
|
}
|
2009-10-07 13:57:06 +00:00
|
|
|
|
Add a new class for methods related to running filters
Currently we strongly abuse (pardon the pun) the AbuseFilter class: its
purpose should be to hold static functions intended as generic utility
functions (e.g. to format messages, determine whether a filter is global
etc.), but we actually use it for all methods related to running filters.
This patch creates a new class, AbuseFilterRunner, containing all such
methods, which have been made non-static. This leads to several
improvements (also for related methods and the parser), and opens the
way to further improve the code.
Aside from making the code prettier, less global and easier to test,
this patch could also produce a performance improvement, although I
don't have tools to measure that.
Also note that many public methods have been removed, and almost any of
them has been made protected; a couple of them (the ones used from outside)
are left for back-compat, and will be removed in the future.
Change-Id: I2eab2e50356eeb5224446ee2d0df9c787ae95b80
2018-12-07 17:46:02 +00:00
|
|
|
return $filterResult->isOK();
|
2009-10-07 13:57:06 +00:00
|
|
|
}
|
2011-08-26 20:12:34 +00:00
|
|
|
|
2020-09-30 13:15:27 +00:00
|
|
|
/**
|
|
|
|
* For integration with the Renameuser extension.
|
|
|
|
*
|
|
|
|
* @param RenameuserSQL $renameUserSQL
|
|
|
|
*/
|
|
|
|
public static function onRenameUserSQL( RenameuserSQL $renameUserSQL ) {
|
|
|
|
$renameUserSQL->tablesJob['abuse_filter'] = [
|
|
|
|
RenameuserSQL::NAME_COL => 'af_user_text',
|
|
|
|
RenameuserSQL::UID_COL => 'af_user',
|
|
|
|
RenameuserSQL::TIME_COL => 'af_timestamp',
|
|
|
|
'uniqueKey' => 'af_id'
|
|
|
|
];
|
|
|
|
$renameUserSQL->tablesJob['abuse_filter_history'] = [
|
|
|
|
RenameuserSQL::NAME_COL => 'afh_user_text',
|
|
|
|
RenameuserSQL::UID_COL => 'afh_user',
|
|
|
|
RenameuserSQL::TIME_COL => 'afh_timestamp',
|
|
|
|
'uniqueKey' => 'afh_id'
|
|
|
|
];
|
|
|
|
}
|
|
|
|
|
2014-07-10 03:57:02 +00:00
|
|
|
/**
|
|
|
|
* Tables that Extension:UserMerge needs to update
|
|
|
|
*
|
2017-10-06 18:52:31 +00:00
|
|
|
* @param array &$updateFields
|
2014-07-10 03:57:02 +00:00
|
|
|
*/
|
|
|
|
public static function onUserMergeAccountFields( array &$updateFields ) {
|
2017-06-15 14:23:34 +00:00
|
|
|
$updateFields[] = [ 'abuse_filter', 'af_user', 'af_user_text' ];
|
|
|
|
$updateFields[] = [ 'abuse_filter_log', 'afl_user', 'afl_user_text' ];
|
|
|
|
$updateFields[] = [ 'abuse_filter_history', 'afh_user', 'afh_user_text' ];
|
2014-07-10 03:57:02 +00:00
|
|
|
}
|
|
|
|
|
2016-01-27 01:37:58 +00:00
|
|
|
/**
|
|
|
|
* Warms the cache for getLastPageAuthors() - T116557
|
|
|
|
*
|
|
|
|
* @param WikiPage $page
|
|
|
|
* @param Content $content
|
|
|
|
* @param ParserOutput $output
|
2016-06-13 11:53:50 +00:00
|
|
|
* @param string $summary
|
2019-09-23 21:33:51 +00:00
|
|
|
* @param User $user
|
2016-01-27 01:37:58 +00:00
|
|
|
*/
|
|
|
|
public static function onParserOutputStashForEdit(
|
2020-02-22 19:06:56 +00:00
|
|
|
WikiPage $page, Content $content, ParserOutput $output, string $summary, User $user
|
2016-01-27 01:37:58 +00:00
|
|
|
) {
|
2019-01-10 23:21:28 +00:00
|
|
|
// XXX: This makes the assumption that this method is only ever called for the main slot.
|
|
|
|
// Which right now holds true, but any more fancy MCR stuff will likely break here...
|
|
|
|
$slot = SlotRecord::MAIN;
|
|
|
|
|
2016-06-27 18:30:29 +00:00
|
|
|
// Cache any resulting filter matches.
|
|
|
|
// Do this outside the synchronous stash lock to avoid any chance of slowdown.
|
|
|
|
DeferredUpdates::addCallableUpdate(
|
2019-09-16 16:53:36 +00:00
|
|
|
function () use (
|
|
|
|
$user,
|
|
|
|
$page,
|
|
|
|
$summary,
|
|
|
|
$content,
|
2019-06-25 16:39:57 +00:00
|
|
|
$slot
|
2019-09-16 16:53:36 +00:00
|
|
|
) {
|
|
|
|
$startTime = microtime( true );
|
2019-06-25 16:39:57 +00:00
|
|
|
$vars = new AbuseFilterVariableHolder();
|
2020-09-29 18:48:51 +00:00
|
|
|
$converter = AbuseFilterServices::getTextExtractor();
|
|
|
|
$generator = new RunVariableGenerator( $vars, $user, $page->getTitle(), $converter );
|
2019-06-25 16:39:57 +00:00
|
|
|
$vars = $generator->getStashEditVars( $content, $summary, $slot, $page );
|
|
|
|
if ( !$vars ) {
|
|
|
|
return;
|
|
|
|
}
|
2020-11-27 14:49:41 +00:00
|
|
|
$runnerFactory = AbuseFilterServices::getFilterRunnerFactory();
|
|
|
|
$runner = $runnerFactory->newRunner( $user, $page->getTitle(), $vars, 'default' );
|
Add a new class for methods related to running filters
Currently we strongly abuse (pardon the pun) the AbuseFilter class: its
purpose should be to hold static functions intended as generic utility
functions (e.g. to format messages, determine whether a filter is global
etc.), but we actually use it for all methods related to running filters.
This patch creates a new class, AbuseFilterRunner, containing all such
methods, which have been made non-static. This leads to several
improvements (also for related methods and the parser), and opens the
way to further improve the code.
Aside from making the code prettier, less global and easier to test,
this patch could also produce a performance improvement, although I
don't have tools to measure that.
Also note that many public methods have been removed, and almost any of
them has been made protected; a couple of them (the ones used from outside)
are left for back-compat, and will be removed in the future.
Change-Id: I2eab2e50356eeb5224446ee2d0df9c787ae95b80
2018-12-07 17:46:02 +00:00
|
|
|
$runner->runForStash();
|
2019-06-25 16:39:57 +00:00
|
|
|
$totalTime = microtime( true ) - $startTime;
|
2019-09-16 16:53:36 +00:00
|
|
|
MediaWikiServices::getInstance()->getStatsdDataFactory()
|
|
|
|
->timing( 'timing.stashAbuseFilter', $totalTime );
|
2016-06-27 18:30:29 +00:00
|
|
|
},
|
|
|
|
DeferredUpdates::PRESEND
|
2016-06-13 11:53:50 +00:00
|
|
|
);
|
2016-01-27 01:37:58 +00:00
|
|
|
}
|
2020-11-10 12:58:11 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* @param array &$notifications
|
|
|
|
* @param array &$notificationCategories
|
|
|
|
* @param array &$icons
|
|
|
|
*/
|
|
|
|
public static function onBeforeCreateEchoEvent(
|
|
|
|
array &$notifications,
|
|
|
|
array &$notificationCategories,
|
|
|
|
array &$icons
|
|
|
|
) {
|
|
|
|
$notifications[ EchoNotifier::EVENT_TYPE ] = [
|
|
|
|
'category' => 'system',
|
|
|
|
'section' => 'alert',
|
|
|
|
'group' => 'negative',
|
|
|
|
'presentation-model' => ThrottleFilterPresentationModel::class,
|
|
|
|
EchoAttributeManager::ATTR_LOCATORS => [
|
|
|
|
[
|
|
|
|
[ EchoUserLocator::class, 'locateFromEventExtra' ],
|
|
|
|
[ 'user' ]
|
|
|
|
]
|
|
|
|
],
|
|
|
|
];
|
|
|
|
}
|
|
|
|
|
2008-06-27 06:18:51 +00:00
|
|
|
}
|