summaryrefslogtreecommitdiff
path: root/img_auth.php
diff options
context:
space:
mode:
Diffstat (limited to 'img_auth.php')
-rw-r--r--img_auth.php128
1 files changed, 61 insertions, 67 deletions
diff --git a/img_auth.php b/img_auth.php
index e5d8d888..bc4464d4 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -3,118 +3,112 @@
/**
* Image authorisation script
*
- * To use this:
+ * To use this, see http://www.mediawiki.org/wiki/Manual:Image_Authorization
*
* - Set $wgUploadDirectory to a non-public directory (not web accessible)
* - Set $wgUploadPath to point to this file
*
- * Your server needs to support PATH_INFO; CGI-based configurations
- * usually don't.
+ * Optional Parameters
+ *
+ * - 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
+ *
+ * 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' in localsettings.php and it will give the user the reason
+ * why access was denied.
+ *
+ * Your server needs to support PATH_INFO; CGI-based configurations usually don't.
*
* @file
- */
-
+ *
+ **/
+
define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
require_once( dirname( __FILE__ ) . '/includes/WebStart.php' );
wfProfileIn( 'img_auth.php' );
require_once( dirname( __FILE__ ) . '/includes/StreamFile.php' );
-$perms = User::getGroupPermissions( array( '*' ) );
-if ( in_array( 'read', $perms, true ) ) {
- wfDebugLog( 'img_auth', 'Public wiki' );
- wfPublicError();
+// See if this is a public Wiki (no protections)
+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'] ) ) {
- wfDebugLog( 'img_auth', 'Missing PATH_INFO' );
- wfForbidden();
-}
+if( !isset( $_SERVER['PATH_INFO'] ) )
+ wfForbidden('img-auth-accessdenied','img-auth-nopathinfo');
$path = $_SERVER['PATH_INFO'];
$filename = realpath( $wgUploadDirectory . $_SERVER['PATH_INFO'] );
$realUpload = realpath( $wgUploadDirectory );
-wfDebugLog( 'img_auth', "\$path is {$path}" );
-wfDebugLog( 'img_auth', "\$filename is {$filename}" );
// Basic directory traversal check
-if( substr( $filename, 0, strlen( $realUpload ) ) != $realUpload ) {
- wfDebugLog( 'img_auth', 'Requested path not in upload directory' );
- wfForbidden();
-}
+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 ) )
$name = $m[1];
-wfDebugLog( 'img_auth', "\$name is {$name}" );
+
+// Check to see if the file exists
+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 ) )
+ wfForbidden('img-auth-accessdenied','img-auth-isdir',$filename);
+
$title = Title::makeTitleSafe( NS_FILE, $name );
-if( !$title instanceof Title ) {
- wfDebugLog( 'img_auth', "Unable to construct a valid Title from `{$name}`" );
- wfForbidden();
-}
-$title = $title->getPrefixedText();
-// Check the whitelist if needed
-if( !$wgUser->getId() && ( !is_array( $wgWhitelistRead ) || !in_array( $title, $wgWhitelistRead ) ) ) {
- wfDebugLog( 'img_auth', "Not logged in and `{$title}` not in whitelist." );
- wfForbidden();
-}
+// See if could create the title object
+if( !$title instanceof Title )
+ wfForbidden('img-auth-accessdenied','img-auth-badtitle',$name);
-if( !file_exists( $filename ) ) {
- wfDebugLog( 'img_auth', "`{$filename}` does not exist" );
- wfForbidden();
-}
-if( is_dir( $filename ) ) {
- wfDebugLog( 'img_auth', "`{$filename}` is a directory" );
- wfForbidden();
-}
+// Run hook
+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() )
+ wfForbidden('img-auth-accessdenied','img-auth-noread',$name);
// Stream the requested file
-wfDebugLog( 'img_auth', "Streaming `{$filename}`" );
+wfDebugLog( 'img_auth', "Streaming `".$filename."`." );
wfStreamFile( $filename, array( 'Cache-Control: private', 'Vary: Cookie' ) );
wfLogProfilingData();
/**
- * Issue a standard HTTP 403 Forbidden header and a basic
- * error message, then end the script
+ * 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
*/
-function wfForbidden() {
+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));
header( 'HTTP/1.0 403 Forbidden' );
- header( 'Vary: Cookie' );
+ header( 'Cache-Control: no-cache' );
header( 'Content-Type: text/html; charset=utf-8' );
echo <<<ENDS
<html>
<body>
-<h1>Access Denied</h1>
-<p>You need to log in to access files on this server.</p>
+<h1>$MsgHdr</h1>
+<p>$detailMsg</p>
</body>
</html>
ENDS;
wfLogProfilingData();
exit();
}
-
-/**
- * Show a 403 error for use when the wiki is public
- */
-function wfPublicError() {
- header( 'HTTP/1.0 403 Forbidden' );
- header( 'Content-Type: text/html; charset=utf-8' );
- echo <<<ENDS
-<html>
-<body>
-<h1>Access Denied</h1>
-<p>The function of img_auth.php is to output files from a private wiki. This wiki
-is configured as a public wiki. For optimal security, img_auth.php is disabled in
-this case.
-</p>
-</body>
-</html>
-ENDS;
- wfLogProfilingData();
- exit;
-}
-