Merge pull request #1738 from nextcloud/backport/1737/stable28

[stable28] fix(DAV): fix getNodeForPath cache
nextcloud · Feb 22, 2024 · 9aabf1a · 9aabf1a
2 parents 03a2947 + 27fd8e4
commit 9aabf1a
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 3 deletions.
diff --git a/.patches/fix-cache-for-node.diff b/.patches/fix-cache-for-node.diff
@@ -0,0 +1,27 @@
+diff --git a/lib/DAV/Tree.php b/lib/DAV/Tree.php
+index 65b4583ceb..1483e1bc51 100644
+--- a/lib/DAV/Tree.php
++++ b/lib/DAV/Tree.php
+@@ -62,9 +62,21 @@ public function getNodeForPath($path)
+             return $this->rootNode;
+         }
+
+-        $parts = explode('/', $path);
+         $node = $this->rootNode;
+
++        // look for any cached parent and collect the parts below the parent
++        $parts = [];
++        $remainingPath = $path;
++        do {
++            list($remainingPath, $baseName) = Uri\split($remainingPath);
++            array_unshift($parts, $baseName);
++
++            if (isset($this->cache[$remainingPath])) {
++                $node = $this->cache[$remainingPath];
++                break;
++            }
++        } while ('' !== $remainingPath);
++
+         while (count($parts)) {
+             if (!($node instanceof ICollection)) {
+                 throw new Exception\NotFound('Could not find node at path: '.$path);
diff --git a/composer.patches.json b/composer.patches.json
@@ -1,4 +1,8 @@
 {
     "patches": {
+	"sabre/dav": {
+            "Fix getNodeForPath cache": ".patches/fix-cache-for-node.diff"
+        }
+
     }
 }
diff --git a/composer/installed.json b/composer/installed.json
@@ -3912,6 +3912,11 @@
                 "bin/naturalselection"
             ],
             "type": "library",
+            "extra": {
+                "patches_applied": {
+                    "Fix getNodeForPath cache": ".patches/fix-cache-for-node.diff"
+                }
+            },
             "installation-source": "dist",
             "autoload": {
                 "psr-4": {

diff --git a/composer/installed.php b/composer/installed.php
@@ -3,7 +3,7 @@
         'name' => 'nextcloud/3rdparty',
         'pretty_version' => 'dev-master',
         'version' => 'dev-master',
-        'reference' => 'd7b9f6f5f0513adc3ed652eb84b1822fb5b53032',
+        'reference' => '330abb953111fee49cd2577b42dcd54712bdb8b0',
         'type' => 'library',
         'install_path' => __DIR__ . '/../',
         'aliases' => array(),
@@ -310,7 +310,7 @@
         'nextcloud/3rdparty' => array(
             'pretty_version' => 'dev-master',
             'version' => 'dev-master',
-            'reference' => 'd7b9f6f5f0513adc3ed652eb84b1822fb5b53032',
+            'reference' => '330abb953111fee49cd2577b42dcd54712bdb8b0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../',
             'aliases' => array(),

diff --git a/sabre/dav/PATCHES.txt b/sabre/dav/PATCHES.txt
@@ -0,0 +1,7 @@
+This file was automatically generated by Composer Patches (https://github.com/cweagans/composer-patches)
+Patches applied to this directory:
+
+Fix getNodeForPath cache
+Source: .patches/fix-cache-for-node.diff
+
+
diff --git a/sabre/dav/lib/DAV/Tree.php b/sabre/dav/lib/DAV/Tree.php
@@ -62,9 +62,21 @@ public function getNodeForPath($path)
             return $this->rootNode;
         }
 
-        $parts = explode('/', $path);
         $node = $this->rootNode;
 
+        // look for any cached parent and collect the parts below the parent
+        $parts = [];
+        $remainingPath = $path;
+        do {
+            list($remainingPath, $baseName) = Uri\split($remainingPath);
+            array_unshift($parts, $baseName);
+
+            if (isset($this->cache[$remainingPath])) {
+                $node = $this->cache[$remainingPath];
+                break;
+            }
+        } while ('' !== $remainingPath);
+
         while (count($parts)) {
             if (!($node instanceof ICollection)) {
                 throw new Exception\NotFound('Could not find node at path: '.$path);