* - 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 it 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
*
* For security reasons, you usually don't want your user to know *why* access was denied,
* just that it was. If you want to change this, you can set $wgImgAuthDetails to 'true'
wfImageAuthMain();
wfLogProfilingData();
+// Commit and close up!
+$factory = wfGetLBFactory();
+$factory->commitMasterChanges();
+$factory->shutdown();
function wfImageAuthMain() {
- global $wgImgAuthPublicTest, $wgImgAuthUrlPathMap, $wgRequest;
-
- // See if this is a public Wiki (no protections).
- if ( $wgImgAuthPublicTest
- && in_array( 'read', User::getGroupPermissions( array( '*' ) ), true )
- ) {
- // This is a public wiki, so disable this script (for private wikis only)
- wfForbidden( 'img-auth-accessdenied', 'img-auth-public' );
- return;
- }
+ global $wgImgAuthUrlPathMap;
+
+ $request = RequestContext::getMain()->getRequest();
+ $publicWiki = in_array( 'read', User::getGroupPermissions( array( '*' ) ), true );
// Get the requested file path (source file or thumbnail)
$matches = WebRequest::getPathInfo();
// Check for bug 28235: QUERY_STRING overriding the correct extension
$whitelist = array();
- $extension = FileBackend::extensionFromPath( $path );
+ $extension = FileBackend::extensionFromPath( $path, 'rawcase' );
if ( $extension != '' ) {
$whitelist[] = $extension;
}
- if ( !$wgRequest->checkUrlExtension( $whitelist ) ) {
+ if ( !$request->checkUrlExtension( $whitelist ) ) {
return;
}
// Get the local file repository
$repo = RepoGroup::singleton()->getRepo( 'local' );
+ $zone = strstr( ltrim( $path, '/' ), '/', true );
// 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
+ // This only applies to thumbnails/transcoded, and each of them 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"
+ if ( $zone === 'thumb' || $zone === 'transcoded' ) {
+ $name = wfBaseName( dirname( $path ) );
+ $filename = $repo->getZonePath( $zone ) . substr( $path, strlen( "/".$zone ) );
+ // Check to see if the file exists
+ if ( !$repo->fileExists( $filename ) ) {
+ wfForbidden( 'img-auth-accessdenied', 'img-auth-nofile', $filename );
+ return;
+ }
} else {
$name = wfBaseName( $path ); // file is a source file
$filename = $repo->getZonePath( 'public' ) . $path;
+ // Check to see if the file exists and is not deleted
+ $bits = explode( '!', $name, 2 );
+ if ( substr( $path, 0, 9 ) === '/archive/' && count( $bits ) == 2 ) {
+ $file = $repo->newFromArchiveName( $bits[1], $name );
+ } else {
+ $file = $repo->newFile( $name );
+ }
+ if ( !$file->exists() || $file->isDeleted( File::DELETED_FILE ) ) {
+ wfForbidden( 'img-auth-accessdenied', 'img-auth-nofile', $filename );
+ return;
+ }
}
- // Check to see if the file exists
- if ( !$repo->fileExists( $filename ) ) {
- wfForbidden( 'img-auth-accessdenied', 'img-auth-nofile', $filename );
- return;
- }
+ $headers = array(); // extra HTTP headers to send
- $title = Title::makeTitleSafe( NS_FILE, $name );
- if ( !$title instanceof Title ) { // files have valid titles
- wfForbidden( 'img-auth-accessdenied', 'img-auth-badtitle', $name );
- return;
- }
+ if ( !$publicWiki ) {
+ // For private wikis, run extra auth checks and set cache control headers
+ $headers[] = 'Cache-Control: private';
+ $headers[] = 'Vary: Cookie';
- // Run hook for extension authorization plugins
- /** @var $result array */
- $result = null;
- if ( !wfRunHooks( 'ImgAuthBeforeStream', array( &$title, &$path, &$name, &$result ) ) ) {
- wfForbidden( $result[0], $result[1], array_slice( $result, 2 ) );
- return;
- }
+ $title = Title::makeTitleSafe( NS_FILE, $name );
+ if ( !$title instanceof Title ) { // files have valid titles
+ wfForbidden( 'img-auth-accessdenied', 'img-auth-badtitle', $name );
+ return;
+ }
- // Check user authorization for this title
- // Checks Whitelist too
- if ( !$title->userCan( 'read' ) ) {
- wfForbidden( 'img-auth-accessdenied', 'img-auth-noread', $name );
- return;
+ // Run hook for extension authorization plugins
+ /** @var $result array */
+ $result = null;
+ if ( !wfRunHooks( 'ImgAuthBeforeStream', array( &$title, &$path, &$name, &$result ) ) ) {
+ wfForbidden( $result[0], $result[1], array_slice( $result, 2 ) );
+ return;
+ }
+
+ // Check user authorization for this title
+ // Checks Whitelist too
+ if ( !$title->userCan( 'read' ) ) {
+ wfForbidden( 'img-auth-accessdenied', 'img-auth-noread', $name );
+ return;
+ }
}
- if ( $wgRequest->getCheck( 'download' ) ) {
- header( 'Content-Disposition: attachment' );
+ if ( $request->getCheck( 'download' ) ) {
+ $headers[] = 'Content-Disposition: attachment';
}
// Stream the requested file
wfDebugLog( 'img_auth', "Streaming `" . $filename . "`." );
- $repo->streamFile( $filename, array( 'Cache-Control: private', 'Vary: Cookie' ) );
+ $repo->streamFile( $filename, $headers );
}
/**
dépôts / lhc / web / wiklou.git / blobdiff