wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-23 21:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only run filters once for direct uploads (without stash)

Browse source 
Uses the new UploadStashFile hook.

Bug: T140522
Depends-On: I2f574b355cd33b2e9fa7ff8e1793503b257cce65
Change-Id: Ic7c2dbc54c6ad300d26172796ee21027a8c372ee
This commit is contained in:
Bartosz Dziewoński 2016-08-03 16:30:18 +02:00
parent 4f4d1d7079
commit f2e05b105b
2 changed files with 27 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
AbuseFilter.hooks.php
View file

@ -699,6 +699,8 @@ class AbuseFilterHooks {
}
/**
* Filter an upload.
*
* @param UploadBase $upload
* @param User $user
* @param array $props
@ -713,6 +715,23 @@ class AbuseFilterHooks {
return self::filterUpload( 'upload', $upload, $user, $props, $comment, $pageText, $error );
}
/**
* 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 );
}
/**
* @param UploadBase $upload
* @param string $mime
@ -722,17 +741,17 @@ class AbuseFilterHooks {
public static function onUploadVerifyFile( $upload, $mime, &$error ) {
global $wgUser, $wgVersion;
// On MW 1.27 and older, this is the only hook we can use, even though it's deficient.
// On MW 1.28 and newer, we use UploadVerifyUpload to check file uploads, and this one only
// to check file uploads 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).
$action = version_compare( $wgVersion, '1.28', '<' ) ? 'upload' : 'stashupload';
// We only use this hook on MW 1.27 and older, as it's is the only hook we have.
// On MW 1.28 and newer, we use UploadVerifyUpload to check file uploads, and
// UploadStashFile to check file uploads to stash.
if ( version_compare( $wgVersion, '1.28', '>=' ) ) {
return;
}
// UploadBase makes it absolutely impossible to get these out of it, even though it knows them.
$props = FSFile::getPropsFromPath( $upload->getTempPath() );
return self::filterUpload( $action, $upload, $wgUser, $props, null, null, $error );
return self::filterUpload( 'upload', $upload, $wgUser, $props, null, null, $error );
}
/**

1
extension.json
View file

@ -180,6 +180,7 @@
"ContributionsToolLinks": "AbuseFilterHooks::onContributionsToolLinks",
"UploadVerifyFile": "AbuseFilterHooks::onUploadVerifyFile",
"UploadVerifyUpload": "AbuseFilterHooks::onUploadVerifyUpload",
"UploadStashFile": "AbuseFilterHooks::onUploadStashFile",
"MakeGlobalVariablesScript": "AbuseFilterHooks::onMakeGlobalVariablesScript",
"ArticleSaveComplete": "AbuseFilterHooks::onArticleSaveComplete",
"UserMergeAccountFields": "AbuseFilterHooks::onUserMergeAccountFields",