X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=thumb.php;h=88aecbdbf9ed7643043174f36f4ecb3d12202d32;hb=f44914d3dae944c9513bb1f4255f35169d6ac715;hp=35ab9f27e622ba6499ae2dfc2ecd9d19ce96909f;hpb=de91bb1e56e99dda4d158d42e94dc37f0a1bcc13;p=lhc%2Fweb%2Fwiklou.git

diff --git a/thumb.php b/thumb.php
index 35ab9f27e6..88aecbdbf9 100644
--- a/thumb.php
+++ b/thumb.php
@@ -180,7 +180,6 @@ function wfStreamThumb( array $params ) {
 		return;
 	}
 
-
 	// Check the source file storage path
 	if ( !$img->exists() ) {
 		$redirectedLocation = false;
@@ -247,7 +246,6 @@ function wfStreamThumb( array $params ) {
 	unset( $params['r'] ); // ignore 'r' because we unconditionally pass File::RENDER
 	unset( $params['f'] ); // We're done with 'f' parameter.
 
-
 	// Get the normalized thumbnail name from the parameters...
 	try {
 		$thumbName = $img->thumbName( $params );
@@ -309,6 +307,9 @@ function wfStreamThumb( array $params ) {
 	if ( $user->pingLimiter( 'renderfile' ) ) {
 		wfThumbError( 500, wfMessage( 'actionthrottledtext' ) );
 		return;
+	} elseif ( wfThumbIsAttemptThrottled( $img, $thumbName, 5 ) ) {
+		wfThumbError( 500, wfMessage( 'thumbnail_image-failure-limit', 5 ) );
+		return;
 	}
 
 	// Thumbnail isn't already there, so create the new thumbnail...
@@ -334,6 +335,7 @@ function wfStreamThumb( array $params ) {
 	}
 
 	if ( $errorMsg !== false ) {
+		wfThumbIncrAttemptFailures( $img, $thumbName );
 		wfThumbError( 500, $errorMsg );
 	} else {
 		// Stream the file if there were no errors
@@ -341,6 +343,45 @@ function wfStreamThumb( array $params ) {
 	}
 }
 
+/**
+ * @param File $img
+ * @param string $thumbName
+ * @param int $limit
+ * @return int|bool
+ */
+function wfThumbIsAttemptThrottled( File $img, $thumbName, $limit ) {
+	global $wgMemc;
+
+	return ( $wgMemc->get( wfThumbAttemptKey( $img, $thumbName ) ) >= $limit );
+}
+
+/**
+ * @param File $img
+ * @param string $thumbName
+ */
+function wfThumbIncrAttemptFailures( File $img, $thumbName ) {
+	global $wgMemc;
+
+	$key = wfThumbAttemptKey( $img, $thumbName );
+	if ( !$wgMemc->incr( $key, 1 ) ) {
+		if ( !$wgMemc->add( $key, 1, 3600 ) ) {
+			$wgMemc->incr( $key, 1 );
+		}
+	}
+}
+
+/**
+ * @param File $img
+ * @param string $thumbName
+ * @return string
+ */
+function wfThumbAttemptKey( File $img, $thumbName ) {
+	global $wgAttemptFailureEpoch;
+
+	return wfMemcKey( 'attempt-failures', $wgAttemptFailureEpoch,
+		$img->getRepo()->getName(), md5( $img->getName() ), md5( $thumbName ) );
+}
+
 /**
  * Convert pathinfo type parameter, into normal request parameters
  *