X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=thumb.php;h=15fbf07392cec42e0f347e51bd466d6116de9051;hb=6670bf66dfa0a0ae6025c63e16094bb65a9ada38;hp=8fc868d415389128bee04d6f336faa692bf5cc94;hpb=8634014e86135d162595dd7d9f3a03a02f6fbb72;p=lhc%2Fweb%2Fwiklou.git

diff --git a/thumb.php b/thumb.php
index 8fc868d415..15fbf07392 100644
--- a/thumb.php
+++ b/thumb.php
@@ -38,6 +38,7 @@ if ( defined( 'THUMB_HANDLER' ) ) {
 	// Called directly, use $_REQUEST params
 	wfThumbHandleRequest();
 }
+
 wfLogProfilingData();
 
 //--------------------------------------------------------------------------
@@ -61,28 +62,21 @@ function wfThumbHandleRequest() {
  * @return void
  */
 function wfThumbHandle404() {
-	# lighttpd puts the original request in REQUEST_URI, while sjs sets
-	# that to the 404 handler, and puts the original request in REDIRECT_URL.
-	if ( isset( $_SERVER['REDIRECT_URL'] ) ) {
-		# The URL is un-encoded, so put it back how it was
-		$uriPath = str_replace( "%2F", "/", urlencode( $_SERVER['REDIRECT_URL'] ) );
-	} else {
-		$uriPath = $_SERVER['REQUEST_URI'];
-	}
-	# Just get the URI path (REDIRECT_URL/REQUEST_URI is either a full URL or a path)
-	if ( substr( $uriPath, 0, 1 ) !== '/' ) {
-		$bits = wfParseUrl( $uriPath );
-		if ( $bits && isset( $bits['path'] ) ) {
-			$uriPath = $bits['path'];
-		} else {
-			wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
-			return;
-		}
+	global $wgArticlePath;
+
+	# Set action base paths so that WebRequest::getPathInfo()
+	# recognizes the "X" as the 'title' in ../thumb_handler.php/X urls.
+	$wgArticlePath = false; # Don't let a "/*" article path clober our action path
+
+	$matches = WebRequest::getPathInfo();
+	if ( !isset( $matches['title'] ) ) {
+		wfThumbError( 404, 'Could not determine the name of the requested thumbnail.' );
+		return;
 	}
 
-	$params = wfExtractThumbParams( $uriPath ); // basic wiki URL param extracting
+	$params = wfExtractThumbParams( $matches['title'] ); // basic wiki URL param extracting
 	if ( $params == null ) {
-		wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
+		wfThumbError( 400, 'The specified thumbnail parameters are not recognized.' );
 		return;
 	}
 
@@ -96,6 +90,7 @@ function wfThumbHandle404() {
  * @return void
  */
 function wfStreamThumb( array $params ) {
+	global $wgVaryOnXFP;
 	wfProfileIn( __METHOD__ );
 
 	$headers = array(); // HTTP headers to send
@@ -125,7 +120,15 @@ function wfStreamThumb( array $params ) {
 	$fileName = strtr( $fileName, '\\/', '__' );
 
 	// Actually fetch the image. Method depends on whether it is archived or not.
-	if ( $isOld ) {
+	if ( $isTemp ) {
+		$repo = RepoGroup::singleton()->getLocalRepo()->getTempRepo();
+		$img = new UnregisteredLocalFile( null, $repo,
+			# Temp files are hashed based on the name without the timestamp.
+			# The thumbnails will be hashed based on the entire name however.
+			# @TODO: fix this convention to actually be reasonable.
+			$repo->getZonePath( 'public' ) . '/' . $repo->getTempHashPath( $fileName ) . $fileName
+		);
+	} elseif ( $isOld ) {
 		// Format is <timestamp>!<name>
 		$bits = explode( '!', $fileName, 2 );
 		if ( count( $bits ) != 2 ) {
@@ -140,25 +143,19 @@ function wfStreamThumb( array $params ) {
 			return;
 		}
 		$img = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $title, $fileName );
-	} elseif ( $isTemp ) {
-		$repo = RepoGroup::singleton()->getLocalRepo()->getTempRepo();
-		// Format is <timestamp>!<name> or just <name>
-		$bits = explode( '!', $fileName, 2 );
-		// Get the name without the timestamp so hash paths are correctly computed
-		$title = Title::makeTitleSafe( NS_FILE, isset( $bits[1] ) ? $bits[1] : $fileName );
-		if ( !$title ) {
-			wfThumbError( 404, wfMessage( 'badtitletext' )->text() );
-			wfProfileOut( __METHOD__ );
-			return;
-		}
-		$img = new UnregisteredLocalFile( $title, $repo,
-			$repo->getZonePath( 'public' ) . '/' . $repo->getTempHashPath( $fileName ) . $fileName
-		);
 	} else {
 		$img = wfLocalFile( $fileName );
 	}
 
+	// Check the source file title
+	if ( !$img ) {
+		wfThumbError( 404, wfMessage( 'badtitletext' )->text() );
+		wfProfileOut( __METHOD__ );
+		return;
+	}
+
 	// Check permissions if there are read restrictions
+	$varyHeader = array();
 	if ( !in_array( 'read', User::getGroupPermissions( array( '*' ) ), true ) ) {
 		if ( !$img->getTitle() || !$img->getTitle()->userCan( 'read' ) ) {
 			wfThumbError( 403, 'Access denied. You do not have permission to access ' .
@@ -167,15 +164,10 @@ function wfStreamThumb( array $params ) {
 			return;
 		}
 		$headers[] = 'Cache-Control: private';
-		$headers[] = 'Vary: Cookie';
+		$varyHeader[] = 'Cookie';
 	}
 
 	// Check the source file storage path
-	if ( !$img ) {
-		wfThumbError( 404, wfMessage( 'badtitletext' )->text() );
-		wfProfileOut( __METHOD__ );
-		return;
-	}
 	if ( !$img->exists() ) {
 		wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
 		wfProfileOut( __METHOD__ );
@@ -217,19 +209,40 @@ function wfStreamThumb( array $params ) {
 
 	// Stream the file if it exists already...
 	try {
+		$thumbName2 = $img->thumbName( $params, File::THUMB_FULL_NAME ); // b/c; "long" style
 		// For 404 handled thumbnails, we only use the the base name of the URI
 		// for the thumb params and the parent directory for the source file name.
 		// Check that the zone relative path matches up so squid caches won't pick
 		// up thumbs that would not be purged on source file deletion (bug 34231).
-		if ( isset( $params['rel404'] ) // thumbnail was handled via 404
-			&& urldecode( $params['rel404'] ) !== $img->getThumbRel( $thumbName ) )
-		{
-			wfThumbError( 404, 'The source file for the specified thumbnail does not exist.' );
-			wfProfileOut( __METHOD__ );
-			return;
+		if ( isset( $params['rel404'] ) ) { // thumbnail was handled via 404
+			if ( urldecode( $params['rel404'] ) === $img->getThumbRel( $thumbName ) ) {
+				// Request for the canonical thumbnail name
+			} elseif ( urldecode( $params['rel404'] ) === $img->getThumbRel( $thumbName2 ) ) {
+				// Request for the "long" thumbnail name; redirect to canonical name
+				$response = RequestContext::getMain()->getRequest()->response();
+				$response->header( "HTTP/1.1 301 " . HttpStatus::getMessage( 301 ) );
+				$response->header( 'Location: ' . wfExpandUrl( $img->getThumbUrl( $thumbName ), PROTO_CURRENT ) );
+				$response->header( 'Expires: ' .
+					gmdate( 'D, d M Y H:i:s', time() + 7*86400 ) . ' GMT' );
+				if ( $wgVaryOnXFP ) {
+					$varyHeader[] = 'X-Forwarded-Proto';
+				}
+				if ( count( $varyHeader ) ) {
+					$response->header( 'Vary: ' . implode( ', ', $varyHeader ) );
+				}
+				wfProfileOut( __METHOD__ );
+				return;
+			} else {
+				wfThumbError( 404, 'The given path of the specified thumbnail is incorrect.' );
+				wfProfileOut( __METHOD__ );
+				return;
+			}
 		}
 		$thumbPath = $img->getThumbPath( $thumbName );
 		if ( $img->getRepo()->fileExists( $thumbPath ) ) {
+			if ( count( $varyHeader ) ) {
+				$headers[] = 'Vary: ' . implode( ', ', $varyHeader );
+			}
 			$img->getRepo()->streamFile( $thumbPath, $headers );
 			wfProfileOut( __METHOD__ );
 			return;
@@ -240,6 +253,10 @@ function wfStreamThumb( array $params ) {
 		return;
 	}
 
+	if ( count( $varyHeader ) ) {
+		$headers[] = 'Vary: ' . implode( ', ', $varyHeader );
+	}
+
 	// Thumbnail isn't already there, so create the new thumbnail...
 	try {
 		$thumb = $img->transform( $params, File::RENDER_NOW );
@@ -276,57 +293,47 @@ function wfStreamThumb( array $params ) {
  * Extract the required params for thumb.php from the thumbnail request URI.
  * At least 'width' and 'f' should be set if the result is an array.
  *
- * @param $uriPath String Thumbnail request URI path
+ * @param $thumbRel String Thumbnail path relative to the thumb zone
  * @return Array|null associative params array or null
  */
-function wfExtractThumbParams( $uriPath ) {
+function wfExtractThumbParams( $thumbRel ) {
 	$repo = RepoGroup::singleton()->getLocalRepo();
 
-	$zoneUriPath = $repo->getZoneHandlerUrl( 'thumb' )
-		? $repo->getZoneHandlerUrl( 'thumb' ) // custom URL
-		: $repo->getZoneUrl( 'thumb' ); // default to main URL
-	// URL might be relative ("/images") or protocol-relative ("//lang.site/image")
-	$bits = wfParseUrl( wfExpandUrl( $zoneUriPath, PROTO_INTERNAL ) );
-	if ( $bits && isset( $bits['path'] ) ) {
-		$zoneUriPath = $bits['path'];
-	} else {
-		return null;
-	}
-
-	$hashDirRegex = $subdirRegex = '';
+	$hashDirReg = $subdirReg = '';
 	for ( $i = 0; $i < $repo->getHashLevels(); $i++ ) {
-		$subdirRegex .= '[0-9a-f]';
-		$hashDirRegex .= "$subdirRegex/";
+		$subdirReg .= '[0-9a-f]';
+		$hashDirReg .= "$subdirReg/";
 	}
 
-	$thumbPathRegex = "!^" . preg_quote( $zoneUriPath ) .
-		"/((archive/|temp/)?$hashDirRegex([^/]*)/([^/]*))$!";
-
-	// Check if this is a valid looking thumbnail request...
-	if ( preg_match( $thumbPathRegex, $uriPath, $matches ) ) {
-		list( /* all */, $rel, $archOrTemp, $filename, $thumbname ) = $matches;
-		$filename = urldecode( $filename );
-		$thumbname = urldecode( $thumbname );
+	// Check if this is a thumbnail of an original in the local file repo
+	if ( preg_match( "!^((archive/)?$hashDirReg([^/]*)/([^/]*))$!", $thumbRel, $m ) ) {
+		list( /*all*/, $rel, $archOrTemp, $filename, $thumbname ) = $m;
+	// Check if this is a thumbnail of an temp file in the local file repo
+	} elseif ( preg_match( "!^(temp/)($hashDirReg([^/]*)/([^/]*))$!", $thumbRel, $m ) ) {
+		list( /*all*/, $archOrTemp, $rel, $filename, $thumbname ) = $m;
+	} else {
+		return null; // not a valid looking thumbnail request
+	}
 
-		$params = array( 'f' => $filename, 'rel404' => $rel );
-		if ( $archOrTemp == 'archive/' ) {
-			$params['archived'] = 1;
-		} elseif ( $archOrTemp == 'temp/' ) {
-			$params['temp'] = 1;
-		}
+	$params = array( 'f' => $filename, 'rel404' => $rel );
+	if ( $archOrTemp === 'archive/' ) {
+		$params['archived'] = 1;
+	} elseif ( $archOrTemp === 'temp/' ) {
+		$params['temp'] = 1;
+	}
 
-		// Check if the parameters can be extracted from the thumbnail name...
-		if ( preg_match( '!^(page(\d*)-)*(\d*)px-[^/]*$!', $thumbname, $matches ) ) {
-			list( /* all */, $pagefull, $pagenum, $size ) = $matches;
-			$params['width'] = $size;
-			if ( $pagenum ) {
-				$params['page'] = $pagenum;
-			}
-			return $params; // valid thumbnail URL
-		// Hooks return false if they manage to *resolve* the parameters
-		} elseif ( !wfRunHooks( 'ExtractThumbParameters', array( $thumbname, &$params ) ) ) {
-			return $params; // valid thumbnail URL (via extension or config)
+	// Check hooks if parameters can be extracted
+	// Hooks return false if they manage to *resolve* the parameters
+	if ( !wfRunHooks( 'ExtractThumbParameters', array( $thumbname, &$params ) ) ) {
+		return $params; // valid thumbnail URL (via extension or config)
+	// Check if the parameters can be extracted from the thumbnail name...
+	} elseif ( preg_match( '!^(page(\d*)-)*(\d*)px-[^/]*$!', $thumbname, $matches ) ) {
+		list( /* all */, $pagefull, $pagenum, $size ) = $matches;
+		$params['width'] = $size;
+		if ( $pagenum ) {
+			$params['page'] = $pagenum;
 		}
+		return $params; // valid thumbnail URL
 	}
 
 	return null; // not a valid thumbnail URL