Fix for Bug #29628 - scriptpath Option of maintenance/install.php is ignored

[lhc/web/wiklou.git] / thumb.php

diff --git a/thumb.php b/thumb.php
index 6c8dcbf..1fe564d 100644 (file)
--- a/thumb.php
+++ b/thumb.php
@@ -7,7 +7,11 @@
  * @ingroup Media
  */
 define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
-require_once( './includes/WebStart.php' );
+if ( isset( $_SERVER['MW_COMPILED'] ) ) {
+       require ( 'phase3/includes/WebStart.php' );
+} else {
+       require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+}
 
 $wgTrivialMimeDetection = true; //don't use fancy mime detection, just check the file extension for jpg/gif/png.
 
@@ -20,6 +24,9 @@ wfLogProfilingData();
 
 function wfThumbMain() {
        wfProfileIn( __METHOD__ );
+
+       $headers = array();
+
        // Get input parameters
        if ( get_magic_quotes_gpc() ) {
                $params = array_map( 'stripslashes', $_REQUEST );
@@ -38,7 +45,7 @@ function wfThumbMain() {
        if ( isset( $params['p'] ) ) {
                $params['page'] = $params['p'];
        }
-       unset( $params['r'] );
+       unset( $params['r'] ); // ignore 'r' because we unconditionally pass File::RENDER
 
        // Is this a thumb of an archived file?
        $isOld = (isset( $params['archived'] ) && $params['archived']);
@@ -53,29 +60,46 @@ function wfThumbMain() {
                $bits = explode( '!', $fileName, 2 );
                if( !isset($bits[1]) ) {
                        wfThumbError( 404, wfMsg( 'badtitletext' ) );
+                       wfProfileOut( __METHOD__ );
                        return;
                }
                $title = Title::makeTitleSafe( NS_FILE, $bits[1] );
                if( is_null($title) ) {
                        wfThumbError( 404, wfMsg( 'badtitletext' ) );
+                       wfProfileOut( __METHOD__ );
                        return;
                }
                $img = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $title, $fileName );
        } else {
-               $img = RepoGroup::singleton()->getLocalRepo()->findFile( $fileName );
+               $img = wfLocalFile( $fileName );
+       }
+
+       // Check permissions if there are read restrictions
+       if ( !in_array( 'read', User::getGroupPermissions( array( '*' ) ), true ) ) {
+               if ( !$img->getTitle()->userCanRead() ) {
+                       wfThumbError( 403, 'Access denied. You do not have permission to access ' . 
+                               'the source file.' );
+                       wfProfileOut( __METHOD__ );
+                       return;
+               }
+               $headers[] = 'Cache-Control: private';
+               $headers[] = 'Vary: Cookie';
        }
 
        if ( !$img ) {
                wfThumbError( 404, wfMsg( 'badtitletext' ) );
+               wfProfileOut( __METHOD__ );
                return;
        }
        if ( !$img->exists() ) {
                wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
+               wfProfileOut( __METHOD__ );
                return;
        }
        $sourcePath = $img->getPath();
        if ( $sourcePath === false ) {
                wfThumbError( 500, 'The source file is not locally accessible.' );
+               wfProfileOut( __METHOD__ );
                return;
        }
 
@@ -87,10 +111,11 @@ function wfThumbMain() {
                // Calculate time
                wfSuppressWarnings();
                $imsUnix = strtotime( $imsString );
+               $stat = stat( $sourcePath );
                wfRestoreWarnings();
-               $stat = @stat( $sourcePath );
                if ( $stat['mtime'] <= $imsUnix ) {
                        header( 'HTTP/1.1 304 Not Modified' );
+                       wfProfileOut( __METHOD__ );
                        return;
                }
        }
@@ -101,12 +126,14 @@ function wfThumbMain() {
                        $thumbPath = $img->getThumbPath( $thumbName );
 
                        if ( is_file( $thumbPath ) ) {
-                               wfStreamFile( $thumbPath );
+                               wfStreamFile( $thumbPath, $headers );
+                               wfProfileOut( __METHOD__ );
                                return;
                        }
                }
        } catch ( MWException $e ) {
                wfThumbError( 500, $e->getHTML() );
+               wfProfileOut( __METHOD__ );
                return;
        }
 
@@ -128,7 +155,7 @@ function wfThumbMain() {
                $errorMsg = wfMsgHtml( 'thumbnail_error', 'Image was not scaled, ' .
                        'is the requested width bigger than the source?' );
        } else {
-               wfStreamFile( $thumb->getPath() );
+               wfStreamFile( $thumb->getPath(), $headers );
        }
        if ( $errorMsg !== false ) {
                wfThumbError( 500, $errorMsg );
@@ -143,11 +170,14 @@ function wfThumbError( $status, $msg ) {
        header( 'Content-Type: text/html; charset=utf-8' );
        if ( $status == 404 ) {
                header( 'HTTP/1.1 404 Not found' );
+       } elseif ( $status == 403 ) {
+               header( 'HTTP/1.1 403 Forbidden' );
+               header( 'Vary: Cookie' );
        } else {
                header( 'HTTP/1.1 500 Internal server error' );
        }
        if( $wgShowHostnames ) {
-               $url = htmlspecialchars( @$_SERVER['REQUEST_URI'] );
+               $url = htmlspecialchars( isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : '' );
                $hostname = htmlspecialchars( wfHostname() );
                $debug = "<!-- $url -->\n<!-- $hostname -->\n";
        } else {