*
* 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
**/
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'] ) ) {
- $path = $wgRequest->getText( 'path' );
- if( !$path ) {
- wfForbidden( 'img-auth-accessdenied', 'img-auth-nopathinfo' );
- }
- $path = "/$path";
-} 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 );
$realUpload = realpath( $wgUploadDirectory );
// Basic directory traversal check
-if( substr( $filename, 0, strlen( $realUpload ) ) != $realUpload )
+if( substr( $filename, 0, strlen( $realUpload ) ) != $realUpload ) {
wfForbidden('img-auth-accessdenied','img-auth-notindir');
+}
// Extract the file name and chop off the size specifier
// (e.g. 120px-Foo.png => Foo.png)
$name = wfBaseName( $path );
-if( preg_match( '!\d+px-(.*)!i', $name, $m ) )
+if( preg_match( '!\d+px-(.*)!i', $name, $m ) ) {
$name = $m[1];
+}
// Check to see if the file exists
-if( !file_exists( $filename ) )
+if( !file_exists( $filename ) ) {
wfForbidden('img-auth-accessdenied','img-auth-nofile',$filename);
+}
// Check to see if tried to access a directory
-if( is_dir( $filename ) )
+if( is_dir( $filename ) ) {
wfForbidden('img-auth-accessdenied','img-auth-isdir',$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 ) ) )
+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
+ * @param $msg1
+ * @param $msg2
*/
-function wfForbidden($msg1,$msg2) {
+function wfForbidden( $msg1, $msg2 ) {
global $wgImgAuthDetails;
$args = func_get_args();
array_shift( $args );
array_shift( $args );
- $MsgHdr = htmlspecialchars(wfMsg($msg1));
- $detailMsg = (htmlspecialchars(wfMsg(($wgImgAuthDetails ? $msg2 : 'badaccess-group0'),$args)));
- wfDebugLog('img_auth', "wfForbidden Hdr:".wfMsgExt( $msg1, array('language' => 'en'))." Msg: ".
- wfMsgExt($msg2,array('language' => 'en'),$args));
+ $MsgHdr = htmlspecialchars( wfMsg( $msg1 ) );
+ $detailMsg = ( htmlspecialchars( wfMsg( ( $wgImgAuthDetails ? $msg2 : 'badaccess-group0' ), $args ) ) );
+ wfDebugLog('img_auth', "wfForbidden Hdr:".wfMsgExt( $msg1, array( 'language' => 'en' ) )." Msg: ".
+ wfMsgExt( $msg2, array('language' => 'en' ), $args ) );
header( 'HTTP/1.0 403 Forbidden' );
header( 'Cache-Control: no-cache' );
header( 'Content-Type: text/html; charset=utf-8' );