<?php
-
/**
* Image authorisation script
*
*
* Your server needs to support PATH_INFO; CGI-based configurations usually don't.
*
- * @file
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- **/
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
if ( isset( $_SERVER['MW_COMPILED'] ) ) {
- require ( 'phase3/includes/WebStart.php' );
+ require ( 'core/includes/WebStart.php' );
} else {
- require ( dirname( __FILE__ ) . '/includes/WebStart.php' );
+ require ( __DIR__ . '/includes/WebStart.php' );
}
wfProfileIn( 'img_auth.php' );
wfLogProfilingData();
function wfImageAuthMain() {
- global $wgImgAuthPublicTest, $wgRequest, $wgUploadDirectory;
+ global $wgImgAuthPublicTest, $wgRequest;
// See if this is a public Wiki (no protections).
if ( $wgImgAuthPublicTest
// Get the requested file path (source file or thumbnail)
$matches = WebRequest::getPathInfo();
+ if ( !isset( $matches['title'] ) ) {
+ wfForbidden( 'img-auth-accessdenied', 'img-auth-nopathinfo' );
+ return;
+ }
$path = $matches['title'];
if ( $path && $path[0] !== '/' ) {
// Make sure $path has a leading /
return;
}
- // Get the full file path
- $filename = realpath( $wgUploadDirectory . $path );
- $realUpload = realpath( $wgUploadDirectory );
+ // Get the local file repository
+ $repo = RepoGroup::singleton()->getRepo( 'local' );
- // Basic directory traversal check
- if ( substr( $filename, 0, strlen( $realUpload ) ) != $realUpload ) {
- wfForbidden( 'img-auth-accessdenied', 'img-auth-notindir' );
- return;
+ // Get the full file storage path and extract the source file name.
+ // (e.g. 120px-Foo.png => Foo.png or page2-120px-Foo.png => Foo.png).
+ // This only applies to thumbnails, and all thumbnails should
+ // be under a folder that has the source file name.
+ if ( strpos( $path, '/thumb/' ) === 0 ) {
+ $name = wfBaseName( dirname( $path ) ); // file is a thumbnail
+ $filename = $repo->getZonePath( 'thumb' ) . substr( $path, 6 ); // strip "/thumb"
+ } else {
+ $name = wfBaseName( $path ); // file is a source file
+ $filename = $repo->getZonePath( 'public' ) . $path;
}
// Check to see if the file exists
- if ( !file_exists( $filename ) ) {
+ if ( !$repo->fileExists( $filename ) ) {
wfForbidden( 'img-auth-accessdenied','img-auth-nofile', $filename );
return;
}
-
- // Check to see if tried to access a directory
- if ( is_dir( $filename ) ) {
- wfForbidden( 'img-auth-accessdenied','img-auth-isdir', $filename );
- return;
- }
-
- // Extract the file name and chop off the size specifier.
- // (e.g. 120px-Foo.png => Foo.png or page2-120px-Foo.png => Foo.png).
- // This only applies to thumbnails, and all thumbnails should
- // be under a folder that has the source file name.
- $name = wfBaseName( $path );
- if ( strpos( $path, '/thumb/' ) === 0 ) {
- $name = wfBaseName( dirname( $path ) ); // this file is a thumbnail
- }
$title = Title::makeTitleSafe( NS_FILE, $name );
if ( !$title instanceof Title ) { // files have valid titles
wfForbidden( $result[0], $result[1], array_slice( $result, 2 ) );
return;
}
-
+
// Check user authorization for this title
- // UserCanRead Checks Whitelist too
- if ( !$title->userCanRead() ) {
+ // Checks Whitelist too
+ if ( !$title->userCan( 'read' ) ) {
wfForbidden( 'img-auth-accessdenied', 'img-auth-noread', $name );
return;
}
// Stream the requested file
wfDebugLog( 'img_auth', "Streaming `".$filename."`." );
- StreamFile::stream( $filename, array( 'Cache-Control: private', 'Vary: Cookie' ) );
+ $repo->streamFile( $filename, array( 'Cache-Control: private', 'Vary: Cookie' ) );
}
/**
array_shift( $args );
array_shift( $args );
- $msgHdr = htmlspecialchars( wfMsg( $msg1 ) );
+ $msgHdr = wfMessage( $msg1 )->escaped();
$detailMsgKey = $wgImgAuthDetails ? $msg2 : 'badaccess-group0';
- $detailMsg = htmlspecialchars( wfMsg( $detailMsgKey, $args ) );
+ $detailMsg = wfMessage( $detailMsgKey, $args )->escaped();
wfDebugLog( 'img_auth',
- "wfForbidden Hdr:" . wfMsgExt( $msg1, array( 'language' => 'en' ) ). " Msg: ".
- wfMsgExt( $msg2, array( 'language' => 'en' ), $args )
+ "wfForbidden Hdr:" . wfMessage( $msg1 )->inLanguage( 'en' )->text() . " Msg: ".
+ wfMessage( $msg2, $args )->inLanguage( 'en' )->text()
);
header( 'HTTP/1.0 403 Forbidden' );