X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=img_auth.php;h=24bda422a0d3426e6134963844cc1bf2ec8a3de2;hb=2d92044bb7e31646bbd8432ed7440b211ec707c1;hp=4ec68ea44b0683809f319c26c7733e4aa8434a86;hpb=53856406a6bf2dc9fe01fdd3a47f2e428abb0671;p=lhc%2Fweb%2Fwiklou.git

diff --git a/img_auth.php b/img_auth.php
index 4ec68ea44b..24bda422a0 100644
--- a/img_auth.php
+++ b/img_auth.php
@@ -1,187 +1,63 @@
 <?php
-# Image download authorisation script
-# To use, in LocalSettings.php set $wgUploadDirectory to point to a non-public directory, and
-# $wgUploadPath to point to this file. Also set $wgWhitelistRead to an array of pages you want
-# everyone to be able to access. Your server must support PATH_INFO, CGI-based configurations
-# generally don't. 
-
-# Valid web server entry point, enable includes
-define( "MEDIAWIKI", true );
-
-require_once( "includes/Defines.php" );
-require_once( "./LocalSettings.php" );
-require_once( "includes/Setup.php" );
+/**
+ * Image download authorisation script
+ *
+ * To use, in LocalSettings.php set $wgUploadDirectory to point to a non-public
+ * directory, and $wgUploadPath to point to this file. Also set $wgWhitelistRead
+ * to an array of pages you want everyone to be able to access. Your server must
+ * support PATH_INFO, CGI-based configurations generally don't.
+ */
+define( 'MW_NO_OUTPUT_COMPRESSION', 1 );
+require_once( './includes/WebStart.php' );
+wfProfileIn( 'img_auth.php' );
+require_once( './includes/StreamFile.php' );
 
 if( !isset( $_SERVER['PATH_INFO'] ) ) {
+	wfDebugLog( 'img_auth', "missing PATH_INFO" );
 	wfForbidden();
 }
 
 # Get filenames/directories
+wfDebugLog( 'img_auth', "PATH_INFO is: " . $_SERVER['PATH_INFO'] );
 $filename = realpath( $wgUploadDirectory . $_SERVER['PATH_INFO'] );
 $realUploadDirectory = realpath( $wgUploadDirectory );
-$imageName = $wgLang->getNsText( NS_IMAGE ) . ":" . basename( $_SERVER['PATH_INFO'] );
+$imageName = $wgContLang->getNsText( NS_IMAGE ) . ":" . wfBaseName( $_SERVER['PATH_INFO'] );
 
 # 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();
 }
 
 if ( is_array( $wgWhitelistRead ) && !in_array( $imageName, $wgWhitelistRead ) && !$wgUser->getID() ) {
+	wfDebugLog( 'img_auth', "not logged in and requested file not in whitelist: $imageName" );
 	wfForbidden();
 }
 
 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();
 }
 
 # Write file
