Fixed normalizePath() to strip out single dot dirs

Now removing "/./" and trailing "/." from the paths when normalizing.

Backport of c06d8bb0071839480f9e458e58630ca0c205b9cb

1 files changed, 17 insertions, 3 deletions

diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 14ca882982e..1850d50f971 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -589,18 +589,32 @@ class Filesystem {
 		}
 		//no windows style slashes
 		$path = str_replace('\\', '/', $path);
+
 		//add leading slash
 		if ($path[0] !== '/') {
 			$path = '/' . $path;
 		}
-		//remove duplicate slashes
-		while (strpos($path, '//') !== false) {
-			$path = str_replace('//', '/', $path);
+
+		// remove '/./'
+		// ugly, but str_replace() can't replace them all in one go
+		// as the replacement itself is part of the search string
+		// which will only be found during the next iteration
+		while (strpos($path, '/./') !== false) {
+			$path = str_replace('/./', '/', $path);
 		}
+		// remove sequences of slashes
+		$path = preg_replace('#/{2,}#', '/', $path);
+
 		//remove trailing slash
 		if ($stripTrailingSlash and strlen($path) > 1 and substr($path, -1, 1) === '/') {
 			$path = substr($path, 0, -1);
 		}
+
+		// remove trailing '/.'
+		if (substr($path, -2) == '/.') {
+			$path = substr($path, 0, -2);
+		}
+
 		//normalize unicode if possible
 		$path = \OC_Util::normalizeUnicode($path);
 		return $path;