<?php
-
-require_once( "Image.php" );
-
-function wfSpecialUpload()
-{
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
+
+/**
+ *
+ */
+require_once( 'Image.php' );
+
+/**
+ * Entry point
+ */
+function wfSpecialUpload() {
global $wgRequest;
$form = new UploadForm( $wgRequest );
$form->execute();
}
+/**
+ *
+ * @package MediaWiki
+ * @subpackage SpecialPage
+ */
class UploadForm {
+ /**#@+
+ * @access private
+ */
var $mUploadAffirm, $mUploadFile, $mUploadDescription, $mIgnoreWarning;
var $mUploadSaveName, $mUploadTempName, $mUploadSize, $mUploadOldVersion;
var $mUploadCopyStatus, $mUploadSource, $mReUpload, $mAction, $mUpload;
var $mOname, $mSessionKey;
+ /**#@- */
+ /**
+ * Constructor : initialise object
+ * Get data POSTed through the form and assign them to the object
+ * @param $request Data posted.
+ */
function UploadForm( &$request ) {
$this->mUploadAffirm = $request->getVal( 'wpUploadAffirm' );
$this->mUploadFile = $request->getVal( 'wpUploadFile' );
$this->mUpload = $request->getCheck( 'wpUpload' );
$this->mSessionKey = $request->getVal( 'wpSessionKey' );
+ /** Generate a temporary name if we don't have one yet */
if ( ! $this->mUploadTempName ) {
- $this->mUploadTempName = @$_FILES['wpUploadFile']['tmp_name'];
+ $this->mUploadTempName = $request->getFileTempName( 'wpUploadFile' );
}
+
+ /** Get size of file */
if ( ! $this->mUploadSize ) {
- $this->mUploadSize = @$_FILES['wpUploadFile']['size'];
+ $this->mUploadSize = $request->getFileSize( 'wpUploadFile' );
}
- $this->mOname = $request->getGPCVal( $_FILES['wpUploadFile'], 'name', "" );
-
+ $this->mOname = $request->getFileName( 'wpUploadFile' );
}
+ /**
+ * Start doing stuff
+ * @access public
+ */
function execute() {
global $wgUser, $wgOut;
global $wgDisableUploads;
+ /** Show an error message if file upload is disabled */
if ( $wgDisableUploads ) {
- $wgOut->addWikiText( wfMsg( "uploaddisabled" ) );
+ $wgOut->addWikiText( wfMsg( 'uploaddisabled' ) );
return;
}
- if ( ( 0 == $wgUser->getID() )
- or $wgUser->isBlocked() ) {
- $wgOut->errorpage( "uploadnologin", "uploadnologintext" );
+
+ /** Various rights checks */
+ if ( ( $wgUser->getID() == 0 )
+ OR $wgUser->isBlocked() ) {
+ $wgOut->errorpage( 'uploadnologin', 'uploadnologintext' );
return;
}
if ( wfReadOnly() ) {
$wgOut->readOnlyPage();
return;
}
+
if ( $this->mReUpload ) {
$this->unsaveUploadedFile();
- $this->mainUploadForm( "" );
- } else if ( "submit" == $this->mAction || $this->mUpload ) {
+ $this->mainUploadForm( '' );
+ } else if ( 'submit' == $this->mAction || $this->mUpload ) {
$this->processUpload();
} else {
- $this->mainUploadForm( "" );
+ $this->mainUploadForm( '' );
}
}
-
- function processUpload()
- {
- global $wgUser, $wgOut, $wgLang;
+ /**
+ * Really do the upload
+ * Checks are made in SpecialUpload::execute()
+ * @access private
+ */
+ function processUpload() {
+ global $wgUser, $wgOut, $wgLang, $wgContLang;
global $wgUploadDirectory;
global $wgSavedFile, $wgUploadOldVersion;
global $wgUseCopyrightUpload, $wgCheckCopyrightUpload;
global $wgCheckFileExtensions, $wgStrictFileExtensions;
global $wgFileExtensions, $wgFileBlacklist, $wgUploadSizeWarning;
+ /** When using detailed copyright, if user filled field, assume he
+ * confirmed the upload */
if ( $wgUseCopyrightUpload ) {
$this->mUploadAffirm = 1;
if ($wgCheckCopyrightUpload &&
- (trim ( $this->mUploadCopyStatus ) == "" || trim ( $this->mUploadSource ) == "" )) {
+ (trim ( $this->mUploadCopyStatus ) == '' || trim ( $this->mUploadSource ) == '' )) {
$this->mUploadAffirm = 0;
}
}
- if ( 1 != $this->mUploadAffirm ) {
- $this->mainUploadForm( WfMsg( "noaffirmation" ) );
+ /** User need to confirm his upload */
+ if ( $this->mUploadAffirm != 1) {
+ $this->mainUploadForm( WfMsg( 'noaffirmation' ) );
return;
}
- if ( "" != $this->mOname ) {
- $basename = strrchr( $this->mOname, "/" );
+ if ( $this->mOname != '' ) {
+ $basename = strrchr( $this->mOname, '/' );
if ( false === $basename ) { $basename = $this->mOname; }
else ( $basename = substr( $basename, 1 ) );
- $ext = strrchr( $basename, "." );
- if ( false === $ext ) { $ext = ""; }
+ $ext = strrchr( $basename, '.' );
+ if ( false === $ext ) { $ext = ''; }
else { $ext = substr( $ext, 1 ); }
- if ( "" == $ext ) { $xl = 0; } else { $xl = strlen( $ext ) + 1; }
+ if ( '' == $ext ) { $xl = 0; } else { $xl = strlen( $ext ) + 1; }
$partname = substr( $basename, 0, strlen( $basename ) - $xl );
if ( strlen( $partname ) < 3 ) {
- $this->mainUploadForm( WfMsg( "minlength" ) );
+ $this->mainUploadForm( WfMsg( 'minlength' ) );
return;
}
$basename = $bn;
}
-
$nt = Title::newFromText( $basename );
if( !$nt ) {
- return $this->uploadError( wfMsg( "illegalfilename", htmlspecialchars( $basename ) ) );
+ return $this->uploadError( wfMsg( 'illegalfilename', htmlspecialchars( $basename ) ) );
}
$nt->setNamespace( Namespace::getImage() );
$this->mUploadSaveName = $nt->getDBkey();
/* Don't allow users to override the blacklist */
if( $this->checkFileExtension( $ext, $wgFileBlacklist ) ||
($wgStrictFileExtensions && !$this->checkFileExtension( $ext, $wgFileExtensions ) ) ) {
- return $this->uploadError( wfMsg( "badfiletype", htmlspecialchars( $ext ) ) );
+ return $this->uploadError( wfMsg( 'badfiletype', htmlspecialchars( $ext ) ) );
+ }
+
+ if( !$this->verify( $this->mUploadTempName, $ext ) ) {
+ return $this->uploadError( wfMsg( 'uploadcorrupt' ) );
}
$this->saveUploadedFile( $this->mUploadSaveName, $this->mUploadTempName );
if ( !$nt->userCanEdit() ) {
- return $this->uploadError( wfMsg( "protectedpage" ) );
+ return $this->uploadError( wfMsg( 'protectedpage' ) );
}
if ( ! $this->mIgnoreWarning ) {
$warning = '';
if( $changed_name || 0 != strcmp( ucfirst( $basename ), $this->mUploadSaveName ) ) {
- $warning .= '<li>'.wfMsg( "badfilename", htmlspecialchars( $this->mUploadSaveName ) ).'</li>';
+ $warning .= '<li>'.wfMsg( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'</li>';
}
if ( $wgCheckFileExtensions ) {
if ( ! $this->checkFileExtension( $ext, $wgFileExtensions ) ) {
- $warning .= '<li>'.wfMsg( "badfiletype", htmlspecialchars( $ext ) ).'</li>';
+ $warning .= '<li>'.wfMsg( 'badfiletype', htmlspecialchars( $ext ) ).'</li>';
}
}
if ( $wgUploadSizeWarning && ( $this->mUploadSize > $wgUploadSizeWarning ) ) {
- $warning .= '<li>'.wfMsg( "largefile" ).'</li>';
+ $warning .= '<li>'.wfMsg( 'largefile' ).'</li>';
}
if ( $this->mUploadSize == 0 ) {
- $warning .= '<li>'.wfMsg( "emptyfile" ).'</li>';
+ $warning .= '<li>'.wfMsg( 'emptyfile' ).'</li>';
}
if( $nt->getArticleID() ) {
$sk = $wgUser->getSkin();
- $dname = $wgLang->getNsText( Namespace::getImage() ) . ":{$this->mUploadSaveName}";
+ $dname = $wgContLang->getNsText( Namespace::getImage() ) .':'.$this->mUploadSaveName;
$dlink = $sk->makeKnownLink( $dname, $dname );
- $warning .= '<li>'.wfMsg( "fileexists", $dlink ).'</li>';
+ $warning .= '<li>'.wfMsg( 'fileexists', $dlink ).'</li>';
}
if($warning != '') return $this->uploadWarning($warning);
}
+ } elseif(!isset($this->mUploadSaveName)) {
+ // no filename given even when reuploading
+ return $this->uploadError('<li>'.wfMsg( 'emptyfile' ).'</li>');
+
}
if ( !is_null( $this->mUploadOldVersion ) ) {
$wgUploadOldVersion = $this->mUploadOldVersion;
$sk = $wgUser->getSkin();
$ilink = $sk->makeMediaLink( $this->mUploadSaveName, Image::wfImageUrl( $this->mUploadSaveName ) );
- $dname = $wgLang->getNsText( Namespace::getImage() ) . ":{$this->mUploadSaveName}";
+ $dname = $wgContLang->getNsText( Namespace::getImage() ) . ':'.$this->mUploadSaveName;
$dlink = $sk->makeKnownLink( $dname, $dname );
- $wgOut->addHTML( "<h2>" . wfMsg( "successfulupload" ) . "</h2>\n" );
- $text = wfMsg( "fileuploaded", $ilink, $dlink );
- $wgOut->addHTML( "<p>{$text}\n" );
+ $wgOut->addHTML( '<h2>' . wfMsg( 'successfulupload' ) . "</h2>\n" );
+ $text = wfMsg( 'fileuploaded', $ilink, $dlink );
+ $wgOut->addHTML( '<p>'.$text."\n" );
$wgOut->returnToMain( false );
}
return in_array( strtolower( $ext ), $list );
}
- function saveUploadedFile( $saveName, $tempName )
- {
+ function saveUploadedFile( $saveName, $tempName ) {
global $wgSavedFile, $wgUploadOldVersion;
global $wgUploadDirectory, $wgOut;
$wgSavedFile = "{$dest}/{$saveName}";
if ( is_file( $wgSavedFile ) ) {
- $wgUploadOldVersion = gmdate( "YmdHis" ) . "!{$saveName}";
+ $wgUploadOldVersion = gmdate( 'YmdHis' ) . "!{$saveName}";
if ( ! rename( $wgSavedFile, "${archive}/{$wgUploadOldVersion}" ) ) {
$wgOut->fileRenameError( $wgSavedFile,
return;
}
} else {
- $wgUploadOldVersion = "";
+ $wgUploadOldVersion = '';
}
if ( ! move_uploaded_file( $tempName, $wgSavedFile ) ) {
$wgOut->fileCopyError( $tempName, $wgSavedFile );
chmod( $wgSavedFile, 0644 );
}
- function unsaveUploadedFile()
- {
+ function unsaveUploadedFile() {
global $wgUploadDirectory, $wgOut, $wgRequest;
$wgSavedFile = $_SESSION['wsUploadFiles'][$this->mSessionKey];
$wgOut->fileDeleteError( $wgSavedFile );
return;
}
- if ( "" != $wgUploadOldVersion ) {
+ if ( '' != $wgUploadOldVersion ) {
$hash = md5( substr( $wgUploadOldVersion, 15 ) );
- $archive = "{$wgUploadDirectory}/archive/" . $hash{0} .
- "/" . substr( $hash, 0, 2 );
+ $archive = $wgUploadDirectory.'/archive/' . $hash{0} .
+ '/' . substr( $hash, 0, 2 );
if ( ! rename( "{$archive}/{$wgUploadOldVersion}", $wgSavedFile ) ) {
$wgOut->fileRenameError( "{$archive}/{$wgUploadOldVersion}",
}
}
- function uploadError( $error )
- {
+ function uploadError( $error ) {
global $wgOut;
- $sub = wfMsg( "uploadwarning" );
+ $sub = wfMsg( 'uploadwarning' );
$wgOut->addHTML( "<h2>{$sub}</h2>\n" );
$wgOut->addHTML( "<h4 style='error'>{$error}</h4>\n" );
}
- function uploadWarning( $warning )
- {
+ function uploadWarning( $warning ) {
global $wgOut, $wgUser, $wgLang, $wgUploadDirectory, $wgRequest;
global $wgSavedFile, $wgUploadOldVersion;
global $wgUseCopyrightUpload;
$this->mSessionKey = mt_rand( 0, 0x7fffffff );
$_SESSION['wsUploadFiles'][$this->mSessionKey] = $wgSavedFile;
- $sub = wfMsg( "uploadwarning" );
+ $sub = wfMsg( 'uploadwarning' );
$wgOut->addHTML( "<h2>{$sub}</h2>\n" );
$wgOut->addHTML( "<ul class='warning'>{$warning}</ul><br/>\n" );
- $save = wfMsg( "savefile" );
- $reupload = wfMsg( "reupload" );
- $iw = wfMsg( "ignorewarning" );
- $reup = wfMsg( "reuploaddesc" );
- $titleObj = Title::makeTitle( NS_SPECIAL, "Upload" );
- $action = $titleObj->escapeLocalURL( "action=submit" );
+ $save = wfMsg( 'savefile' );
+ $reupload = wfMsg( 'reupload' );
+ $iw = wfMsg( 'ignorewarning' );
+ $reup = wfMsg( 'reuploaddesc' );
+ $titleObj = Title::makeTitle( NS_SPECIAL, 'Upload' );
+ $action = $titleObj->escapeLocalURL( 'action=submit' );
if ( $wgUseCopyrightUpload )
{
</td><td align='left'>{$reup}</td></tr></table></form>\n" );
}
- function mainUploadForm( $msg )
- {
+ function mainUploadForm( $msg ) {
global $wgOut, $wgUser, $wgLang, $wgUploadDirectory, $wgRequest;
global $wgUseCopyrightUpload;
- if ( "" != $msg ) {
- $sub = wfMsg( "uploaderror" );
+ if ( '' != $msg ) {
+ $sub = wfMsg( 'uploaderror' );
$wgOut->addHTML( "<h2>{$sub}</h2>\n" .
"<h4 style='error'>{$msg}</h4>\n" );
} else {
- $sub = wfMsg( "uploadfile" );
+ $sub = wfMsg( 'uploadfile' );
$wgOut->addHTML( "<h2>{$sub}</h2>\n" );
}
- $wgOut->addWikiText( wfMsg( "uploadtext" ) );
+ $wgOut->addWikiText( wfMsg( 'uploadtext' ) );
$sk = $wgUser->getSkin();
- $fn = wfMsg( "filename" );
- $fd = wfMsg( "filedesc" );
- $ulb = wfMsg( "uploadbtn" );
+ $fn = wfMsg( 'filename' );
+ $fd = wfMsg( 'filedesc' );
+ $ulb = wfMsg( 'uploadbtn' );
- $clink = $sk->makeKnownLink( wfMsg( "copyrightpage" ),
- wfMsg( "copyrightpagename" ) );
- $ca = wfMsg( "affirmation", $clink );
- $iw = wfMsg( "ignorewarning" );
+ $clink = $sk->makeKnownLink( wfMsgForContent( 'copyrightpage' ),
+ wfMsg( 'copyrightpagename' ) );
+ $ca = wfMsg( 'affirmation', $clink );
+ $iw = wfMsg( 'ignorewarning' );
- $titleObj = Title::makeTitle( NS_SPECIAL, "Upload" );
+ $titleObj = Title::makeTitle( NS_SPECIAL, 'Upload' );
$action = $titleObj->escapeLocalURL();
$source = "
if ( $wgUseCopyrightUpload )
{
$source = "
- <td align='right' nowrap='nowrap'>" . wfMsg ( "filestatus" ) . ":</td>
+ <td align='right' nowrap='nowrap'>" . wfMsg ( 'filestatus' ) . ":</td>
<td><input tabindex='3' type='text' name=\"wpUploadCopyStatus\" value=\"" .
htmlspecialchars($this->mUploadCopyStatus). "\" size='40' /></td>
</tr><tr>
- <td align='right'>". wfMsg ( "filesource" ) . ":</td>
+ <td align='right'>". wfMsg ( 'filesource' ) . ":</td>
<td><input tabindex='4' type='text' name=\"wpUploadSource\" value=\"" .
htmlspecialchars($this->mUploadSource). "\" size='40' /></td>
" ;
<input tabindex='5' type='submit' name=\"wpUpload\" value=\"{$ulb}\" />
</td></tr></table></form>\n" );
}
+
+ /**
+ * Returns false if the file is of a known type but can't be recognized,
+ * indicating a corrupt file.
+ * Returns true otherwise; unknown file types are not checked if given
+ * with an unrecognized extension.
+ *
+ * @param string $tmpfile Pathname to the temporary upload file
+ * @param string $extension The filename extension that the file is to be served with
+ * @return bool
+ */
+ function verify( $tmpfile, $extension ) {
+ if( $this->triggersIEbug( $tmpfile ) ) {
+ return false;
+ }
+
+ $fname = 'SpecialUpload::verify';
+ $mergeExtensions = array(
+ 'jpg' => 'jpeg',
+ 'tif' => 'tiff' );
+ $extensionTypes = array(
+ # See http://www.php.net/getimagesize
+ 1 => 'gif',
+ 2 => 'jpeg',
+ 3 => 'png',
+ 4 => 'swf',
+ 5 => 'psd',
+ 6 => 'bmp',
+ 7 => 'tiff',
+ 8 => 'tiff',
+ 9 => 'jpc',
+ 10 => 'jp2',
+ 11 => 'jpx',
+ 12 => 'jb2',
+ 13 => 'swc',
+ 14 => 'iff',
+ 15 => 'wbmp',
+ 16 => 'xbm' );
+
+ $extension = strtolower( $extension );
+ if( isset( $mergeExtensions[$extension] ) ) {
+ $extension = $mergeExtensions[$extension];
+ }
+ wfDebug( "$fname: Testing file '$tmpfile' with given extension '$extension'\n" );
+
+ if( !in_array( $extension, $extensionTypes ) ) {
+ # Not a recognized image type. We don't know how to verify these.
+ # They're allowed by policy or they wouldn't get this far, so we'll
+ # let them slide for now.
+ wfDebug( "$fname: Unknown extension; passing.\n" );
+ return true;
+ }
+
+ $data = @getimagesize( $tmpfile );
+ if( false === $data ) {
+ # Didn't recognize the image type.
+ # Either the image is corrupt or someone's slipping us some
+ # bogus data such as HTML+JavaScript trying to take advantage
+ # of an Internet Explorer security flaw.
+ wfDebug( "$fname: getimagesize() doesn't recognize the file; rejecting.\n" );
+ return false;
+ }
+
+ $imageType = $data[2];
+ if( !isset( $extensionTypes[$imageType] ) ) {
+ # Now we're kind of confused. Perhaps new image types added
+ # to PHP's support that we don't know about.
+ # We'll let these slide for now.
+ wfDebug( "$fname: getimagesize() knows the file, but we don't recognize the type; passing.\n" );
+ return true;
+ }
+
+ $ext = strtolower( $extension );
+ if( $extension != $extensionTypes[$imageType] ) {
+ # The given filename extension doesn't match the
+ # file type. Probably just a mistake, but it's a stupid
+ # one and we shouldn't let it pass. KILL THEM!
+ wfDebug( "$fname: file extension does not match recognized type; rejecting.\n" );
+ return false;
+ }
+
+ wfDebug( "$fname: all clear; passing.\n" );
+ return true;
+ }
+
+ /**
+ * Internet Explorer for Windows performs some really stupid file type
+ * autodetection which can cause it to interpret valid image files as HTML
+ * and potentially execute JavaScript, creating a cross-site scripting
+ * attack vectors.
+ *
+ * Returns true if IE is likely to mistake the given file for HTML.
+ *
+ * @param string $filename
+ * @return bool
+ */
+ function triggersIEbug( $filename ) {
+ $file = fopen( $filename, 'rb' );
+ $chunk = strtolower( fread( $file, 200 ) );
+ fclose( $file );
+
+ $tags = array( '<html', '<head', '<body', '<script' );
+ foreach( $tags as $tag ) {
+ if( false !== strpos( $chunk, $tag ) ) {
+ return true;
+ }
+ }
+ return false;
+ }
}
?>
dépôts / lhc / web / wiklou.git / blobdiff