From: Bryan Tong Minh Date: Wed, 27 Aug 2008 17:38:33 +0000 (+0000) Subject: Splitting backend upload code from SpecialUpload. X-Git-Tag: 1.31.0-rc.0~45619 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles_versions%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=bce3733c01fb5d498ebfb9a0665947cb830782cb;p=lhc%2Fweb%2Fwiklou.git Splitting backend upload code from SpecialUpload. * All common upload code resides in UploadFromBase. Then depending on the upload source, one of its derived classes is initiated by Special:Upload. * SpecialUpload::ajaxGetExistsWarning now only returns warnings that are related to existence. * Allow LocalFile::upload to attribute the upload to another user than $wgUser This introduces breaking changes for upload extensions. --- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 1de37273f6..73caa64e1d 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -96,6 +96,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN instead of a hardcoded colon. * Allow to accept image names without an Image: prefix * Add tooltips to rollback and undo links +* Backend upload code has been removed from SpecialUpload.php. This may cause + backwards incompatibility with upload extensions. + === Bug fixes in 1.14 === diff --git a/docs/upload.txt b/docs/upload.txt new file mode 100644 index 0000000000..e92ca78624 --- /dev/null +++ b/docs/upload.txt @@ -0,0 +1,40 @@ +Special:Upload: + +wfSpecialUpload + new UploadForm + mUpload = new UploadFrom... + execute() + $wgEnableUploads + isAllowed(upload) + isBlocked() + wfReadOnly() + processUpload() + internalProcessUpload() + wfRunHooks(UploadForm:BeforeProcessing) + mUpload->getTitle() + wfStripIllegalFilenameChars + splitExtensions() + checkFileExtension() + Title::makeTitleSafe + getUserPermissionsErrors(edit; upload; create) + mUpload->verifyUpload() + empty(mFileSize) + getTitle() + checkOverwrite() + verifyFile() + checkMacBinary() + wfRunHooks(UploadVerification) + if(!ignoreWarning) mUpload->checkWarnings() + getInitialPageText() + mUpload->performUpload() + mLocalFile->upload() + if(isGood() && $watch) addWatch() + if(isGood()) wfRunHooks(UploadComplete) + wfRunHooks(SpecialUploadComplete) + +Changes: + * "Your file will be renamed to $1" check now done on the result of + Title::makeTitleSafe instead of filteredName + * getExistWarning only really does existence checks + * Other stuff forgotten to be documented + \ No newline at end of file diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 8d01ae2aa1..50e9276879 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -188,6 +188,10 @@ $wgAutoloadLocalClasses = array( 'TransformParameterError' => 'includes/MediaTransformOutput.php', 'TurckBagOStuff' => 'includes/BagOStuff.php', 'UnlistedSpecialPage' => 'includes/SpecialPage.php', + 'UploadFromBase' => 'includes/UploadFromBase.php', + 'UploadFromStash' => 'includes/UploadFromStash.php', + 'UploadFromUpload' => 'includes/UploadFromUpload.php', + 'UploadFromUrl' => 'includes/UploadFromUrl.php', 'User' => 'includes/User.php', 'UserArray' => 'includes/UserArray.php', 'UserArrayFromResult' => 'includes/UserArray.php', diff --git a/includes/UploadFromBase.php b/includes/UploadFromBase.php new file mode 100644 index 0000000000..b7cbabc5df --- /dev/null +++ b/includes/UploadFromBase.php @@ -0,0 +1,794 @@ +mDesiredDestName = $name; + } + + + function verifyUpload( &$resultDetails ) { + global $wgUser; + + /** + * If there was no filename or a zero size given, give up quick. + */ + if( empty( $this->mFileSize ) ) { + return self::EMPTY_FILE; + } + + $nt = $this->getTitle(); + if( !( $nt instanceof Title ) ) { + if( $nt == self::ILLEGAL_FILENAME ) + $resultDetails = array( 'filtered' => $this->mFilteredName ); + if ( $nt == self::FILETYPE_BADTYPE ) + $resultDetails = array( 'finalExt' => $this->mFinalExtension ); + // $nt is an error constant + return $nt; + } + $this->mLocalFile = wfLocalFile( $nt ); + $this->mDestName = $this->mLocalFile->getName(); + + /** + * In some cases we may forbid overwriting of existing files. + */ + $overwrite = $this->checkOverwrite( $this->mDestName ); + if( $overwrite !== true ) { + $resultDetails = array( 'overwrite' => $overwrite ); + return self::OVERWRITE_EXISTING_FILE; + } + + /** + * Look at the contents of the file; if we can recognize the + * type but it's corrupt or data of the wrong type, we should + * probably not accept it. + */ + $veri = $this->verifyFile( $this->mTempPath ); + + if( $veri !== true ) { + if( !is_array( $veri ) ) + $veri = array( $veri ); + $resultDetails = array( 'veri' => $veri ); + return self::VERIFICATION_ERROR; + } + + $error = ''; + if( !wfRunHooks( 'UploadVerification', + array( $this->mDestName, $this->mTempPath, &$error ) ) ) { + $resultDetails = array( 'error' => $error ); + return self::UPLOAD_VERIFICATION_ERROR; + } + + return self::OK; + } + + /** + * Verifies that it's ok to include the uploaded file + * + * @param string $tmpfile the full path of the temporary file to verify + * @param string $extension The filename extension that the file is to be served with + * @return mixed true of the file is verified, a WikiError object otherwise. + */ + protected function verifyFile( $tmpfile ) { + $this->mFileProps = File::getPropsFromPath( $this->mTempPath, + $this->mFinalExtension ); + $this->checkMacBinary(); + + #magically determine mime type + $magic = MimeMagic::singleton(); + $mime = $magic->guessMimeType( $tmpfile, false ); + + #check mime type, if desired + global $wgVerifyMimeType; + if ( $wgVerifyMimeType ) { + + wfDebug ( "\n\nmime: <$mime> extension: <{$this->mFinalExtension}>\n\n"); + #check mime type against file extension + if( !self::verifyExtension( $mime, $this->mFinalExtension ) ) { + return 'uploadcorrupt'; + } + + #check mime type blacklist + global $wgMimeTypeBlacklist; + if( isset($wgMimeTypeBlacklist) && !is_null($wgMimeTypeBlacklist) + && $this->checkFileExtension( $mime, $wgMimeTypeBlacklist ) ) { + return array( 'filetype-badmime', $mime ); + } + } + + #check for htmlish code and javascript + if( $this->detectScript ( $tmpfile, $mime, $this->mFinalExtension ) ) { + return 'uploadscripted'; + } + + /** + * Scan the uploaded file for viruses + */ + $virus = $this->detectVirus($tmpfile); + if ( $virus ) { + return array( 'uploadvirus', $virus ); + } + + wfDebug( __METHOD__.": all clear; passing.\n" ); + return true; + } + + function verifyPermissions( $user ) { + /** + * If the image is protected, non-sysop users won't be able + * to modify it by uploading a new revision. + */ + $nt = $this->getTitle(); + $permErrors = $nt->getUserPermissionsErrors( 'edit', $user ); + $permErrorsUpload = $nt->getUserPermissionsErrors( 'upload', $user ); + $permErrorsCreate = ( $nt->exists() ? array() : $nt->getUserPermissionsErrors( 'create', $user ) ); + if( $permErrors || $permErrorsUpload || $permErrorsCreate ) { + $permErrors = array_merge( $permErrors, wfArrayDiff2( $permErrorsUpload, $permErrors ) ); + $permErrors = array_merge( $permErrors, wfArrayDiff2( $permErrorsCreate, $permErrors ) ); + return $permErrors; + } + return true; + } + + function checkWarnings() { + $warning = array(); + + $filename = $this->mLocalFile->getName(); + $n = strrpos( $filename, '.' ); + $partname = $n ? substr( $filename, 0, $n ) : $filename; + + global $wgCapitalLinks; + if( $this->mDesiredDestName != $filename ) + // Use mFilteredName so that we don't have to bother about spaces + $warning['badfilename'] = $filename; + + global $wgCheckFileExtensions, $wgFileExtensions; + if ( $wgCheckFileExtensions ) { + if ( !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) + $warning['filetype-unwanted-type'] = $this->mFinalExtension; + } + + global $wgUploadSizeWarning; + if ( $wgUploadSizeWarning && ( $this->mFileSize > $wgUploadSizeWarning ) ) + $warning['large-file'] = $wgUploadSizeWarning; + + if ( $this->mFileSize == 0 ) + $warning['emptyfile'] = true; + + $exists = self::getExistsWarning( $this->mLocalFile ); + if( $exists !== false ) + $warning['exists'] = $exists; + + + if( $exists !== false && $exists[0] != 'thumb' + && self::isThumbName( $this->mLocalFile->getName() ) ) + $warning['file-thumbnail-no'] = substr( $filename , 0, + strpos( $nt->getText() , '-' ) +1 ); + + $hash = File::sha1Base36( $this->mTempPath ); + $dupes = RepoGroup::singleton()->findBySha1( $hash ); + if( $dupes ) + $warning['duplicate'] = $dupes; + + $filenamePrefixBlacklist = self::getFilenamePrefixBlacklist(); + foreach( $filenamePrefixBlacklist as $prefix ) { + if ( substr( $partname, 0, strlen( $prefix ) ) == $prefix ) { + $warning['filename-bad-prefix'] = $prefix; + break; + } + } + + # If the file existed before and was deleted, warn the user of this + # Don't bother doing so if the file exists now, however + if( $this->mLocalFile->wasDeleted() && !$file->exists() ) + $warning['filewasdeleted'] = true; + + return $warning; + } + + function performUpload( $comment, $pageText, $watch, $user ) { + $status = $this->mLocalFile->upload( $this->mTempPath, $comment, $pageText, + File::DELETE_SOURCE, $this->mFileProps, false, $user ); + + if( $status->isGood() && $watch ) { + $user->addWatch( $this->mLocalFile->getTitle() ); + } + + if( $status->isGood() ) + wfRunHooks( 'UploadComplete', array( &$this ) ); + + return $status; + } + + /** + * Returns a title or a numeric error constant + */ + function getTitle() { + if ( $this->mTitle !== false ) + return $this->mTitle; + + /** + * Chop off any directories in the given filename. Then + * filter out illegal characters, and try to make a legible name + * out of it. We'll strip some silently that Title would die on. + */ + + $basename = $this->mDesiredDestName; + + $this->mFilteredName = wfStripIllegalFilenameChars( $basename ); + + /** + * We'll want to blacklist against *any* 'extension', and use + * only the final one for the whitelist. + */ + list( $partname, $ext ) = $this->splitExtensions( $this->mFilteredName ); + + if( count( $ext ) ) { + $this->mFinalExtension = $ext[count( $ext ) - 1]; + } else { + $this->mFinalExtension = ''; + } + + /* Don't allow users to override the blacklist (check file extension) */ + global $wgCheckFileExtensions, $wgStrictFileExtensions; + global $wgFileExtensions, $wgFileBlacklist; + if ( $this->mFinalExtension == '' ) { + return self::FILETYPE_MISSING; + } elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) || + ( $wgCheckFileExtensions && $wgStrictFileExtensions && + !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) { + return self::FILETYPE_BADTYPE; + } + + # If there was more than one "extension", reassemble the base + # filename to prevent bogus complaints about length + if( count( $ext ) > 1 ) { + for( $i = 0; $i < count( $ext ) - 1; $i++ ) + $partname .= '.' . $ext[$i]; + } + + if( strlen( $partname ) < 1 ) { + return self::MIN_LENGHT_PARTNAME; + } + + $nt = Title::makeTitleSafe( NS_IMAGE, $this->mFilteredName ); + if( is_null( $nt ) ) + return self::ILLEGAL_FILENAME; + return $this->mTitle = $nt; + } + + function getLocalFile() { + if( is_null( $this->mLocalFile ) ) + $this->mLocalFile = wfLocalFile( $this->getTitle() ); + return $this->mLocalFile; + } + + /** + * Stash a file in a temporary directory for later processing + * after the user has confirmed it. + * + * If the user doesn't explicitly cancel or accept, these files + * can accumulate in the temp directory. + * + * @param string $saveName - the destination filename + * @param string $tempName - the source temporary file to save + * @return string - full path the stashed file, or false on failure + * @access private + */ + function saveTempUploadedFile( $saveName, $tempName ) { + global $wgOut; + $repo = RepoGroup::singleton()->getLocalRepo(); + $status = $repo->storeTemp( $saveName, $tempName ); + if ( !$status->isGood() ) { + $this->showError( $status->getWikiText() ); + return false; + } else { + return $status->value; + } + } + + /** + * Stash a file in a temporary directory for later processing, + * and save the necessary descriptive info into the session. + * Returns a key value which will be passed through a form + * to pick up the path info on a later invocation. + * + * @return int + * @access private + */ + function stashSession() { + $stash = $this->saveTempUploadedFile( $this->mDestName, $this->mTempPath ); + + if( !$stash ) { + # Couldn't save the file. + return false; + } + + $key = mt_rand( 0, 0x7fffffff ); + $_SESSION['wsUploadData'][$key] = array( + 'mTempPath' => $stash, + 'mFileSize' => $this->mFileSize, + 'mSrcName' => $this->mSrcName, + 'mFileProps' => $this->mFileProps, + 'version' => self::SESSION_VERSION, + ); + return $key; + } + + /** + * Remove a temporarily kept file stashed by saveTempUploadedFile(). + * @return success + */ + function unsaveUploadedFile() { + $repo = RepoGroup::singleton()->getLocalRepo(); + $success = $repo->freeTemp( $this->mTempPath ); + } + + /** + * If we've modified the upload file we need to manually remove it + * on exit to clean up. + * @access private + */ + function cleanupTempFile() { + if ( $this->mRemoveTempFile && file_exists( $this->mTempPath ) ) { + wfDebug( __METHOD__.": Removing temporary file {$this->mTempPath}\n" ); + unlink( $this->mTempPath ); + } + } + + function getTempPath() { + return $this->mTempPath; + } + + + /** + * Split a file into a base name and all dot-delimited 'extensions' + * on the end. Some web server configurations will fall back to + * earlier pseudo-'extensions' to determine type and execute + * scripts, so the blacklist needs to check them all. + * + * @return array + */ + function splitExtensions( $filename ) { + $bits = explode( '.', $filename ); + $basename = array_shift( $bits ); + return array( $basename, $bits ); + } + + /** + * Perform case-insensitive match against a list of file extensions. + * Returns true if the extension is in the list. + * + * @param string $ext + * @param array $list + * @return bool + */ + function checkFileExtension( $ext, $list ) { + return in_array( strtolower( $ext ), $list ); + } + + /** + * Perform case-insensitive match against a list of file extensions. + * Returns true if any of the extensions are in the list. + * + * @param array $ext + * @param array $list + * @return bool + */ + function checkFileExtensionList( $ext, $list ) { + foreach( $ext as $e ) { + if( in_array( strtolower( $e ), $list ) ) { + return true; + } + } + return false; + } + + + /** + * Checks if the mime type of the uploaded file matches the file extension. + * + * @param string $mime the mime type of the uploaded file + * @param string $extension The filename extension that the file is to be served with + * @return bool + */ + public static function verifyExtension( $mime, $extension ) { + $magic = MimeMagic::singleton(); + + if ( ! $mime || $mime == 'unknown' || $mime == 'unknown/unknown' ) + if ( ! $magic->isRecognizableExtension( $extension ) ) { + wfDebug( __METHOD__.": passing file with unknown detected mime type; " . + "unrecognized extension '$extension', can't verify\n" ); + return true; + } else { + wfDebug( __METHOD__.": rejecting file with unknown detected mime type; ". + "recognized extension '$extension', so probably invalid file\n" ); + return false; + } + + $match= $magic->isMatchingExtension($extension,$mime); + + if ($match===NULL) { + wfDebug( __METHOD__.": no file extension known for mime type $mime, passing file\n" ); + return true; + } elseif ($match===true) { + wfDebug( __METHOD__.": mime type $mime matches extension $extension, passing file\n" ); + + #TODO: if it's a bitmap, make sure PHP or ImageMagic resp. can handle it! + return true; + + } else { + wfDebug( __METHOD__.": mime type $mime mismatches file extension $extension, rejecting file\n" ); + return false; + } + } + + /** + * Heuristic for detecting files that *could* contain JavaScript instructions or + * things that may look like HTML to a browser and are thus + * potentially harmful. The present implementation will produce false positives in some situations. + * + * @param string $file Pathname to the temporary upload file + * @param string $mime The mime type of the file + * @param string $extension The extension of the file + * @return bool true if the file contains something looking like embedded scripts + */ + function detectScript($file, $mime, $extension) { + global $wgAllowTitlesInSVG; + + #ugly hack: for text files, always look at the entire file. + #For binary field, just check the first K. + + if (strpos($mime,'text/')===0) $chunk = file_get_contents( $file ); + else { + $fp = fopen( $file, 'rb' ); + $chunk = fread( $fp, 1024 ); + fclose( $fp ); + } + + $chunk= strtolower( $chunk ); + + if (!$chunk) return false; + + #decode from UTF-16 if needed (could be used for obfuscation). + if (substr($chunk,0,2)=="\xfe\xff") $enc= "UTF-16BE"; + elseif (substr($chunk,0,2)=="\xff\xfe") $enc= "UTF-16LE"; + else $enc= NULL; + + if ($enc) $chunk= iconv($enc,"ASCII//IGNORE",$chunk); + + $chunk= trim($chunk); + + #FIXME: convert from UTF-16 if necessarry! + + wfDebug("SpecialUpload::detectScript: checking for embedded scripts and HTML stuff\n"); + + #check for HTML doctype + if (eregi("wrapWikiMsg( '

', array( 'virus-badscanner', $wgAntivirus ) ); + return wfMsg('virus-unknownscanner') . " $wgAntivirus"; + } + + # look up scanner configuration + $command = $wgAntivirusSetup[$wgAntivirus]["command"]; + $exitCodeMap = $wgAntivirusSetup[$wgAntivirus]["codemap"]; + $msgPattern = isset( $wgAntivirusSetup[$wgAntivirus]["messagepattern"] ) ? + $wgAntivirusSetup[$wgAntivirus]["messagepattern"] : null; + + if ( strpos( $command,"%f" ) === false ) { + # simple pattern: append file to scan + $command .= " " . wfEscapeShellArg( $file ); + } else { + # complex pattern: replace "%f" with file to scan + $command = str_replace( "%f", wfEscapeShellArg( $file ), $command ); + } + + wfDebug( __METHOD__.": running virus scan: $command \n" ); + + # execute virus scanner + $exitCode = false; + + #NOTE: there's a 50 line workaround to make stderr redirection work on windows, too. + # that does not seem to be worth the pain. + # Ask me (Duesentrieb) about it if it's ever needed. + $output = array(); + if ( wfIsWindows() ) { + exec( "$command", $output, $exitCode ); + } else { + exec( "$command 2>&1", $output, $exitCode ); + } + + # map exit code to AV_xxx constants. + $mappedCode = $exitCode; + if ( $exitCodeMap ) { + if ( isset( $exitCodeMap[$exitCode] ) ) { + $mappedCode = $exitCodeMap[$exitCode]; + } elseif ( isset( $exitCodeMap["*"] ) ) { + $mappedCode = $exitCodeMap["*"]; + } + } + + if ( $mappedCode === AV_SCAN_FAILED ) { + # scan failed (code was mapped to false by $exitCodeMap) + wfDebug( __METHOD__.": failed to scan $file (code $exitCode).\n" ); + + if ( $wgAntivirusRequired ) { + return wfMsg('virus-scanfailed', array( $exitCode ) ); + } else { + return NULL; + } + } else if ( $mappedCode === AV_SCAN_ABORTED ) { + # scan failed because filetype is unknown (probably imune) + wfDebug( __METHOD__.": unsupported file type $file (code $exitCode).\n" ); + return NULL; + } else if ( $mappedCode === AV_NO_VIRUS ) { + # no virus found + wfDebug( __METHOD__.": file passed virus scan.\n" ); + return false; + } else { + $output = join( "\n", $output ); + $output = trim( $output ); + + if ( !$output ) { + $output = true; #if there's no output, return true + } elseif ( $msgPattern ) { + $groups = array(); + if ( preg_match( $msgPattern, $output, $groups ) ) { + if ( $groups[1] ) { + $output = $groups[1]; + } + } + } + + wfDebug( __METHOD__.": FOUND VIRUS! scanner feedback: $output" ); + return $output; + } + } + + /** + * Check if the temporary file is MacBinary-encoded, as some uploads + * from Internet Explorer on Mac OS Classic and Mac OS X will be. + * If so, the data fork will be extracted to a second temporary file, + * which will then be checked for validity and either kept or discarded. + * + * @access private + */ + function checkMacBinary() { + $macbin = new MacBinary( $this->mTempPath ); + if( $macbin->isValid() ) { + $dataFile = tempnam( wfTempDir(), "WikiMacBinary" ); + $dataHandle = fopen( $dataFile, 'wb' ); + + wfDebug( "SpecialUpload::checkMacBinary: Extracting MacBinary data fork to $dataFile\n" ); + $macbin->extractData( $dataHandle ); + + $this->mTempPath = $dataFile; + $this->mFileSize = $macbin->dataForkLength(); + + // We'll have to manually remove the new file if it's not kept. + $this->mRemoveTempFile = true; + } + $macbin->close(); + } + + /** + * Check if there's an overwrite conflict and, if so, if restrictions + * forbid this user from performing the upload. + * + * @return mixed true on success, WikiError on failure + * @access private + */ + function checkOverwrite() { + global $wgUser; + // First check whether the local file can be overwritten + if( $this->mLocalFile->exists() ) + if( !self::userCanReUpload( $wgUser, $this->mLocalFile ) ) + return 'fileexists-forbidden'; + + // Check shared conflicts + $file = wfFindFile( $this->mLocalFile->getName() ); + if ( $file && ( !$wgUser->isAllowed( 'reupload' ) || + !$wgUser->isAllowed( 'reupload-shared' ) ) ) + return 'fileexists-shared-forbidden'; + + return true; + + } + + /** + * Check if a user is the last uploader + * + * @param User $user + * @param string $img, image name + * @return bool + */ + public static function userCanReUpload( User $user, $img ) { + if( $user->isAllowed( 'reupload' ) ) + return true; // non-conditional + if( !$user->isAllowed( 'reupload-own' ) ) + return false; + if( is_string( $img ) ) + $img = wfLocalFile( $img ); + if ( !( $img instanceof LocalFile ) ) + return false; + + return $user->getId() == $img->getUser( 'id' ); + } + + public static function getExistsWarning( $file ) { + if( $file->exists() ) + return array( 'exists', $file ); + + if( $file->getTitle()->getArticleID() ) + return array( 'page-exists', false ); + + if( strpos( $file->getName(), '.' ) == false ) { + $partname = $file->getName(); + $rawExtension = ''; + } else { + $n = strrpos( $file->getName(), '.' ); + $rawExtension = substr( $file->getName(), $n + 1 ); + $partname = substr( $file->getName(), 0, $n ); + } + + if ( $rawExtension != $file->getExtension() ) { + // We're not using the normalized form of the extension. + // Normal form is lowercase, using most common of alternate + // extensions (eg 'jpg' rather than 'JPEG'). + // + // Check for another file using the normalized form... + $nt_lc = Title::makeTitle( NS_IMAGE, $partname . '.' . $file->getExtension() ); + $file_lc = wfLocalFile( $nt_lc ); + + if( $file_lc->exists() ) + return array( 'exists-normalized', $file_lc ); + } + + if ( self::isThumbName( $file->getName() ) ) { + # Check for filenames like 50px- or 180px-, these are mostly thumbnails + $nt_thb = Title::newFromText( substr( $partname , strpos( $partname , '-' ) +1 ) . '.' . $rawExtension ); + $file_thb = wfLocalFile( $nt_thb ); + if( $file_thb->exists() ) + return array( 'thumb', $file_thb ); + } + + return false; + } + + public static function isThumbName( $filename ) { + $n = strrpos( $filename, '.' ); + $partname = $n ? substr( $filename, 0, $n ) : $filename; + return ( + substr( $partname , 3, 3 ) == 'px-' || + substr( $partname , 2, 3 ) == 'px-' + ) && + ereg( "[0-9]{2}" , substr( $partname , 0, 2) ); + } + + /** + * Get a list of blacklisted filename prefixes from [[MediaWiki:filename-prefix-blacklist]] + * + * @return array list of prefixes + */ + public static function getFilenamePrefixBlacklist() { + $blacklist = array(); + $message = wfMsgForContent( 'filename-prefix-blacklist' ); + if( $message && !( wfEmptyMsg( 'filename-prefix-blacklist', $message ) || $message == '-' ) ) { + $lines = explode( "\n", $message ); + foreach( $lines as $line ) { + // Remove comment lines + $comment = substr( trim( $line ), 0, 1 ); + if ( $comment == '#' || $comment == '' ) { + continue; + } + // Remove additional comments after a prefix + $comment = strpos( $line, '#' ); + if ( $comment > 0 ) { + $line = substr( $line, 0, $comment-1 ); + } + $blacklist[] = trim( $line ); + } + } + return $blacklist; + } + + +} diff --git a/includes/UploadFromStash.php b/includes/UploadFromStash.php new file mode 100644 index 0000000000..862616549b --- /dev/null +++ b/includes/UploadFromStash.php @@ -0,0 +1,32 @@ +mTempPath = $sessionData['mTempPath']; + $this->mFileSize = $sessionData['mFileSize']; + $this->mSrcName = $sessionData['mSrcName']; + $this->mFileProps = $sessionData['mFileProps']; + $this->mStashed = true; + $this->mRemoveTempFile = false; + } + + /* + * File has been previously verified so no need to do so again. + */ + protected function verifyFile( $tmpfile, $extension ) { + return true; + } + /* + * We're here from "ignore warnings anyway" so return just OK + */ + function checkWarnings( &$resultDetails ) { + return self::OK; + } +} diff --git a/includes/UploadFromUpload.php b/includes/UploadFromUpload.php new file mode 100644 index 0000000000..31cd02d7f6 --- /dev/null +++ b/includes/UploadFromUpload.php @@ -0,0 +1,12 @@ +mTempPath = $tempPath; + $this->mFileSize = $fileSize; + $this->mSrcName = $fileName; + $this->mSessionKey = false; + $this->mStashed = false; + $this->mRemoveTempFile = false; // PHP will handle this + } +} diff --git a/includes/UploadFromUrl.php b/includes/UploadFromUrl.php new file mode 100644 index 0000000000..84fd070830 --- /dev/null +++ b/includes/UploadFromUrl.php @@ -0,0 +1,100 @@ +mTempPath = $local_file; + $this->mFileSize = 0; # Will be set by curlCopy + $this->mCurlError = $this->curlCopy( $url, $local_file ); + $pathParts = explode( '/', $url ); + $this->mSrcName = array_pop( $pathParts ); + $this->mSessionKey = false; + $this->mStashed = false; + + // PHP won't auto-cleanup the file + $this->mRemoveTempFile = file_exists( $local_file ); + } + + + /** + * Safe copy from URL + * Returns true if there was an error, false otherwise + */ + private function curlCopy( $url, $dest ) { + global $wgUser, $wgOut; + + // Bad bad bad! + if( !$wgUser->isAllowed( 'upload_by_url' ) ) { + $wgOut->permissionRequired( 'upload_by_url' ); + return true; + } + + # Maybe remove some pasting blanks :-) + $url = trim( $url ); + if( stripos($url, 'http://') !== 0 && stripos($url, 'ftp://') !== 0 ) { + # Only HTTP or FTP URLs + $wgOut->showErrorPage( 'upload-proto-error', 'upload-proto-error-text' ); + return true; + } + + # Open temporary file + $this->mCurlDestHandle = @fopen( $this->mTempPath, "wb" ); + if( $this->mCurlDestHandle === false ) { + # Could not open temporary file to write in + $wgOut->showErrorPage( 'upload-file-error', 'upload-file-error-text'); + return true; + } + + $ch = curl_init(); + curl_setopt( $ch, CURLOPT_HTTP_VERSION, 1.0); # Probably not needed, but apparently can work around some bug + curl_setopt( $ch, CURLOPT_TIMEOUT, 10); # 10 seconds timeout + curl_setopt( $ch, CURLOPT_LOW_SPEED_LIMIT, 512); # 0.5KB per second minimum transfer speed + curl_setopt( $ch, CURLOPT_URL, $url); + curl_setopt( $ch, CURLOPT_WRITEFUNCTION, array( $this, 'uploadCurlCallback' ) ); + curl_exec( $ch ); + $error = curl_errno( $ch ) ? true : false; + $errornum = curl_errno( $ch ); + // if ( $error ) print curl_error ( $ch ) ; # Debugging output + curl_close( $ch ); + + fclose( $this->mCurlDestHandle ); + unset( $this->mCurlDestHandle ); + if( $error ) { + unlink( $dest ); + if( wfEmptyMsg( "upload-curl-error$errornum", wfMsg("upload-curl-error$errornum") ) ) + $wgOut->showErrorPage( 'upload-misc-error', 'upload-misc-error-text' ); + else + $wgOut->showErrorPage( "upload-curl-error$errornum", "upload-curl-error$errornum-text" ); + } + + return $error; + } + + /** + * Callback function for CURL-based web transfer + * Write data to file unless we've passed the length limit; + * if so, abort immediately. + * @access private + */ + function uploadCurlCallback( $ch, $data ) { + global $wgMaxUploadSize; + $length = strlen( $data ); + $this->mFileSize += $length; + if( $this->mFileSize > $wgMaxUploadSize ) { + return 0; + } + fwrite( $this->mCurlDestHandle, $data ); + return $length; + } + + function execute( &$resultDetails ) { + /* Check for curl error */ + if( $this->mCurlError ) { + return self::BEFORE_PROCESSING; + } + return parent::execute( $resultDetails ); + } +} diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php index 7aa641bc15..a7404f7123 100644 --- a/includes/filerepo/LocalFile.php +++ b/includes/filerepo/LocalFile.php @@ -737,11 +737,11 @@ class LocalFile extends File * @return FileRepoStatus object. On success, the value member contains the * archive name, or an empty string if it was a new file. */ - function upload( $srcPath, $comment, $pageText, $flags = 0, $props = false, $timestamp = false ) { + function upload( $srcPath, $comment, $pageText, $flags = 0, $props = false, $timestamp = false, $user = null ) { $this->lock(); $status = $this->publish( $srcPath, $flags ); if ( $status->ok ) { - if ( !$this->recordUpload2( $status->value, $comment, $pageText, $props, $timestamp ) ) { + if ( !$this->recordUpload2( $status->value, $comment, $pageText, $props, $timestamp, $user ) ) { $status->fatal( 'filenotfound', $srcPath ); } } @@ -771,9 +771,12 @@ class LocalFile extends File /** * Record a file upload in the upload log and the image table */ - function recordUpload2( $oldver, $comment, $pageText, $props = false, $timestamp = false ) + function recordUpload2( $oldver, $comment, $pageText, $props = false, $timestamp = false, $user = null ) { - global $wgUser; + if( is_null( $user ) ) { + global $wgUser; + $user = $wgUser; + } $dbw = $this->repo->getMasterDB(); @@ -781,8 +784,8 @@ class LocalFile extends File $props = $this->repo->getFileProps( $this->getVirtualUrl() ); } $props['description'] = $comment; - $props['user'] = $wgUser->getId(); - $props['user_text'] = $wgUser->getName(); + $props['user'] = $user->getId(); + $props['user_text'] = $user->getName(); $props['timestamp'] = wfTimestamp( TS_MW ); $this->setProps( $props ); @@ -817,8 +820,8 @@ class LocalFile extends File 'img_minor_mime' => $this->minor_mime, 'img_timestamp' => $timestamp, 'img_description' => $comment, - 'img_user' => $wgUser->getId(), - 'img_user_text' => $wgUser->getName(), + 'img_user' => $user->getId(), + 'img_user_text' => $user->getName(), 'img_metadata' => $this->metadata, 'img_sha1' => $this->sha1 ), @@ -863,8 +866,8 @@ class LocalFile extends File 'img_minor_mime' => $this->minor_mime, 'img_timestamp' => $timestamp, 'img_description' => $comment, - 'img_user' => $wgUser->getId(), - 'img_user_text' => $wgUser->getName(), + 'img_user' => $user->getId(), + 'img_user_text' => $user->getName(), 'img_metadata' => $this->metadata, 'img_sha1' => $this->sha1 ), array( /* WHERE */ @@ -884,7 +887,7 @@ class LocalFile extends File # Add the log entry $log = new LogPage( 'upload' ); $action = $reupload ? 'overwrite' : 'upload'; - $log->addEntry( $action, $descTitle, $comment ); + $log->addEntry( $action, $descTitle, $comment, array(), $user ); if( $descTitle->exists() ) { # Create a null revision diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php index 98ccdcb07f..4f1848aba2 100644 --- a/includes/specials/SpecialUpload.php +++ b/includes/specials/SpecialUpload.php @@ -19,37 +19,21 @@ function wfSpecialUpload() { * @ingroup SpecialPage */ class UploadForm { - const SUCCESS = 0; - const BEFORE_PROCESSING = 1; - const LARGE_FILE_SERVER = 2; - const EMPTY_FILE = 3; - const MIN_LENGHT_PARTNAME = 4; - const ILLEGAL_FILENAME = 5; - const PROTECTED_PAGE = 6; - const OVERWRITE_EXISTING_FILE = 7; - const FILETYPE_MISSING = 8; - const FILETYPE_BADTYPE = 9; - const VERIFICATION_ERROR = 10; - const UPLOAD_VERIFICATION_ERROR = 11; - const UPLOAD_WARNING = 12; - const INTERNAL_ERROR = 13; - /**#@+ * @access private */ - var $mComment, $mLicense, $mIgnoreWarning, $mCurlError; - var $mDestName, $mTempPath, $mFileSize, $mFileProps; + var $mComment, $mLicense, $mIgnoreWarning; var $mCopyrightStatus, $mCopyrightSource, $mReUpload, $mAction, $mUploadClicked; - var $mSrcName, $mSessionKey, $mStashed, $mDesiredDestName, $mRemoveTempFile, $mSourceType; - var $mDestWarningAck, $mCurlDestHandle; + var $mDestWarningAck; var $mLocalFile; + + var $mUpload; // Instance of UploadFromBase or derivative # Placeholders for text injection by hooks (must be HTML) # extensions should take care to _append_ to the present value var $uploadFormTextTop; var $uploadFormTextAfterSummary; - const SESSION_VERSION = 1; /**#@-*/ /** @@ -57,7 +41,7 @@ class UploadForm { * Get data POSTed through the form and assign them to the object * @param $request Data posted. */ - function UploadForm( &$request ) { + function __construct( &$request ) { global $wgAllowCopyUploads; $this->mDesiredDestName = $request->getText( 'wpDestFile' ); $this->mIgnoreWarning = $request->getCheck( 'wpIgnoreWarning' ); @@ -85,140 +69,45 @@ class UploadForm { $this->mAction = $request->getVal( 'action' ); + $desiredDestName = $request->getText( 'wpDestFile' ); + if( !$desiredDestName ) + $desiredDestName = $request->getText( 'wpUploadFile' ); + $this->mSessionKey = $request->getInt( 'wpSessionKey' ); if( !empty( $this->mSessionKey ) && - isset( $_SESSION['wsUploadData'][$this->mSessionKey]['version'] ) && - $_SESSION['wsUploadData'][$this->mSessionKey]['version'] == self::SESSION_VERSION ) { + isset( $_SESSION['wsUploadData'][$this->mSessionKey]['version'] ) && + $_SESSION['wsUploadData'][$this->mSessionKey]['version'] == + UploadFromBase::SESSION_VERSION ) { /** * Confirming a temporarily stashed upload. * We don't want path names to be forged, so we keep * them in the session on the server and just give * an opaque key to the user agent. */ + + $this->mUpload = new UploadFromStash( $desiredDestName ); $data = $_SESSION['wsUploadData'][$this->mSessionKey]; - $this->mTempPath = $data['mTempPath']; - $this->mFileSize = $data['mFileSize']; - $this->mSrcName = $data['mSrcName']; - $this->mFileProps = $data['mFileProps']; - $this->mCurlError = 0/*UPLOAD_ERR_OK*/; - $this->mStashed = true; - $this->mRemoveTempFile = false; + $this->mUpload->initialize( $data ); + } else { /** *Check for a newly uploaded file. */ if( $wgAllowCopyUploads && $this->mSourceType == 'web' ) { - $this->initializeFromUrl( $request ); + $this->mUpload = new UploadFromUrl( $desiredDestName ); + $this->mUpload->initialize( $request->getText( 'wpUploadFileURL' ) ); } else { - $this->initializeFromUpload( $request ); + $this->mUpload = new UploadFromUpload( $desiredDestName ); + $this->mUpload->initialize( + $request->getFileTempName( 'wpUploadFile' ), + $request->getFileSize( 'wpUploadFile' ), + $request->getFileName( 'wpUploadFile' ) + ); } } } - /** - * Initialize the uploaded file from PHP data - * @access private - */ - function initializeFromUpload( $request ) { - $this->mTempPath = $request->getFileTempName( 'wpUploadFile' ); - $this->mFileSize = $request->getFileSize( 'wpUploadFile' ); - $this->mSrcName = $request->getFileName( 'wpUploadFile' ); - $this->mCurlError = $request->getUploadError( 'wpUploadFile' ); - $this->mSessionKey = false; - $this->mStashed = false; - $this->mRemoveTempFile = false; // PHP will handle this - } - /** - * Copy a web file to a temporary file - * @access private - */ - function initializeFromUrl( $request ) { - global $wgTmpDirectory; - $url = $request->getText( 'wpUploadFileURL' ); - $local_file = tempnam( $wgTmpDirectory, 'WEBUPLOAD' ); - - $this->mTempPath = $local_file; - $this->mFileSize = 0; # Will be set by curlCopy - $this->mCurlError = $this->curlCopy( $url, $local_file ); - $pathParts = explode( '/', $url ); - $this->mSrcName = array_pop( $pathParts ); - $this->mSessionKey = false; - $this->mStashed = false; - - // PHP won't auto-cleanup the file - $this->mRemoveTempFile = file_exists( $local_file ); - } - - /** - * Safe copy from URL - * Returns true if there was an error, false otherwise - */ - private function curlCopy( $url, $dest ) { - global $wgUser, $wgOut; - - if( !$wgUser->isAllowed( 'upload_by_url' ) ) { - $wgOut->permissionRequired( 'upload_by_url' ); - return true; - } - - # Maybe remove some pasting blanks :-) - $url = trim( $url ); - if( stripos($url, 'http://') !== 0 && stripos($url, 'ftp://') !== 0 ) { - # Only HTTP or FTP URLs - $wgOut->showErrorPage( 'upload-proto-error', 'upload-proto-error-text' ); - return true; - } - - # Open temporary file - $this->mCurlDestHandle = @fopen( $this->mTempPath, "wb" ); - if( $this->mCurlDestHandle === false ) { - # Could not open temporary file to write in - $wgOut->showErrorPage( 'upload-file-error', 'upload-file-error-text'); - return true; - } - - $ch = curl_init(); - curl_setopt( $ch, CURLOPT_HTTP_VERSION, 1.0); # Probably not needed, but apparently can work around some bug - curl_setopt( $ch, CURLOPT_TIMEOUT, 10); # 10 seconds timeout - curl_setopt( $ch, CURLOPT_LOW_SPEED_LIMIT, 512); # 0.5KB per second minimum transfer speed - curl_setopt( $ch, CURLOPT_URL, $url); - curl_setopt( $ch, CURLOPT_WRITEFUNCTION, array( $this, 'uploadCurlCallback' ) ); - curl_exec( $ch ); - $error = curl_errno( $ch ) ? true : false; - $errornum = curl_errno( $ch ); - // if ( $error ) print curl_error ( $ch ) ; # Debugging output - curl_close( $ch ); - - fclose( $this->mCurlDestHandle ); - unset( $this->mCurlDestHandle ); - if( $error ) { - unlink( $dest ); - if( wfEmptyMsg( "upload-curl-error$errornum", wfMsg("upload-curl-error$errornum") ) ) - $wgOut->showErrorPage( 'upload-misc-error', 'upload-misc-error-text' ); - else - $wgOut->showErrorPage( "upload-curl-error$errornum", "upload-curl-error$errornum-text" ); - } - - return $error; - } - - /** - * Callback function for CURL-based web transfer - * Write data to file unless we've passed the length limit; - * if so, abort immediately. - * @access private - */ - function uploadCurlCallback( $ch, $data ) { - global $wgMaxUploadSize; - $length = strlen( $data ); - $this->mFileSize += $length; - if( $this->mFileSize > $wgMaxUploadSize ) { - return 0; - } - fwrite( $this->mCurlDestHandle, $data ); - return $length; - } /** * Start doing stuff @@ -256,20 +145,25 @@ class UploadForm { } if( $this->mReUpload ) { - if( !$this->unsaveUploadedFile() ) { + // User did not choose to ignore warnings + if( !$this->mUpload->unsaveUploadedFile() ) { return; } # Because it is probably checked and shouldn't be $this->mIgnoreWarning = false; $this->mainUploadForm(); - } else if( 'submit' == $this->mAction || $this->mUploadClicked ) { + } elseif( $this->mUpload && ( + 'submit' == $this->mAction || + $this->mUploadClicked + ) ) { $this->processUpload(); } else { $this->mainUploadForm(); } - - $this->cleanupTempFile(); + + if( $this->mUpload ) + $this->mUpload->cleanupTempFile(); } /** @@ -283,46 +177,48 @@ class UploadForm { $details = null; $value = null; $value = $this->internalProcessUpload( $details ); + header("X-Internal-Process-Upload: $value"); switch($value) { - case self::SUCCESS: + case UploadFromBase::SUCCESS: $wgOut->redirect( $this->mLocalFile->getTitle()->getFullURL() ); break; - case self::BEFORE_PROCESSING: + case UploadFromBase::BEFORE_PROCESSING: + // Do... nothing? Why? break; - case self::LARGE_FILE_SERVER: + case UploadFromBase::LARGE_FILE_SERVER: $this->mainUploadForm( wfMsgHtml( 'largefileserver' ) ); break; - case self::EMPTY_FILE: + case UploadFromBase::EMPTY_FILE: $this->mainUploadForm( wfMsgHtml( 'emptyfile' ) ); break; - case self::MIN_LENGHT_PARTNAME: + case UploadFromBase::MIN_LENGHT_PARTNAME: $this->mainUploadForm( wfMsgHtml( 'minlength1' ) ); break; - case self::ILLEGAL_FILENAME: - $filtered = $details['filtered']; - $this->uploadError( wfMsgWikiHtml( 'illegalfilename', htmlspecialchars( $filtered ) ) ); + case UploadFromBase::ILLEGAL_FILENAME: + $this->uploadError( wfMsgExt( 'illegalfilename', + 'parseinline', $details['filtered'] ) ); break; - case self::PROTECTED_PAGE: + case UploadFromBase::PROTECTED_PAGE: $wgOut->showPermissionsErrorPage( $details['permissionserrors'] ); break; - case self::OVERWRITE_EXISTING_FILE: - $errorText = $details['overwrite']; - $this->uploadError( $wgOut->parse( $errorText ) ); + case UploadFromBase::OVERWRITE_EXISTING_FILE: + $this->uploadError( wfMsgExt( $details['overwrite'], + 'parseinline' ) ); break; - case self::FILETYPE_MISSING: + case UploadFromBase::FILETYPE_MISSING: $this->uploadError( wfMsgExt( 'filetype-missing', array ( 'parseinline' ) ) ); break; - case self::FILETYPE_BADTYPE: + case UploadFromBase::FILETYPE_BADTYPE: $finalExt = $details['finalExt']; $this->uploadError( wfMsgExt( 'filetype-banned-type', @@ -332,29 +228,30 @@ class UploadForm { wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ), $wgFileExtensions ), - $wgLang->formatNum( count($wgFileExtensions) ) + $wgLang->formatNum( count( $wgFileExtensions ) ) ) ); break; - case self::VERIFICATION_ERROR: - $veri = $details['veri']; - $this->uploadError( $veri->toString() ); + case UploadFromBase::VERIFICATION_ERROR: + $args = $details['veri']; + $code = array_shift( $args ); + $this->uploadError( wfMsgExt( $code, 'parseinline', $args ) ); break; - case self::UPLOAD_VERIFICATION_ERROR: + case UploadFromBase::UPLOAD_VERIFICATION_ERROR: $error = $details['error']; - $this->uploadError( $error ); + $this->uploadError( wfMsgExt( $error, 'parseinline' ) ); break; - case self::UPLOAD_WARNING: + case UploadFromBase::UPLOAD_WARNING: $warning = $details['warning']; $this->uploadWarning( $warning ); break; - case self::INTERNAL_ERROR: - $internal = $details['internal']; - $this->showError( $internal ); + case UploadFromBase::INTERNAL_ERROR: + $status = $details['internal']; + $this->showError( $wgOut->parse( $status->getWikiText() ) ); break; default: @@ -376,207 +273,58 @@ class UploadForm { if( !wfRunHooks( 'UploadForm:BeforeProcessing', array( &$this ) ) ) { wfDebug( "Hook 'UploadForm:BeforeProcessing' broke processing the file." ); - return self::BEFORE_PROCESSING; + return UploadFromBase::BEFORE_PROCESSING; } - /** - * If there was no filename or a zero size given, give up quick. - */ - if( trim( $this->mSrcName ) == '' || empty( $this->mFileSize ) ) { - return self::EMPTY_FILE; - } - - /* Check for curl error */ - if( $this->mCurlError ) { - return self::BEFORE_PROCESSING; - } - - /** - * Chop off any directories in the given filename. Then - * filter out illegal characters, and try to make a legible name - * out of it. We'll strip some silently that Title would die on. - */ - if( $this->mDesiredDestName ) { - $basename = $this->mDesiredDestName; - } else { - $basename = $this->mSrcName; - } - $filtered = wfStripIllegalFilenameChars( $basename ); - - /** - * We'll want to blacklist against *any* 'extension', and use - * only the final one for the whitelist. - */ - list( $partname, $ext ) = $this->splitExtensions( $filtered ); - - if( count( $ext ) ) { - $finalExt = $ext[count( $ext ) - 1]; - } else { - $finalExt = ''; - } - - # If there was more than one "extension", reassemble the base - # filename to prevent bogus complaints about length - if( count( $ext ) > 1 ) { - for( $i = 0; $i < count( $ext ) - 1; $i++ ) - $partname .= '.' . $ext[$i]; - } - - if( strlen( $partname ) < 1 ) { - return self::MIN_LENGHT_PARTNAME; - } - - $nt = Title::makeTitleSafe( NS_IMAGE, $filtered ); - if( is_null( $nt ) ) { - $resultDetails = array( 'filtered' => $filtered ); - return self::ILLEGAL_FILENAME; - } - $this->mLocalFile = wfLocalFile( $nt ); - $this->mDestName = $this->mLocalFile->getName(); - - /** - * If the image is protected, non-sysop users won't be able - * to modify it by uploading a new revision. - */ - $permErrors = $nt->getUserPermissionsErrors( 'edit', $wgUser ); - $permErrorsUpload = $nt->getUserPermissionsErrors( 'upload', $wgUser ); - $permErrorsCreate = ( $nt->exists() ? array() : $nt->getUserPermissionsErrors( 'create', $wgUser ) ); - - if( $permErrors || $permErrorsUpload || $permErrorsCreate ) { - // merge all the problems into one list, avoiding duplicates - $permErrors = array_merge( $permErrors, wfArrayDiff2( $permErrorsUpload, $permErrors ) ); - $permErrors = array_merge( $permErrors, wfArrayDiff2( $permErrorsCreate, $permErrors ) ); - $resultDetails = array( 'permissionserrors' => $permErrors ); - return self::PROTECTED_PAGE; - } - - /** - * In some cases we may forbid overwriting of existing files. - */ - $overwrite = $this->checkOverwrite( $this->mDestName ); - if( $overwrite !== true ) { - $resultDetails = array( 'overwrite' => $overwrite ); - return self::OVERWRITE_EXISTING_FILE; - } - - /* Don't allow users to override the blacklist (check file extension) */ - global $wgCheckFileExtensions, $wgStrictFileExtensions; - global $wgFileExtensions, $wgFileBlacklist; - if ($finalExt == '') { - return self::FILETYPE_MISSING; - } elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) || - ($wgCheckFileExtensions && $wgStrictFileExtensions && - !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) ) { - $resultDetails = array( 'finalExt' => $finalExt ); - return self::FILETYPE_BADTYPE; - } - - /** - * Look at the contents of the file; if we can recognize the - * type but it's corrupt or data of the wrong type, we should - * probably not accept it. - */ - if( !$this->mStashed ) { - $this->mFileProps = File::getPropsFromPath( $this->mTempPath, $finalExt ); - $this->checkMacBinary(); - $veri = $this->verify( $this->mTempPath, $finalExt ); - - if( $veri !== true ) { //it's a wiki error... - $resultDetails = array( 'veri' => $veri ); - return self::VERIFICATION_ERROR; - } - + $nt = $this->mUpload->getTitle(); + // Hold back returning errors for a bit so that verifyUpload can fill in the details + if ( $nt instanceof Title ) { /** - * Provide an opportunity for extensions to add further checks + * If the image is protected, non-sysop users won't be able + * to modify it by uploading a new revision. */ - $error = ''; - if( !wfRunHooks( 'UploadVerification', - array( $this->mDestName, $this->mTempPath, &$error ) ) ) { - $resultDetails = array( 'error' => $error ); - return self::UPLOAD_VERIFICATION_ERROR; + $permErrors = $this->mUpload->verifyPermissions( $wgUser ); + if( $permErrors !== true ) { + $resultDetails = array( 'permissionserrors' => $permErrors ); + return UploadFromBase::PROTECTED_PAGE; } } + // Check whether this is a sane upload + $result = $this->mUpload->verifyUpload( $resultDetails ); + if( $result != UploadFromBase::OK ) + return $result; - /** - * Check for non-fatal conditions - */ - if ( ! $this->mIgnoreWarning ) { - $warning = ''; - - global $wgCapitalLinks; - if( $wgCapitalLinks ) { - $filtered = ucfirst( $filtered ); - } - if( $basename != $filtered ) { - $warning .= '

'.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mDestName ) ).'

'; - } - - global $wgCheckFileExtensions; - if ( $wgCheckFileExtensions ) { - if ( !$this->checkFileExtension( $finalExt, $wgFileExtensions ) ) { - global $wgLang; - $warning .= '

' . - wfMsgExt( 'filetype-unwanted-type', - array( 'parseinline' ), - htmlspecialchars( $finalExt ), - implode( - wfMsgExt( 'comma-separator', array( 'escapenoentities' ) ), - $wgFileExtensions - ), - $wgLang->formatNum( count($wgFileExtensions) ) - ) . '

'; - } - } - - global $wgUploadSizeWarning; - if ( $wgUploadSizeWarning && ( $this->mFileSize > $wgUploadSizeWarning ) ) { - $skin = $wgUser->getSkin(); - $wsize = $skin->formatSize( $wgUploadSizeWarning ); - $asize = $skin->formatSize( $this->mFileSize ); - $warning .= '

' . wfMsgHtml( 'large-file', $wsize, $asize ) . '

'; - } - if ( $this->mFileSize == 0 ) { - $warning .= '

'.wfMsgHtml( 'emptyfile' ).'

'; - } + $this->mLocalFile = $this->mUpload->getLocalFile(); - if ( !$this->mDestWarningAck ) { - $warning .= self::getExistsWarning( $this->mLocalFile ); - } - - $warning .= $this->getDupeWarning( $this->mTempPath ); - - if( $warning != '' ) { - /** - * Stash the file in a temporary location; the user can choose - * to let it through and we'll complete the upload then. - */ - $resultDetails = array( 'warning' => $warning ); - return self::UPLOAD_WARNING; + if( !$this->mIgnoreWarning ) { + $warnings = $this->mUpload->checkWarnings(); + + if( count( $warnings ) ) { + $resultDetails = array( 'warning' => $warnings ); + return UploadFromBase::UPLOAD_WARNING; } } + /** * Try actually saving the thing... - * It will show an error form on failure. + * It will show an error form on failure. No it will not. */ $pageText = self::getInitialPageText( $this->mComment, $this->mLicense, $this->mCopyrightStatus, $this->mCopyrightSource ); - $status = $this->mLocalFile->upload( $this->mTempPath, $this->mComment, $pageText, - File::DELETE_SOURCE, $this->mFileProps ); + $status = $this->mUpload->performUpload( $this->mComment, $pageText, $this->mWatchthis, $wgUser ); + if ( !$status->isGood() ) { - $resultDetails = array( 'internal' => $status->getWikiText() ); - return self::INTERNAL_ERROR; + $resultDetails = array( 'internal' => $status ); + return UploadFromBase::INTERNAL_ERROR; } else { - if ( $this->mWatchthis ) { - global $wgUser; - $wgUser->addWatch( $this->mLocalFile->getTitle() ); - } // Success, redirect to description page + // WTF WTF WTF? $img = null; // @todo: added to avoid passing a ref to null - should this be defined somewhere? - wfRunHooks( 'UploadComplete', array( &$this ) ); - return self::SUCCESS; + wfRunHooks( 'SpecialUploadComplete', array( &$this ) ); + return UploadFromBase::SUCCESS; } } @@ -586,37 +334,21 @@ class UploadForm { * Returns an HTML fragment consisting of one or more LI elements if there is a warning * Returns an empty string if there is no warning */ - static function getExistsWarning( $file ) { + static function getExistsWarning( $exists ) { global $wgUser, $wgContLang; - // Check for uppercase extension. We allow these filenames but check if an image - // with lowercase extension exists already + + if( $exists === false ) + return ''; + $warning = ''; $align = $wgContLang->isRtl() ? 'left' : 'right'; - if( strpos( $file->getName(), '.' ) == false ) { - $partname = $file->getName(); - $rawExtension = ''; - } else { - $n = strrpos( $file->getName(), '.' ); - $rawExtension = substr( $file->getName(), $n + 1 ); - $partname = substr( $file->getName(), 0, $n ); - } + list( $existsType, $file ) = $exists; $sk = $wgUser->getSkin(); - if ( $rawExtension != $file->getExtension() ) { - // We're not using the normalized form of the extension. - // Normal form is lowercase, using most common of alternate - // extensions (eg 'jpg' rather than 'JPEG'). - // - // Check for another file using the normalized form... - $nt_lc = Title::makeTitle( NS_IMAGE, $partname . '.' . $file->getExtension() ); - $file_lc = wfLocalFile( $nt_lc ); - } else { - $file_lc = false; - } - - if( $file->exists() ) { + if( $existsType == 'exists' ) { + // Exact match $dlink = $sk->makeKnownLinkObj( $file->getTitle() ); if ( $file->allowInlineDisplay() ) { $dlink2 = $sk->makeImageLinkObj( $file->getTitle(), wfMsgExt( 'fileexists-thumb', 'parseinline' ), @@ -631,18 +363,18 @@ class UploadForm { $warning .= '

' . wfMsgExt( 'fileexists', array('parseinline','replaceafter'), $dlink ) . '

' . $dlink2; - } elseif( $file->getTitle()->getArticleID() ) { + } elseif( $existsType == 'page-exists' ) { $lnk = $sk->makeKnownLinkObj( $file->getTitle(), '', 'redirect=no' ); $warning .= '

' . wfMsgExt( 'filepageexists', array( 'parseinline', 'replaceafter' ), $lnk ) . '

'; - } elseif ( $file_lc && $file_lc->exists() ) { + } elseif ( $existsType == 'exists-normalized' ) { # Check if image with lowercase extension exists. # It's not forbidden but in 99% it makes no sense to upload the same filename with uppercase extension - $dlink = $sk->makeKnownLinkObj( $nt_lc ); - if ( $file_lc->allowInlineDisplay() ) { - $dlink2 = $sk->makeImageLinkObj( $nt_lc, wfMsgExt( 'fileexists-thumb', 'parseinline' ), - $nt_lc->getText(), $align, array(), false, true ); - } elseif ( !$file_lc->allowInlineDisplay() && $file_lc->isSafeFile() ) { - $icon = $file_lc->iconThumb(); + $dlink = $sk->makeKnownLinkObj( $file->getTitle() ); + if ( $file->allowInlineDisplay() ) { + $dlink2 = $sk->makeImageLinkObj( $file->getTitle(), wfMsgExt( 'fileexists-thumb', 'parseinline' ), + $file->getTitle()->getText(), $align, array(), false, true ); + } elseif ( !$file->allowInlineDisplay() && $file->isSafeFile() ) { + $icon = $file->iconThumb(); $dlink2 = '

' . $icon->toHtml( array( 'desc-link' => true ) ) . '
' . $dlink . '

'; } else { @@ -654,57 +386,27 @@ class UploadForm { $file->getTitle()->getPrefixedText(), $dlink ) . '' . $dlink2; - } elseif ( ( substr( $partname , 3, 3 ) == 'px-' || substr( $partname , 2, 3 ) == 'px-' ) - && ereg( "[0-9]{2}" , substr( $partname , 0, 2) ) ) - { - # Check for filenames like 50px- or 180px-, these are mostly thumbnails - $nt_thb = Title::newFromText( substr( $partname , strpos( $partname , '-' ) +1 ) . '.' . $rawExtension ); - $file_thb = wfLocalFile( $nt_thb ); - if ($file_thb->exists() ) { - # Check if an image without leading '180px-' (or similiar) exists - $dlink = $sk->makeKnownLinkObj( $nt_thb); - if ( $file_thb->allowInlineDisplay() ) { - $dlink2 = $sk->makeImageLinkObj( $nt_thb, - wfMsgExt( 'fileexists-thumb', 'parseinline' ), - $nt_thb->getText(), $align, array(), false, true ); - } elseif ( !$file_thb->allowInlineDisplay() && $file_thb->isSafeFile() ) { - $icon = $file_thb->iconThumb(); - $dlink2 = '

' . - $icon->toHtml( array( 'desc-link' => true ) ) . '
' . - $dlink . '

'; - } else { - $dlink2 = ''; - } - - $warning .= '

' . wfMsgExt( 'fileexists-thumbnail-yes', 'parsemag', $dlink ) . - '

' . $dlink2; + } elseif ( $existsType == 'thumb' ) { + # Check if an image without leading '180px-' (or similiar) exists + $dlink = $sk->makeKnownLinkObj( $file->getTitle() ); + if ( $file->allowInlineDisplay() ) { + $dlink2 = $sk->makeImageLinkObj( $file->getTitle(), + wfMsgExt( 'fileexists-thumb', 'parseinline' ), + $file->getTitle()->getText(), $align, array(), false, true ); + } elseif ( !$file->allowInlineDisplay() && $file->isSafeFile() ) { + $icon = $file->iconThumb(); + $dlink2 = '

' . + $icon->toHtml( array( 'desc-link' => true ) ) . '
' . + $dlink . '

'; } else { - # Image w/o '180px-' does not exists, but we do not like these filenames - $warning .= '

' . wfMsgExt( 'file-thumbnail-no', 'parseinline' , - substr( $partname , 0, strpos( $partname , '-' ) +1 ) ) . '

'; - } - } - - $filenamePrefixBlacklist = self::getFilenamePrefixBlacklist(); - # Do the match - foreach( $filenamePrefixBlacklist as $prefix ) { - if ( substr( $partname, 0, strlen( $prefix ) ) == $prefix ) { - $warning .= '

' . wfMsgExt( 'filename-bad-prefix', 'parseinline', $prefix ) . '

'; - break; + $dlink2 = ''; } - } - - if ( $file->wasDeleted() && !$file->exists() ) { - # If the file existed before and was deleted, warn the user of this - # Don't bother doing so if the file exists now, however - $ltitle = SpecialPage::getTitleFor( 'Log' ); - $llink = $sk->makeKnownLinkObj( $ltitle, wfMsgHtml( 'deletionlog' ), - 'type=delete&page=' . $file->getTitle()->getPrefixedUrl() ); - $warning .= '

' . wfMsgWikiHtml( 'filewasdeleted', $llink ) . '

'; + $warning .= '

' . wfMsgExt( 'fileexists-thumbnail-yes', 'parsemag', $dlink ) . + '

' . $dlink2; } return $warning; } - + /** * Get a list of warnings * @@ -720,7 +422,9 @@ class UploadForm { } $s = ' '; if ( $file ) { - $warning = self::getExistsWarning( $file ); + $exists = UploadFromBase::getExistsWarning( $file ); + $warning = self::getExistsWarning( $exists ); + // FIXME: We probably also want the prefix blacklist and the wasdeleted check here if ( $warning !== '' ) { $s = "

$warning"; } @@ -751,9 +455,7 @@ class UploadForm { * Check for duplicate files and throw up a warning before the upload * completes. */ - function getDupeWarning( $tempfile ) { - $hash = File::sha1Base36( $tempfile ); - $dupes = RepoGroup::singleton()->findBySha1( $hash ); + public static function getDupeWarning( $dupes ) { if( $dupes ) { global $wgOut; $msg = ""; @@ -772,85 +474,6 @@ class UploadForm { } } - /** - * Get a list of blacklisted filename prefixes from [[MediaWiki:filename-prefix-blacklist]] - * - * @return array list of prefixes - */ - public static function getFilenamePrefixBlacklist() { - $blacklist = array(); - $message = wfMsgForContent( 'filename-prefix-blacklist' ); - if( $message && !( wfEmptyMsg( 'filename-prefix-blacklist', $message ) || $message == '-' ) ) { - $lines = explode( "\n", $message ); - foreach( $lines as $line ) { - // Remove comment lines - $comment = substr( trim( $line ), 0, 1 ); - if ( $comment == '#' || $comment == '' ) { - continue; - } - // Remove additional comments after a prefix - $comment = strpos( $line, '#' ); - if ( $comment > 0 ) { - $line = substr( $line, 0, $comment-1 ); - } - $blacklist[] = trim( $line ); - } - } - return $blacklist; - } - - /** - * Stash a file in a temporary directory for later processing - * after the user has confirmed it. - * - * If the user doesn't explicitly cancel or accept, these files - * can accumulate in the temp directory. - * - * @param string $saveName - the destination filename - * @param string $tempName - the source temporary file to save - * @return string - full path the stashed file, or false on failure - * @access private - */ - function saveTempUploadedFile( $saveName, $tempName ) { - global $wgOut; - $repo = RepoGroup::singleton()->getLocalRepo(); - $status = $repo->storeTemp( $saveName, $tempName ); - if ( !$status->isGood() ) { - $this->showError( $status->getWikiText() ); - return false; - } else { - return $status->value; - } - } - - /** - * Stash a file in a temporary directory for later processing, - * and save the necessary descriptive info into the session. - * Returns a key value which will be passed through a form - * to pick up the path info on a later invocation. - * - * @return int - * @access private - */ - function stashSession() { - $stash = $this->saveTempUploadedFile( $this->mDestName, $this->mTempPath ); - - if( !$stash ) { - # Couldn't save the file. - return false; - } - - $key = mt_rand( 0, 0x7fffffff ); - $_SESSION['wsUploadData'][$key] = array( - 'mTempPath' => $stash, - 'mFileSize' => $this->mFileSize, - 'mSrcName' => $this->mSrcName, - 'mFileProps' => $this->mFileProps, - 'version' => self::SESSION_VERSION, - ); - return $key; - } - /** * Remove a temporarily kept file stashed by saveTempUploadedFile(). * @access private @@ -858,10 +481,9 @@ class UploadForm { */ function unsaveUploadedFile() { global $wgOut; - $repo = RepoGroup::singleton()->getLocalRepo(); - $success = $repo->freeTemp( $this->mTempPath ); + $success = $this->mUpload->unsaveUploadedFile(); if ( ! $success ) { - $wgOut->showFileDeleteError( $this->mTempPath ); + $wgOut->showFileDeleteError( $this->mUpload->getTempPath() ); return false; } else { return true; @@ -888,19 +510,41 @@ class UploadForm { * @param string $warning as HTML * @access private */ - function uploadWarning( $warning ) { + function uploadWarning( $warnings ) { global $wgOut; global $wgUseCopyrightUpload; - $this->mSessionKey = $this->stashSession(); + $this->mSessionKey = $this->mUpload->stashSession(); if( !$this->mSessionKey ) { # Couldn't save file; an error has been displayed so let's go. return; } $wgOut->addHTML( '

' . wfMsgHtml( 'uploadwarning' ) . "

\n" ); - $wgOut->addHTML( '

' . $warning . "\n" ); - + $wgOut->addHTML( '

" . wfMsgWikiHtml( 'filewasdeleted', $llink ) . "
" . wfMsgExt( $warning, 'parseinline', $args ) . "