fix broken extension, make pathinfo handle .tar.(gz|bz2)

owncloud · Sep 29, 2016 · ba40861 · ba40861
1 parent 071e2eb
commit ba40861
Show file tree

Hide file tree

Showing 12 changed files with 214 additions and 37 deletions.
diff --git a/apps/files_external/lib/Lib/Storage/SMB.php b/apps/files_external/lib/Lib/Storage/SMB.php
@@ -408,7 +408,8 @@ public function fopen($path, $mode) {
 						if (!$this->isCreatable(dirname($path))) {
 							break;
 						}
-						$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
+						$ext = \OCP\Files::pathinfo($path, PATHINFO_EXTENSION);
+						$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
 					}
 					$source = fopen($tmpFile, $mode);
 					$share = $this->share;
@@ -512,18 +513,9 @@ public function filetype($path) {
 	public function mkdir($path) {
 		$this->log('enter: '.__FUNCTION__."($path)");
 		$result = false;
-		$dirs = explode('/', $path);
-		$currDir = '';
+		$path = $this->buildPath($path);
 		try {
-			foreach ($dirs as $dir) {
-				$currDir .= '/'.$dir;
-				try {
-					$path = $this->buildPath($currDir);
-					$result = $this->share->mkdir($path);
-				} catch (AlreadyExistsException $e) {
-					$this->swallow(__FUNCTION__, $e);
-				}
-			}
+			$result = $this->share->mkdir($path);
 		} catch (ConnectException $e) {
 			$ex = new StorageNotAvailableException(
 				$e->getMessage(), $e->getCode(), $e);

diff --git a/apps/files_sharing/lib/Helper.php b/apps/files_sharing/lib/Helper.php
@@ -262,7 +262,7 @@ public static function stripUserFilesPath($path) {
 	 * @return string $path
 	 */
 	public static function generateUniqueTarget($path, $excludeList, $view) {
-		$pathinfo = pathinfo($path);
+		$pathinfo = \OCP\Files::pathinfo($path);
 		$ext = (isset($pathinfo['extension'])) ? '.'.$pathinfo['extension'] : '';
 		$name = $pathinfo['filename'];
 		$dir = $pathinfo['dirname'];

diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php
@@ -128,7 +128,7 @@ private function updateFileTarget($newPath, &$share) {
 	 * @return mixed
 	 */
 	private function generateUniqueTarget($path, $view, array $mountpoints) {
-		$pathinfo = pathinfo($path);
+		$pathinfo = \OCP\Files::pathinfo($path);
 		$ext = (isset($pathinfo['extension'])) ? '.'.$pathinfo['extension'] : '';
 		$name = $pathinfo['filename'];
 		$dir = $pathinfo['dirname'];

diff --git a/lib/private/Files/Cache/Updater.php b/lib/private/Files/Cache/Updater.php
@@ -198,7 +198,7 @@ public function renameFromStorage(IStorage $sourceStorage, $source, $target) {
 			}
 		}
 
-		if (pathinfo($source, PATHINFO_EXTENSION) !== pathinfo($target, PATHINFO_EXTENSION)) {
+		if (\OCP\Files::pathinfo($source, PATHINFO_EXTENSION) !== \OCP\Files::pathinfo($target, PATHINFO_EXTENSION)) {
 			// handle mime type change
 			$mimeType = $this->storage->getMimeType($target);
 			$fileId = $this->cache->getId($target);

diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -279,11 +279,7 @@ public function fopen($path, $mode) {
 			case 'x+':
 			case 'c':
 			case 'c+':
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
+				$ext = \OCP\Files::pathinfo($path, PATHINFO_EXTENSION);
 				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
 				\OC\Files\Stream\Close::registerCallback($tmpFile, [$this, 'writeBack']);
 				if ($this->file_exists($path)) {

diff --git a/lib/private/Files/Storage/DAV.php b/lib/private/Files/Storage/DAV.php
@@ -388,16 +388,12 @@ public function fopen($path, $mode) {
 			case 'c+':
 				//emulate these
 				$tempManager = \OC::$server->getTempManager();
-				if (strrpos($path, '.') !== false) {
-					$ext = substr($path, strrpos($path, '.'));
-				} else {
-					$ext = '';
-				}
 				if ($this->file_exists($path)) {
 					if (!$this->isUpdatable($path)) {
 						return false;
 					}
 					if ($mode === 'w' or $mode === 'w+') {
+						$ext = \OCP\Files::pathinfo($path, PATHINFO_EXTENSION);
 						$tmpFile = $tempManager->getTemporaryFile($ext);
 					} else {
 						$tmpFile = $this->getCachedFile($path);
@@ -406,6 +402,7 @@ public function fopen($path, $mode) {
 					if (!$this->isCreatable(dirname($path))) {
 						return false;
 					}
+					$ext = \OCP\Files::pathinfo($path, PATHINFO_EXTENSION);
 					$tmpFile = $tempManager->getTemporaryFile($ext);
 				}
 				Close::registerCallback($tmpFile, [$this, 'writeBack']);

diff --git a/lib/private/Files/Storage/LocalTempFileTrait.php b/lib/private/Files/Storage/LocalTempFileTrait.php
@@ -66,7 +66,8 @@ protected function toTmpFile($path) { //no longer in the storage api, still usef
 		if (!$source) {
 			return false;
 		}
-		$tmpFile = \OC::$server->getTempManager()->getTemporaryFile();
+		$ext = \OCP\Files::pathinfo($path, PATHINFO_EXTENSION);
+		$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
 		$target = fopen($tmpFile, 'w');
 		\OC_Helper::streamCopy($source, $target);
 		fclose($target);

diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
@@ -971,8 +971,8 @@ public function toTmpFile($path) {
 		if (Filesystem::isValidPath($path)) {
 			$source = $this->fopen($path, 'r');
 			if ($source) {
-				$extension = pathinfo($path, PATHINFO_EXTENSION);
-				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($extension);
+				$ext = \OCP\Files::pathinfo($path, PATHINFO_EXTENSION);
+				$tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext);
 				file_put_contents($tmpFile, $source);
 				return $tmpFile;
 			} else {

diff --git a/lib/private/Installer.php b/lib/private/Installer.php
@@ -271,25 +271,24 @@ public static function updateAppByOCSId($ocsId) {
 	public static function downloadApp($data = []) {
 		$l = \OC::$server->getL10N('lib');
 
-		if(!isset($data['source'])) {
+		if (!isset($data['source'])) {
 			throw new \Exception($l->t("No source specified when installing app"));
 		}
 
 		//download the file if necessary
-		if($data['source']=='http') {
-			$pathInfo = pathinfo($data['href']);
-			$extension = isset($pathInfo['extension']) ? '.' . $pathInfo['extension'] : '';
-			$path = \OC::$server->getTempManager()->getTemporaryFile($extension);
+		if ($data['source'] === 'http') {
 			if(!isset($data['href'])) {
 				throw new \Exception($l->t("No href specified when installing app from http"));
 			}
+			$ext = \OCP\Files::pathinfo($data['href'], PATHINFO_EXTENSION);
+			$path = \OC::$server->getTempManager()->getTemporaryFile($ext);
 			$client = \OC::$server->getHTTPClientService()->newClient();
 			$client->get($data['href'], ['save_to' => $path]);
 		} else {
 			if(!isset($data['path'])) {
 				throw new \Exception($l->t("No path specified when installing app from local file"));
 			}
-			$path=$data['path'];
+			$path = $data['path'];
 		}
 
 		//detect the archive type
@@ -302,11 +301,11 @@ public static function downloadApp($data = []) {
 		$extractDir = \OC::$server->getTempManager()->getTemporaryFolder();
 		OC_Helper::rmdirr($extractDir);
 		mkdir($extractDir);
-		if($archive=\OC\Archive\Archive::open($path)) {
+		if ($archive=\OC\Archive\Archive::open($path)) {
 			$archive->extract($extractDir);
 		} else {
 			OC_Helper::rmdirr($extractDir);
-			if($data['source']=='http') {
+			if ($data['source']=='http') {
 				unlink($path);
 			}
 			throw new \Exception($l->t("Failed to open archive when installing app"));

diff --git a/lib/public/Files.php b/lib/public/Files.php
@@ -54,7 +54,7 @@ static function rmdirr( $dir ) {
 	}
 
 	/**
-	 * Get the mimetype form a local file
+	 * Get the mimetype of a local file
 	 * @param string $path
 	 * @return string
 	 * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
@@ -64,6 +64,44 @@ static function getMimeType( $path ) {
 		return \OC::$server->getMimeTypeDetector()->detect($path);
 	}
 
+	/**
+	 * Get the pathinfo of a path with special handling for tar.(gz|bz2) which
+	 * have different mimetypes
+	 * @param string $path
+	 * @return array|string|null
+	 * @since 9.2.0
+	 */
+	static function pathinfo( $path, $options = PATHINFO_DIRNAME | PATHINFO_BASENAME | PATHINFO_EXTENSION | PATHINFO_FILENAME ) {
+		$result = pathinfo($path, $options);
+		// handle .tar.(gz|bz2)
+		if (is_array($result)) {
+			if (isset($result['extension'])) {
+				if ($result['extension'] === 'gz' && substr($path, -7) === '.tar.gz') {
+					$result['extension'] = 'tar.gz';
+					if (isset($result['filename'])) {
+						$result['filename'] = substr($result['filename'], 0, -4);
+					}
+				} else if ($result['extension'] === 'bz2' && substr($path, -8) === '.tar.bz2') {
+					$result['extension'] = 'tar.bz2';
+					if (isset($result['filename'])) {
+						$result['filename'] = substr($result['filename'], 0, -4);
+					}
+				}
+			}
+		} else if ($options === PATHINFO_EXTENSION) {
+			if ($result === 'gz' && substr($path, -7) === '.tar.gz') {
+				$result = 'tar.gz';
+			} else if ($result === 'bz2' && substr($path, -8) === '.tar.bz2') {
+				$result = 'tar.bz2';
+			}
+		} else if ($options === PATHINFO_FILENAME) {
+			if (substr($path, -7) === '.tar.gz' || substr($path, -8) === '.tar.bz2' ) {
+				$result = substr($result, 0, -4);
+			}
+		}
+		return $result;
+	}
+
 	/**
 	 * Search for files by mimetype
 	 * @param string $mimetype

diff --git a/tests/lib/Files/Storage/Storage.php b/tests/lib/Files/Storage/Storage.php
@@ -162,6 +162,12 @@ public function testWriteWithDotInPath() {
 		// filename does not contain a dot / extension, but parent dirs do ...
 		$path = '/something/that/is/not.supposed/to happen/lorem';
 		$lorem = 'lorem ipsum dolor sit ...';
+
+		//FIXME test and implement recursive mkdir
+		self::assertTrue($this->instance->mkdir('/something'));
+		self::assertTrue($this->instance->mkdir('/something/that'));
+		self::assertTrue($this->instance->mkdir('/something/that/is'));
+		self::assertTrue($this->instance->mkdir('/something/that/is/not.supposed'));
 		self::assertTrue($this->instance->mkdir('/something/that/is/not.supposed/to happen'));
 
 		//use fopen with w+ to walk affected code path

diff --git a/tests/lib/FilesTest.php b/tests/lib/FilesTest.php
@@ -132,4 +132,152 @@ public function testSetUploadLimitWrite(
 		);
 		$this->assertEquals($userIniSize + $userIniSizeMod, filesize($files['.user.ini']));
 	}
+
+
+
+	public function pathinfoProvider() {
+		return [
+			[
+				'/www/htdocs/inc/lib.inc.php',
+				PATHINFO_DIRNAME | PATHINFO_BASENAME | PATHINFO_EXTENSION | PATHINFO_FILENAME,
+				[
+					'dirname' => '/www/htdocs/inc',
+					'basename' => 'lib.inc.php',
+					'extension' => 'php',
+					'filename' => 'lib.inc',
+				]
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.gz',
+				PATHINFO_DIRNAME | PATHINFO_BASENAME | PATHINFO_EXTENSION | PATHINFO_FILENAME,
+				[
+					'dirname' => '/something/that/is/not.supposed/to happen',
+					'basename' => 'lorem.gz',
+					'extension' => 'gz',
+					'filename' => 'lorem',
+				]
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.tar.gz',
+				PATHINFO_DIRNAME | PATHINFO_BASENAME | PATHINFO_EXTENSION | PATHINFO_FILENAME,
+				[
+					'dirname' => '/something/that/is/not.supposed/to happen',
+					'basename' => 'lorem.tar.gz',
+					'extension' => 'tar.gz',
+					'filename' => 'lorem',
+				]
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.bz2',
+				PATHINFO_DIRNAME | PATHINFO_BASENAME | PATHINFO_EXTENSION | PATHINFO_FILENAME,
+				[
+					'dirname' => '/something/that/is/not.supposed/to happen',
+					'basename' => 'lorem.bz2',
+					'extension' => 'bz2',
+					'filename' => 'lorem',
+				]
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.tar.bz2',
+				PATHINFO_DIRNAME | PATHINFO_BASENAME | PATHINFO_EXTENSION | PATHINFO_FILENAME,
+				[
+					'dirname' => '/something/that/is/not.supposed/to happen',
+					'basename' => 'lorem.tar.bz2',
+					'extension' => 'tar.bz2',
+					'filename' => 'lorem',
+				]
+			],
+
+			[
+				'/www/htdocs/inc/lib.inc.php',
+				PATHINFO_DIRNAME, '/www/htdocs/inc',
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.gz',
+				PATHINFO_DIRNAME, '/something/that/is/not.supposed/to happen'
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.tar.gz',
+				PATHINFO_DIRNAME, '/something/that/is/not.supposed/to happen'
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.bz2',
+				PATHINFO_DIRNAME, '/something/that/is/not.supposed/to happen'
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.tar.bz2',
+				PATHINFO_DIRNAME, '/something/that/is/not.supposed/to happen'
+			],
+
+			[
+				'/www/htdocs/inc/lib.inc.php',
+				PATHINFO_BASENAME, 'lib.inc.php',
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.gz',
+				PATHINFO_BASENAME, 'lorem.gz'
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.tar.gz',
+				PATHINFO_BASENAME, 'lorem.tar.gz'
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.bz2',
+				PATHINFO_BASENAME, 'lorem.bz2'
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.tar.bz2',
+				PATHINFO_BASENAME, 'lorem.tar.bz2'
+			],
+
+			[
+				'/www/htdocs/inc/lib.inc.php',
+				PATHINFO_EXTENSION, 'php',
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.gz',
+				PATHINFO_EXTENSION, 'gz',
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.tar.gz',
+				PATHINFO_EXTENSION, 'tar.gz',
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.bz2',
+				PATHINFO_EXTENSION, 'bz2',
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.tar.bz2',
+				PATHINFO_EXTENSION, 'tar.bz2',
+			],
+
+			[
+				'/www/htdocs/inc/lib.inc.php',
+				PATHINFO_FILENAME, 'lib.inc',
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.gz',
+				PATHINFO_FILENAME, 'lorem',
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.tar.gz',
+				PATHINFO_FILENAME, 'lorem',
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.bz2',
+				PATHINFO_FILENAME, 'lorem',
+			],
+			[
+				'/something/that/is/not.supposed/to happen/lorem.tar.bz2',
+				PATHINFO_FILENAME, 'lorem',
+			],
+		];
+	}
+	/**
+	 * @dataProvider pathinfoProvider
+	 */
+	public function testPathinfo($path, $options, $expectedResult) {
+		$result = \OCP\Files::pathinfo($path, $options);
+		self::assertEquals($expectedResult, $result);
+	}
 }