X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=img_auth.php;h=b3a34955def2730b0fd70857bfcb9f04d7ec09cd;hb=d1a806b91b83c83e5ebba2fbc1486e9bc1a4c6a4;hp=11684b375e5531d443524153d2d1653391057cda;hpb=2d5ac3c276413fe42ebda673019c7fcdf4b2c878;p=lhc%2Fweb%2Fwiklou.git
diff --git a/img_auth.php b/img_auth.php
index 11684b375e..b3a34955de 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -1,63 +1,171 @@
getNsText( NS_IMAGE ) . ":" . wfBaseName( $_SERVER['PATH_INFO'] );
+wfImageAuthMain();
+wfLogProfilingData();
-# Check if the filename is in the correct directory
-if ( substr( $filename, 0, strlen( $realUploadDirectory ) ) != $realUploadDirectory ) {
- wfDebugLog( 'img_auth', "requested path not in upload dir: $filename" );
- wfForbidden();
-}
+function wfImageAuthMain() {
+ global $wgImgAuthPublicTest, $wgRequest;
-if ( is_array( $wgWhitelistRead ) && !in_array( $imageName, $wgWhitelistRead ) && !$wgUser->getID() ) {
- wfDebugLog( 'img_auth', "not logged in and requested file not in whitelist: $imageName" );
- wfForbidden();
-}
+ // 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;
+ }
-if( !file_exists( $filename ) ) {
- wfDebugLog( 'img_auth', "requested file does not exist: $filename" );
- wfForbidden();
-}
-if( is_dir( $filename ) ) {
- wfDebugLog( 'img_auth', "requested file is a directory: $filename" );
- wfForbidden();
+ // 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 /
+ $path = "/" . $path;
+ }
+
+ // Check for bug 28235: QUERY_STRING overriding the correct extension
+ $whitelist = array();
+ $dotPos = strrpos( $path, '.' );
+ if ( $dotPos !== false ) {
+ $whitelist[] = substr( $path, $dotPos + 1 );
+ }
+ if ( !$wgRequest->checkUrlExtension( $whitelist ) ) {
+ return;
+ }
+
+ // Get the local file repository
+ $repo = RepoGroup::singleton()->getRepo( 'local' );
+
+ // 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 ( !$repo->fileExists( $filename ) ) {
+ wfForbidden( 'img-auth-accessdenied','img-auth-nofile', $filename );
+ return;
+ }
+
+ $title = Title::makeTitleSafe( NS_FILE, $name );
+ if ( !$title instanceof Title ) { // files have valid titles
+ wfForbidden( 'img-auth-accessdenied', 'img-auth-badtitle', $name );
+ return;
+ }
+
+ // Run hook for extension authorization plugins
+ 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;
+ }
+
+ // Stream the requested file
+ wfDebugLog( 'img_auth', "Streaming `".$filename."`." );
+ $repo->streamFile( $filename, array( 'Cache-Control: private', 'Vary: Cookie' ) );
}
-# Write file
-wfDebugLog( 'img_auth', "streaming file: $filename" );
-wfStreamFile( $filename );
-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
+ * @param $msg1
+ * @param $msg2
+ */
+function wfForbidden( $msg1, $msg2 ) {
+ global $wgImgAuthDetails;
+
+ $args = func_get_args();
+ array_shift( $args );
+ array_shift( $args );
+
+ $msgHdr = wfMessage( $msg1 )->escaped();
+ $detailMsgKey = $wgImgAuthDetails ? $msg2 : 'badaccess-group0';
+ $detailMsg = wfMessage( $detailMsgKey, $args )->escaped();
+
+ wfDebugLog( 'img_auth',
+ "wfForbidden Hdr:" . wfMessage( $msg1 )->inLanguage( 'en' )->text() . " Msg: ".
+ wfMessage( $msg2, $args )->inLanguage( 'en' )->text()
+ );
-function wfForbidden() {
header( 'HTTP/1.0 403 Forbidden' );
+ header( 'Cache-Control: no-cache' );
header( 'Content-Type: text/html; charset=utf-8' );
- print
-"
-Access denied
-You need to log in to access files on this server
-";
- wfLogProfilingData();
- exit;
+ echo <<
+
+$msgHdr
+$detailMsg
+
+