-$type = wfGetType( $filename );
-if ( $type ) {
-	header("Content-type: $type");
-} else {
-	header("Content-type: application/x-wiki");
-}
-
-readfile( $filename );
-
-function wfGetType( $filename ) {
-	# There's probably a better way to do this
-	$types = <<<END_STRING
-application/andrew-inset ez
-application/mac-binhex40 hqx
-application/mac-compactpro cpt
-application/mathml+xml mathml
-application/msword doc
-application/octet-stream bin dms lha lzh exe class so dll
-application/oda oda
-application/ogg ogg
-application/pdf pdf
-application/postscript ai eps ps
-application/rdf+xml rdf
-application/smil smi smil
-application/srgs gram
-application/srgs+xml grxml
-application/vnd.mif mif
-application/vnd.ms-excel xls
-application/vnd.ms-powerpoint ppt
-application/vnd.wap.wbxml wbxml
-application/vnd.wap.wmlc wmlc
-application/vnd.wap.wmlscriptc wmlsc
-application/voicexml+xml vxml
-application/x-bcpio bcpio
-application/x-cdlink vcd
-application/x-chess-pgn pgn
-application/x-cpio cpio
-application/x-csh csh
-application/x-director dcr dir dxr
-application/x-dvi dvi
-application/x-futuresplash spl
-application/x-gtar gtar
-application/x-hdf hdf
-application/x-javascript js
-application/x-koan skp skd skt skm
-application/x-latex latex
-application/x-netcdf nc cdf
-application/x-sh sh
-application/x-shar shar
-application/x-shockwave-flash swf
-application/x-stuffit sit
-application/x-sv4cpio sv4cpio
-application/x-sv4crc sv4crc
-application/x-tar tar
-application/x-tcl tcl
-application/x-tex tex
-application/x-texinfo texinfo texi
-application/x-troff t tr roff
-application/x-troff-man man
-application/x-troff-me me
-application/x-troff-ms ms
-application/x-ustar ustar
-application/x-wais-source src
-application/xhtml+xml xhtml xht
-application/xslt+xml xslt
-application/xml xml xsl
-application/xml-dtd dtd
-application/zip zip
-audio/basic au snd
-audio/midi mid midi kar
-audio/mpeg mpga mp2 mp3
-audio/x-aiff aif aiff aifc
-audio/x-mpegurl m3u
-audio/x-pn-realaudio ram rm
-audio/x-pn-realaudio-plugin rpm
-audio/x-realaudio ra
-audio/x-wav wav
-chemical/x-pdb pdb
-chemical/x-xyz xyz
-image/bmp bmp
-image/cgm cgm
-image/gif gif
-image/ief ief
-image/jpeg jpeg jpg jpe
-image/png png
-image/svg+xml svg
-image/tiff tiff tif
-image/vnd.djvu djvu djv
-image/vnd.wap.wbmp wbmp
-image/x-cmu-raster ras
-image/x-icon ico
-image/x-portable-anymap pnm
-image/x-portable-bitmap pbm
-image/x-portable-graymap pgm
-image/x-portable-pixmap ppm
-image/x-rgb rgb
-image/x-xbitmap xbm
-image/x-xpixmap xpm
-image/x-xwindowdump xwd
-model/iges igs iges
-model/mesh msh mesh silo
-model/vrml wrl vrml
-text/calendar ics ifb
-text/css css
-text/richtext rtx
-text/rtf rtf
-text/sgml sgml sgm
-text/tab-separated-values tsv
-text/vnd.wap.wml wml
-text/vnd.wap.wmlscript wmls
-text/x-setext etx
-video/mpeg mpeg mpg mpe
-video/quicktime qt mov
-video/vnd.mpegurl mxu
-video/x-msvideo avi
-video/x-sgi-movie movie
-x-conference/x-cooltalk ice";
-END_STRING;
-	$endl = "
-";
-	$types = explode( $endl, $types );
-	if ( !preg_match( "/\.([^.]*?)$/", $filename, $matches ) ) {
-		return false;
-	}
-
-	foreach( $types as $type ) {
-		$extensions = explode( " ", $type );
-		for ( $i=1; $i<count( $extensions ); $i++ ) {
-			if ( $extensions[$i] == $matches[1] ) {
-				return $extensions[0];
-			}
-		}
-	}
-	return false;
-}
+wfDebugLog( 'img_auth', "streaming file: $filename" );
+wfStreamFile( $filename );
+wfLogProfilingData();
 
 function wfForbidden() {
-	header( "HTTP/1.0 403 Forbidden" );
-	print 
+	header( 'HTTP/1.0 403 Forbidden' );
+	header( 'Content-Type: text/html; charset=utf-8' );
+	print
 "<html><body>
 <h1>Access denied</h1>
 <p>You need to log in to access files on this server</p>
 </body></html>";
+	wfLogProfilingData();
 	exit;
 }
 
-?>
+