// 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, FileRepo::FILES_ONLY ) ) {
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
// Checks Whitelist too
if ( !$title->userCan( 'read' ) ) {
// 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' ) );
}
/**