return;
}
- list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath );
+ $thumbProxyUrl = $img->getRepo()->getThumbProxyUrl();
+
+ if ( strlen( $thumbProxyUrl ) ) {
+ wfProxyThumbnailRequest( $img, $thumbName );
+ // No local fallback when in proxy mode
+ return;
+ } else {
+ // Generate the thumbnail locally
+ list( $thumb, $errorMsg ) = wfGenerateThumbnail( $img, $params, $thumbName, $thumbPath );
+ }
/** @var MediaTransformOutput|MediaTransformError|bool $thumb */
}
}
+/**
+ * Proxies thumbnail request to a service that handles thumbnailing
+ *
+ * @param File $img
+ * @param string $thumbName
+ */
+function wfProxyThumbnailRequest( $img, $thumbName ) {
+ $thumbProxyUrl = $img->getRepo()->getThumbProxyUrl();
+
+ // Instead of generating the thumbnail ourselves, we proxy the request to another service
+ $thumbProxiedUrl = $thumbProxyUrl . $img->getThumbRel( $thumbName );
+
+ $req = MWHttpRequest::factory( $thumbProxiedUrl );
+ $secret = $img->getRepo()->getThumbProxySecret();
+
+ // Pass a secret key shared with the proxied service if any
+ if ( strlen( $secret ) ) {
+ $req->setHeader( 'X-Swift-Secret', $secret );
+ }
+
+ // Send request to proxied service
+ $status = $req->execute();
+
+ // Simply serve the response from the proxied service as-is
+ header( 'HTTP/1.1 ' . $req->getStatus() );
+
+ $headers = $req->getResponseHeaders();
+
+ foreach ( $headers as $key => $values ) {
+ foreach ( $values as $value ) {
+ header( $key . ': ' . $value, false );
+ }
+ }
+
+ echo $req->getContent();
+}
+
/**
* Actually try to generate a new thumbnail
*
$thumbname = $params['thumbName'];
unset( $params['thumbName'] );
- // Do the hook first for older extensions that rely on it.
- if ( !Hooks::run( 'ExtractThumbParameters', [ $thumbname, &$params ] ) ) {
- // Check hooks if parameters can be extracted
- // Hooks return false if they manage to *resolve* the parameters
- // This hook should be considered deprecated
- wfDeprecated( 'ExtractThumbParameters', '1.22' );
- return $params; // valid thumbnail URL (via extension or config)
- }
-
// FIXME: Files in the temp zone don't set a MIME type, which means
// they don't have a handler. Which means we can't parse the param
// string. However, not a big issue as what good is a param string
* @return void
*/
function wfThumbErrorText( $status, $msgText ) {
- wfThumbError( $status, htmlspecialchars( $msgText ) );
+ wfThumbError( $status, htmlspecialchars( $msgText, ENT_NOQUOTES ) );
}
/**
if ( $wgShowHostnames ) {
header( 'X-MW-Thumbnail-Renderer: ' . wfHostname() );
$url = htmlspecialchars(
- isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : ''
+ isset( $_SERVER['REQUEST_URI'] ) ? $_SERVER['REQUEST_URI'] : '',
+ ENT_NOQUOTES
);
- $hostname = htmlspecialchars( wfHostname() );
+ $hostname = htmlspecialchars( wfHostname(), ENT_NOQUOTES );
$debug = "<!-- $url -->\n<!-- $hostname -->\n";
} else {
$debug = '';