reuse isValidPath from Filesystem

Signed-off-by: Robin Appelman <robin@icewind.nl>
nextcloud · Sep 4, 2023 · 5ac0e9b · 5ac0e9b
1 parent baf8d2e
commit 5ac0e9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/lib/private/Files/Node/LazyFolder.php b/lib/private/Files/Node/LazyFolder.php
@@ -26,6 +26,7 @@
 
 namespace OC\Files\Node;
 
+use OC\Files\Filesystem;
 use OC\Files\Utils\PathHelper;
 use OCP\Files\Folder;
 use OCP\Constants;
@@ -418,21 +419,14 @@ public function getExtension(): string {
 	public function getFullPath($path) {
 		if (isset($this->data['path'])) {
 			$path = PathHelper::normalizePath($path);
-			if (!$this->isValidPath($path)) {
+			if (!Filesystem::isValidPath($path)) {
 				throw new NotPermittedException('Invalid path "' . $path . '"');
 			}
 			return $this->data['path'] . $path;
 		}
 		return $this->__call(__FUNCTION__, func_get_args());
 	}
 
-	public function isValidPath($path) {
-		if (!str_starts_with($path, '/')) {
-			$path = '/' . $path;
-		}
-		return !(str_contains($path, '/../') || strrchr($path, '/') === '/..');
-	}
-
 	/**
 	 * @inheritDoc
 	 */

diff --git a/lib/private/Files/Node/Node.php b/lib/private/Files/Node/Node.php
@@ -334,13 +334,7 @@ protected function normalizePath($path) {
 	 * @return bool
 	 */
 	public function isValidPath($path) {
-		if (!$path || $path[0] !== '/') {
-			$path = '/' . $path;
-		}
-		if (strstr($path, '/../') || strrchr($path, '/') === '/..') {
-			return false;
-		}
-		return true;
+		return Filesystem::isValidPath($path);
 	}
 
 	public function isMounted() {