Move wfStreamFile() into a class, update all callers in core (only 3 extensions use...

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

diff --git a/img_auth.php b/img_auth.php
index e8ad6b9..9b330ce 100644 (file)
--- a/img_auth.php
+++ b/img_auth.php
@@ -10,7 +10,7 @@
  *
  * Optional Parameters
  *
- * - Set $wgImgAuthDetails = true if you want the reason the access was denied messages to be displayed 
+ * - Set $wgImgAuthDetails = true if you want the reason the access was denied messages to be displayed
  *       instead of just the 403 error (doesn't work on IE anyway),  otherwise will only appear in error logs
  * - Set $wgImgAuthPublicTest false if you don't want to just check and see if all are public
  *       must be set to false if using specific restrictions such as LockDown or NSFileRepo
@@ -26,26 +26,36 @@
  **/
 
 define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
-require_once( dirname( __FILE__ ) . '/includes/WebStart.php' );
+if ( isset( $_SERVER['MW_COMPILED'] ) ) {
+       require ( 'phase3/includes/WebStart.php' );
+} else {
+       require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+}
 wfProfileIn( 'img_auth.php' );
-require_once( dirname( __FILE__ ) . '/includes/StreamFile.php' );
 
+$wgActionPaths[] = $_SERVER['SCRIPT_NAME'];
 // See if this is a public Wiki (no protections)
-if ( $wgImgAuthPublicTest 
+if ( $wgImgAuthPublicTest
        && in_array( 'read', User::getGroupPermissions( array( '*' ) ), true ) )
 {
        wfForbidden('img-auth-accessdenied','img-auth-public');
 }
 
-// Extract path and image information
-if( !isset( $_SERVER['PATH_INFO'] ) ) {
-        if( isset( $_GET['path'] ) ) $path = $_GET['path'];
-        else wfForbidden('img-auth-accessdenied','img-auth-nopathinfo');
-} else {
-        $path = $_SERVER['PATH_INFO'];
+$matches = WebRequest::getPathInfo();
+$path = $matches['title'];
+
+// Check for bug 28235: QUERY_STRING overriding the correct extension
+$dotPos = strrpos( $path, '.' );
+$whitelist = array();
+if ( $dotPos !== false ) {
+       $whitelist[] = substr( $path, $dotPos + 1 );
+}
+if ( !$wgRequest->checkUrlExtension( $whitelist ) )
+{
+       return;
 }
 
-$filename = realpath( $wgUploadDirectory . '/' . $path );
+$filename = realpath( $wgUploadDirectory . $path );
 $realUpload = realpath( $wgUploadDirectory );
 
 // Basic directory traversal check
@@ -70,27 +80,27 @@ if( is_dir( $filename ) )
 $title = Title::makeTitleSafe( NS_FILE, $name );
 
 // See if could create the title object
-if( !$title instanceof Title ) 
+if( !$title instanceof Title )
        wfForbidden('img-auth-accessdenied','img-auth-badtitle',$name);
 
 // Run hook
 if (!wfRunHooks( 'ImgAuthBeforeStream', array( &$title, &$path, &$name, &$result ) ) )
        wfForbidden($result[0],$result[1],array_slice($result,2));
-       
+
 //  Check user authorization for this title
 //  UserCanRead Checks Whitelist too
-if( !$title->userCanRead() ) 
+if( !$title->userCanRead() )
        wfForbidden('img-auth-accessdenied','img-auth-noread',$name);
 
 // Stream the requested file
 wfDebugLog( 'img_auth', "Streaming `".$filename."`." );
-wfStreamFile( $filename, array( 'Cache-Control: private', 'Vary: Cookie' ) );
+StreamFile::stream( $filename, array( 'Cache-Control: private', 'Vary: Cookie' ) );
 wfLogProfilingData();
 
 /**
  * Issue a standard HTTP 403 Forbidden header ($msg1-a message index, not a message) and an
  * error message ($msg2, also a message index), (both required) then end the script
- * subsequent arguments to $msg2 will be passed as parameters only for replacing in $msg2 
+ * subsequent arguments to $msg2 will be passed as parameters only for replacing in $msg2
  */
 function wfForbidden($msg1,$msg2) {
        global $wgImgAuthDetails;