Bad request

From a75ac8b0af489c0ee338a5d6a58e228e0ec16246 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 24 Oct 2011 03:08:45 +0000 Subject: [PATCH] FU r100535: * Changed custom functions to work via a $thgThumbCallbacks variable * Added 'checkCache' and 'fillCache' hooks to $thgThumbCallbacks * Minor regex cleanup to wfExtractThumbParams() * Re-organized a bit of the wfStreamThumbViaCurl() code --- thumb-handler.php | 68 ++++++++++++++++++++++++++++++--------------- thumb.config.sample | 3 ++ 2 files changed, 48 insertions(+), 23 deletions(-) diff --git a/thumb-handler.php b/thumb-handler.php index 2d9fd420c5..8f3864d1ff 100644 --- a/thumb-handler.php +++ b/thumb-handler.php @@ -12,7 +12,7 @@ if ( !file_exists( $configPath ) ) { require( $configPath ); function wfHandleThumb404() { - global $thgThumb404File; + global $thgThumbCallbacks, $thgThumb404File; # lighttpd puts the original request in REQUEST_URI, while # sjs sets that to the 404 handler, and puts the original @@ -24,9 +24,12 @@ function wfHandleThumb404() { $uri = $_SERVER['REQUEST_URI']; } - # Extract thumb.php params from the URI. - if ( function_exists( 'wfCustomExtractThumbParams' ) ) { - $params = wfCustomExtractThumbParams( $uri ); // overridden by configuration + # Extract thumb.php params from the URI... + if ( isset( $thgThumbCallbacks['extractParams'] ) + && is_callable( $thgThumbCallbacks['extractParams'] ) ) + { + # Overridden by configuration + $params = call_user_func_array( $thgThumbCallbacks['extractParams'], array( $uri ) ); } else { $params = wfExtractThumbParams( $uri ); // basic wiki URL param extracting } @@ -40,7 +43,7 @@ function wfHandleThumb404() { if ( preg_match( '/[\x80-\xff]/', $uri ) ) { header( 'HTTP/1.0 400 Bad request' ); header( 'Content-Type: text/html' ); - echo "Bad request" . + print "Bad request" . "The URI contained bytes with the high bit set, this is not allowed." . ""; return; @@ -48,12 +51,21 @@ function wfHandleThumb404() { header( 'HTTP/1.0 404 Not found' ); header( 'Content-Type: text/html' ); header( 'X-Debug: filename contains a space' ); // useful for debugging - echo "Not found" . + print "Not found" . "The URL contained spaces, we don't have any thumbnail files with spaces." . ""; return; } + # Check any backend caches for the thumbnail... + if ( isset( $thgThumbCallbacks['checkCache'] ) + && is_callable( $thgThumbCallbacks['checkCache'] ) ) + { + if ( call_user_func_array( $thgThumbCallbacks['checkCache'], array( $uri, $params ) ) ) { + return; // file streamed from backend thumb cache + } + } + wfStreamThumbViaCurl( $params, $uri ); } @@ -69,11 +81,11 @@ function wfExtractThumbParams( $uri ) { $thumbRegex = '!^(?:' . preg_quote( $thgThumbServer ) . ')?/' . preg_quote( $thgThumbFragment ) . '(/archive|/temp|)/' . - $thgThumbHashFragment . '([^/]*)/' . '(page(\d*)-)*(\d*)px-([^/]*)$!'; + $thgThumbHashFragment . '([^/]*)/(page(\d*)-)*(\d*)px-[^/]*$!'; # Is this a thumbnail? if ( preg_match( $thumbRegex, $uri, $matches ) ) { - list( $all, $archOrTemp, $filename, $pagefull, $pagenum, $size, $fn2 ) = $matches; + list( $all, $archOrTemp, $filename, $pagefull, $pagenum, $size ) = $matches; $params = array( 'f' => $filename, 'width' => $size ); if ( $pagenum ) { $params['page'] = $pagenum; @@ -98,13 +110,13 @@ function wfExtractThumbParams( $uri ) { * @return void */ function wfStreamThumbViaCurl( array $params, $uri ) { - global $thgThumbScriptPath, $thgThumbCurlProxy, $thgThumbCurlTimeout; + global $thgThumbCallbacks, $thgThumbScriptPath, $thgThumbCurlProxy, $thgThumbCurlTimeout; if ( !function_exists( 'curl_init' ) ) { header( 'HTTP/1.0 404 Not found' ); header( 'Content-Type: text/html' ); header( 'X-Debug: cURL is not enabled' ); // useful for debugging - echo "Not found" . + print "Not found" . "cURL is not enabled for PHP on this wiki. Unable to send request thumb.php." . ""; return; @@ -119,24 +131,22 @@ function wfStreamThumbViaCurl( array $params, $uri ) { } else { $reqURL .= '&'; } - // Note: value is already urlencoded - $reqURL .= "$name=$value"; - } - - $ch = curl_init( $reqURL ); - if ( $thgThumbCurlProxy ) { - curl_setopt( $ch, CURLOPT_PROXY, $thgThumbCurlProxy ); + $reqURL .= "$name=$value"; // Note: value is already urlencoded } - $headers = array(); // HTTP headers - # Set certain headers... + # Set relevant HTTP headers... + $headers = array(); $headers[] = "X-Original-URI: " . str_replace( "\n", '', $uri ); - if ( function_exists( 'wfCustomThumbRequestHeaders' ) ) { - wfCustomThumbRequestHeaders( $headers ); // add on any custom headers (like XFF) + if ( isset( $thgThumbCallbacks['curlHeaders'] ) + && is_callable( $thgThumbCallbacks['curlHeaders'] ) ) + { + # Add on any custom headers (like XFF) + call_user_func_array( $thgThumbCallbacks['curlHeaders'], array( &$headers ) ); } + # Pass through some other headers... - $passthrough = array( 'If-Modified-Since', 'Referer', 'User-Agent' ); - foreach ( $passthrough as $headerName ) { + $passThrough = array( 'If-Modified-Since', 'Referer', 'User-Agent' ); + foreach ( $passThrough as $headerName ) { $serverVarName = 'HTTP_' . str_replace( '-', '_', strtoupper( $headerName ) ); if ( !empty( $_SERVER[$serverVarName] ) ) { $headers[] = $headerName . ': ' . @@ -144,6 +154,11 @@ function wfStreamThumbViaCurl( array $params, $uri ) { } } + $ch = curl_init( $reqURL ); + if ( $thgThumbCurlProxy ) { + curl_setopt( $ch, CURLOPT_PROXY, $thgThumbCurlProxy ); + } + curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers ); curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true ); curl_setopt( $ch, CURLOPT_TIMEOUT, $thgThumbCurlTimeout ); @@ -177,6 +192,13 @@ function wfStreamThumbViaCurl( array $params, $uri ) { # Error message, suppress cache header( 'HTTP/1.1 500 Internal server error' ); header( 'Cache-Control: no-cache' ); + } else { + # OK thumbnail; save to any backend caches... + if ( isset( $thgThumbCallbacks['fillCache'] ) + && is_callable( $thgThumbCallbacks['fillCache'] ) ) + { + call_user_func_array( $thgThumbCallbacks['fillCache'], array( $uri, $text ) ); + } } if ( !$contentType ) { diff --git a/thumb.config.sample b/thumb.config.sample index 05df568966..ee4a6afc84 100644 --- a/thumb.config.sample +++ b/thumb.config.sample @@ -37,3 +37,6 @@ $thgThumbCurlProxy = null; // proxy to thumb.php # File path to a php file the gives a 404 error message $thgThumb404File = "404.php"; + +# Custom functions for overriding aspects of thumb handling +$thgThumbCallbacks = array(); -- 2.20.1