X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Ffilebackend%2FFileBackendStore.php;h=e4b07b85e1b13f0e9e078a44d6da2a6f439c07cd;hb=d85d5a3755bf022c615e815557f9b1ddac47dda8;hp=9f147f0efd179f2d97cfcd9974b4c2f477d6546d;hpb=35073a9d890214f841124efff88efaf37ed3fff2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/filebackend/FileBackendStore.php b/includes/filebackend/FileBackendStore.php
index 9f147f0efd..e4b07b85e1 100644
--- a/includes/filebackend/FileBackendStore.php
+++ b/includes/filebackend/FileBackendStore.php
@@ -377,9 +377,9 @@ abstract class FileBackendStore extends FileBackend {
 		unset( $params['latest'] ); // sanity
 
 		// Check that the specified temp file is valid...
-		wfSuppressWarnings();
+		MediaWiki\suppressWarnings();
 		$ok = ( is_file( $tmpPath ) && filesize( $tmpPath ) == 0 );
-		wfRestoreWarnings();
+		MediaWiki\restoreWarnings();
 		if ( !$ok ) { // not present or not empty
 			$status->fatal( 'backend-fail-opentemp', $tmpPath );
 
@@ -694,9 +694,9 @@ abstract class FileBackendStore extends FileBackend {
 	protected function doGetFileContentsMulti( array $params ) {
 		$contents = array();
 		foreach ( $this->doGetLocalReferenceMulti( $params ) as $path => $fsFile ) {
-			wfSuppressWarnings();
+			MediaWiki\suppressWarnings();
 			$contents[$path] = $fsFile ? file_get_contents( $fsFile->getPath() ) : false;
-			wfRestoreWarnings();
+			MediaWiki\restoreWarnings();
 		}
 
 		return $contents;
@@ -1364,19 +1364,38 @@ abstract class FileBackendStore extends FileBackend {
 	abstract protected function directoriesAreVirtual();
 
 	/**
-	 * Check if a container name is valid.
+	 * Check if a short container name is valid
+	 *
+	 * This checks for length and illegal characters.
+	 * This may disallow certain characters that can appear
+	 * in the prefix used to make the full container name.
+	 *
+	 * @param string $container
+	 * @return bool
+	 */
+	final protected static function isValidShortContainerName( $container ) {
+		// Suffixes like '.xxx' (hex shard chars) or '.seg' (file segments)
+		// might be used by subclasses. Reserve the dot character for sanity.
+		// The only way dots end up in containers (e.g. resolveStoragePath)
+		// is due to the wikiId container prefix or the above suffixes.
+		return self::isValidContainerName( $container ) && !preg_match( '/[.]/', $container );
+	}
+
+	/**
+	 * Check if a full container name is valid
+	 *
 	 * This checks for length and illegal characters.
+	 * Limiting the characters makes migrations to other stores easier.
 	 *
 	 * @param string $container
 	 * @return bool
 	 */
 	final protected static function isValidContainerName( $container ) {
-		// This accounts for Swift and S3 restrictions while leaving room
-		// for things like '.xxx' (hex shard chars) or '.seg' (segments).
-		// This disallows directory separators or traversal characters.
+		// This accounts for NTFS, Swift, and Ceph restrictions
+		// and disallows directory separators or traversal characters.
 		// Note that matching strings URL encode to the same string;
-		// in Swift, the length restriction is *after* URL encoding.
-		return preg_match( '/^[a-z0-9][a-z0-9-_]{0,199}$/i', $container );
+		// in Swift/Ceph, the length restriction is *after* URL encoding.
+		return (bool)preg_match( '/^[a-z0-9][a-z0-9-_.]{0,199}$/i', $container );
 	}
 
 	/**
@@ -1393,17 +1412,17 @@ abstract class FileBackendStore extends FileBackend {
 	 * @return array (container, path, container suffix) or (null, null, null) if invalid
 	 */
 	final protected function resolveStoragePath( $storagePath ) {
-		list( $backend, $container, $relPath ) = self::splitStoragePath( $storagePath );
+		list( $backend, $shortCont, $relPath ) = self::splitStoragePath( $storagePath );
 		if ( $backend === $this->name ) { // must be for this backend
 			$relPath = self::normalizeContainerPath( $relPath );
-			if ( $relPath !== null ) {
+			if ( $relPath !== null && self::isValidShortContainerName( $shortCont ) ) {
 				// Get shard for the normalized path if this container is sharded
-				$cShard = $this->getContainerShard( $container, $relPath );
+				$cShard = $this->getContainerShard( $shortCont, $relPath );
 				// Validate and sanitize the relative path (backend-specific)
-				$relPath = $this->resolveContainerPath( $container, $relPath );
+				$relPath = $this->resolveContainerPath( $shortCont, $relPath );
 				if ( $relPath !== null ) {
 					// Prepend any wiki ID prefix to the container name
-					$container = $this->fullContainerName( $container );
+					$container = $this->fullContainerName( $shortCont );
 					if ( self::isValidContainerName( $container ) ) {
 						// Validate and sanitize the container name (backend-specific)
 						$container = $this->resolveContainerName( "{$container}{$cShard}" );