diff options
| author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-11-11 15:54:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-11 15:54:41 +0100 |
| commit | 70414b15f9723e0c573122abe95f5aa9030fe09b (patch) | |
| tree | 75f5af1e57e75bad7158990c8b71bd6a26e03b7c /lib | |
| parent | 1e489f7ec0251118015234d72cba01571b9f1723 (diff) | |
| parent | bc908b044a6fac9401fdf110bbd8ac2b6497ded2 (diff) | |
| download | nextcloud-server-70414b15f9723e0c573122abe95f5aa9030fe09b.tar.gz nextcloud-server-70414b15f9723e0c573122abe95f5aa9030fe09b.zip | |
Merge pull request #35086 from nextcloud/backport/35074/stable25
[stable25] Make sure that path is normalized and then checked,
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/Node/Folder.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php index 268c1d8dd06..bf9ae3c148d 100644 --- a/lib/private/Files/Node/Folder.php +++ b/lib/private/Files/Node/Folder.php @@ -66,10 +66,11 @@ class Folder extends Node implements \OCP\Files\Folder { * @throws \OCP\Files\NotPermittedException */ public function getFullPath($path) { + $path = $this->normalizePath($path); if (!$this->isValidPath($path)) { throw new NotPermittedException('Invalid path'); } - return $this->path . $this->normalizePath($path); + return $this->path . $path; } /** @@ -371,12 +372,12 @@ class Folder extends Node implements \OCP\Files\Folder { return [$this->root->createNode( $absolutePath, new \OC\Files\FileInfo( - $absolutePath, - $mount->getStorage(), - $cacheEntry->getPath(), - $cacheEntry, - $mount - ))]; + $absolutePath, + $mount->getStorage(), + $cacheEntry->getPath(), + $cacheEntry, + $mount + ))]; } public function getFreeSpace() { |