wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-27 15:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use the UploadVerifyFile hook

Browse source 
Use the UploadVerifyFile hook instead of the UploadVerification
one as it provides more data about the upload.
This is the first step towards better upload filtering.

Change-Id: Ie535c7d20ed79a1e26d8d399a7c25d632c9c7fa0
This commit is contained in:
Marius Hoch 2013-02-28 02:25:59 +01:00
parent b29209f562
commit 3c5a074881
2 changed files with 26 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
AbuseFilter.hooks.php
View file

@ -493,32 +493,43 @@ class AbuseFilterHooks {
}
/**
* @param $saveName
* @param $tempName
* @param $error
* Handler for the UploadVerifyFile hook
*
* @param $upload UploadBase
* @param $mime
* @param $error array
*
* @return bool
*/
public static function onUploadVerification( $saveName, $tempName, &$error ) {
$vars = new AbuseFilterVariableHolder;
public static function onUploadVerifyFile( $upload, $mime, &$error ) {
global $wgUser, $wgVersion;
global $wgUser;
$title = Title::makeTitle( NS_FILE, $saveName );
$vars = new AbuseFilterVariableHolder;
$title = $upload->getTitle();
$vars->addHolders(
AbuseFilter::generateUserVars( $wgUser ),
AbuseFilter::generateTitleVars( $title, 'FILE' )
);
$vars->setVar( 'ACTION', 'upload' );
$vars->setVar( 'file_sha1', sha1_file( $tempName ) ); // TODO share with save
// We us the hexadecimal version of the file sha1
if ( version_compare( $wgVersion, '1.21', '>=' ) ) {
// Use UploadBase::getTempFileSha1Base36 so that we don't have to calculate the sha1 sum again
$sha1 = wfBaseConvert( $upload->getTempFileSha1Base36() , 36, 16, 40 );
} else {
// UploadBase::getTempFileSha1Base36 wasn't public until 1.21
$sha1 = sha1_file( $upload->getTempPath() );
}
$vars->setVar( 'file_sha1', $sha1 );
$filter_result = AbuseFilter::filterAction( $vars, $title );
// XXX: HACK: return the first error, as an array containing the message key and
// any parameters.
// XXX: $errors may in the future also contain Message objects. Make sure UploadBase can
// deal with us returning that.
$errors = array_values( (array)$filter_result->getErrorsArray() );
$error = empty( $errors ) ? '' : $errors[0];
if ( !$filter_result->isOK() ) {
$error = $filter_result->getErrorsArray();
$error = $error[0];
}
return $filter_result->isOK();
}

2
AbuseFilter.php
View file

@ -84,7 +84,7 @@ $wgHooks['RecentChange_save'][] = 'AbuseFilterHooks::onRecentChangeSave';
$wgHooks['ListDefinedTags'][] = 'AbuseFilterHooks::onListDefinedTags';
$wgHooks['LoadExtensionSchemaUpdates'][] = 'AbuseFilterHooks::onLoadExtensionSchemaUpdates';
$wgHooks['ContributionsToolLinks'][] = 'AbuseFilterHooks::onContributionsToolLinks';
$wgHooks['UploadVerification'][] = 'AbuseFilterHooks::onUploadVerification';
$wgHooks['UploadVerifyFile'][] = 'AbuseFilterHooks::onUploadVerifyFile';
$wgHooks['MakeGlobalVariablesScript'][] = 'AbuseFilterHooks::onMakeGlobalVariablesScript';
$wgHooks['ArticleSaveComplete'][] = 'AbuseFilterHooks::onArticleSaveComplete';