X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FTemplateParser.php;h=3de70fa2a21b34c197a9d0a7e03a04bb18b5cd64;hb=1996e35ec7d4f1453162d3f1bdf5991448d9e968;hp=a178fed4c34d827838fc29c4267e672a0c5141b0;hpb=5a00a506357223bd9569358458a7f588ee37ff1b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/TemplateParser.php b/includes/TemplateParser.php
index a178fed4c3..3de70fa2a2 100644
--- a/includes/TemplateParser.php
+++ b/includes/TemplateParser.php
@@ -49,9 +49,9 @@ class TemplateParser {
 	 * Constructs the location of the the source Mustache template
 	 * @param string $templateName The name of the template
 	 * @return string
-	 * @throws Exception Disallows upwards directory traversal via $templateName
+	 * @throws UnexpectedValueException Disallows upwards directory traversal via $templateName
 	 */
-	public function getTemplateFilename( $templateName ) {
+	protected function getTemplateFilename( $templateName ) {
 		// Prevent upwards directory traversal using same methods as Title::secureAndSplit
 		if (
 			strpos( $templateName, '.' ) !== false &&
@@ -65,7 +65,7 @@ class TemplateParser {
 				substr( $templateName, -3 ) === '/..'
 			)
 		) {
-			throw new Exception( "Malformed \$templateName: $templateName" );
+			throw new UnexpectedValueException( "Malformed \$templateName: $templateName" );
 		}
 
 		return "{$this->templateDir}/{$templateName}.mustache";
@@ -74,19 +74,19 @@ class TemplateParser {
 	/**
 	 * Returns a given template function if found, otherwise throws an exception.
 	 * @param string $templateName The name of the template (without file suffix)
-	 * @return Function
-	 * @throws Exception
+	 * @return callable
+	 * @throws RuntimeException
 	 */
-	public function getTemplate( $templateName ) {
+	protected function getTemplate( $templateName ) {
 		// If a renderer has already been defined for this template, reuse it
-		if ( isset( $this->renderers[$templateName] ) ) {
+		if ( isset( $this->renderers[$templateName] ) && is_callable( $this->renderers[$templateName] ) ) {
 			return $this->renderers[$templateName];
 		}
 
 		$filename = $this->getTemplateFilename( $templateName );
 
 		if ( !file_exists( $filename ) ) {
-			throw new Exception( "Could not locate template: {$filename}" );
+			throw new RuntimeException( "Could not locate template: {$filename}" );
 		}
 
 		// Read the template file
@@ -97,62 +97,75 @@ class TemplateParser {
 
 		// Fetch a secret key for building a keyed hash of the PHP code
 		$config = ConfigFactory::getDefaultInstance()->makeConfig( 'main' );
-		$secretKey = $config->get( 'SecretKey' ) ? : 'key';
-
-		// See if the compiled PHP code is stored in cache.
-		// CACHE_ACCEL throws an exception if no suitable object cache is present, so fall
-		// back to CACHE_ANYTHING.
-		try {
-			$cache = wfGetCache( CACHE_ACCEL );
-		} catch ( Exception $e ) {
-			$cache = wfGetCache( CACHE_ANYTHING );
-		}
-		$key = wfMemcKey( 'template', $templateName, $fastHash );
-		$code = $this->forceRecompile ? null : $cache->get( $key );
+		$secretKey = $config->get( 'SecretKey' );
 
-		if ( !$code ) {
-			// Compile the template into PHP code
-			$code = self::compile( $fileContents );
+		if ( $secretKey ) {
+			// See if the compiled PHP code is stored in cache.
+			// CACHE_ACCEL throws an exception if no suitable object cache is present, so fall
+			// back to CACHE_ANYTHING.
+			$cache = ObjectCache::newAccelerator( array(), CACHE_ANYTHING );
+			$key = wfMemcKey( 'template', $templateName, $fastHash );
+			$code = $this->forceRecompile ? null : $cache->get( $key );
 
 			if ( !$code ) {
-				throw new Exception( "Could not compile template: {$filename}" );
-			}
+				$code = $this->compileForEval( $fileContents, $filename );
 
-			// Strip the "<?php" added by lightncandy so that it can be eval()ed
-			if ( substr( $code, 0, 5 ) === '<?php' ) {
-				$code = substr( $code, 5 );
+				// Prefix the cached code with a keyed hash (64 hex chars) as an integrity check
+				$cache->set( $key, hash_hmac( 'sha256', $code, $secretKey ) . $code );
+			} else {
+				// Verify the integrity of the cached PHP code
+				$keyedHash = substr( $code, 0, 64 );
+				$code = substr( $code, 64 );
+				if ( $keyedHash !== hash_hmac( 'sha256', $code, $secretKey ) ) {
+					// Generate a notice if integrity check fails
+					trigger_error( "Template failed integrity check: {$filename}" );
+				}
 			}
+		// If there is no secret key available, don't use cache
+		} else {
+			$code = $this->compileForEval( $fileContents, $filename );
+		}
+
+		$renderer = eval( $code );
+		if ( !is_callable( $renderer ) ) {
+			throw new RuntimeException( "Requested template, {$templateName}, is not callable" );
+		}
+		return $this->renderers[$templateName] = $renderer;
+	}
 
-			$renderer = eval( $code );
+	/**
+	 * Wrapper for compile() function that verifies successful compilation and strips
+	 * out the '<?php' part so that the code is ready for eval()
+	 * @param string $fileContents Mustache code
+	 * @param string $filename Name of the template
+	 * @return string PHP code (without '<?php')
+	 * @throws RuntimeException
+	 */
+	protected function compileForEval( $fileContents, $filename ) {
+		// Compile the template into PHP code
+		$code = $this->compile( $fileContents );
 
-			// Prefix the code with a keyed hash (64 hex chars) as an integrity check
-			$code = hash_hmac( 'sha256', $code, $secretKey ) . $code;
+		if ( !$code ) {
+			throw new RuntimeException( "Could not compile template: {$filename}" );
+		}
 
-			// Cache the compiled PHP code
-			$cache->set( $key, $code );
-		} else {
-			// Verify the integrity of the cached PHP code
-			$keyedHash = substr( $code, 0, 64 );
-			$code = substr( $code, 64 );
-			if ( $keyedHash === hash_hmac( 'sha256', $code, $secretKey ) ) {
-				$renderer = eval( $code );
-			} else {
-				throw new Exception( "Template failed integrity check: {$filename}" );
-			}
+		// Strip the "<?php" added by lightncandy so that it can be eval()ed
+		if ( substr( $code, 0, 5 ) === '<?php' ) {
+			$code = substr( $code, 5 );
 		}
 
-		return $this->renderers[$templateName] = $renderer;
+		return $code;
 	}
 
 	/**
 	 * Compile the Mustache code into PHP code using LightnCandy
 	 * @param string $code Mustache code
-	 * @return string PHP code
-	 * @throws Exception
+	 * @return string PHP code (with '<?php')
+	 * @throws RuntimeException
 	 */
-	public static function compile( $code ) {
+	protected function compile( $code ) {
 		if ( !class_exists( 'LightnCandy' ) ) {
-			throw new Exception( 'LightnCandy class not defined' );
+			throw new RuntimeException( 'LightnCandy class not defined' );
 		}
 		return LightnCandy::compile(
 			$code,