From: Ian Baker <raindrift@users.mediawiki.org>
Date: Fri, 15 Jul 2011 18:33:31 +0000 (+0000)
Subject: No longer using the content hash as a file key.  This solves a concurrency problem... 
X-Git-Tag: 1.31.0-rc.0~28813
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=1a526e0a9f9781d998e5484777e184c7c801d8dc;p=lhc%2Fweb%2Fwiklou.git

No longer using the content hash as a file key.  This solves a concurrency problem when multiple people use the same account to upload from the same set of files.  Each stashed file is now a unique and beautiful snowflake, and the content-based deduping that comes at the end of the process can sort it out.
---

diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index 6b6dfff5f9..fc02132dc5 100644
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -17,7 +17,7 @@
 class UploadStash {
 
 	// Format of the key for files -- has to be suitable as a filename itself (e.g. ab12cd34ef.jpg)
-	const KEY_FORMAT_REGEX = '/^[\w-]+\.\w*$/';
+	const KEY_FORMAT_REGEX = '/^[\w-\.]+\.\w*$/';
 
 	// When a given stashed file can't be loaded, wait for the slaves to catch up.  If they're more than MAX_LAG
 	// behind, throw an exception instead. (at what point is broken better than slow?)
@@ -184,7 +184,6 @@ class UploadStash {
 			throw new UploadStashBadPathException( "path doesn't exist" );
 		}
 		$fileProps = File::getPropsFromPath( $path );
-
 		wfDebug( __METHOD__ . " stashing file at '$path'\n" );
 
 		// we will be initializing from some tmpnam files that don't have extensions.
@@ -198,10 +197,17 @@ class UploadStash {
 			$path = $pathWithGoodExtension;
 		}
 
-		// If no key was supplied, use content hash. Also has the nice property of collapsing multiple identical files
-		// uploaded this session, which could happen if uploads had failed.
+		// If no key was supplied, make one.  a mysql insertid would be totally reasonable here, except
+		// that some users of this function might expect to supply the key instead of using the generated one.
 		if ( is_null( $key ) ) {
-			$key = $fileProps['sha1'] . "." . $extension;
+			// some things that when combined will make a suitably unique key.
+			// see: http://www.jwz.org/doc/mid.html
+			list ($usec, $sec) = explode( ' ', microtime() );
+			$usec = substr($usec, 2);
+			$key = wfBaseConvert( $sec . $usec, 10, 36 ) . '.' .
+				wfBaseConvert( mt_rand(), 10, 36 ) . '.'.
+				$this->userId . '.' . 
+				$extension;
 		}
 
 		$this->fileProps[$key] = $fileProps;