Merge pull request #1344 from n-peugnet/patch-1

Fix propfind type of subnodes with depth >= 1
sabre-io · Nov 16, 2021 · 7a638b6 · 7a638b6
2 parents d762b19 + 09bf553
commit 7a638b6
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 18 deletions.
diff --git a/lib/DAV/Server.php b/lib/DAV/Server.php
@@ -895,7 +895,7 @@ private function generatePathNodes(PropFind $propFind, array $yieldFirst = null)
         }
 
         $propertyNames = $propFind->getRequestedProperties();
-        $propFindType = !empty($propertyNames) ? PropFind::NORMAL : PropFind::ALLPROPS;
+        $propFindType = !$propFind->isAllProps() ? PropFind::NORMAL : PropFind::ALLPROPS;
 
         foreach ($this->tree->getChildren($path) as $childNode) {
             if ('' !== $path) {

diff --git a/tests/Sabre/DAV/AbstractServer.php b/tests/Sabre/DAV/AbstractServer.php
@@ -42,6 +42,16 @@ protected function getRootNode()
         return new FS\Directory(SABRE_TEMPDIR);
     }
 
+    protected function getSanitizedBody()
+    {
+        return preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", 'xmlns\\1="urn:DAV"', $this->response->getBodyAsString());
+    }
+
+    protected function getSanitizedBodyAsXml()
+    {
+        return simplexml_load_string($this->getSanitizedBody());
+    }
+
     private function deleteTree($path, $deleteRoot = true)
     {
         foreach (scandir($path) as $node) {

diff --git a/tests/Sabre/DAV/Locks/PluginTest.php b/tests/Sabre/DAV/Locks/PluginTest.php
@@ -77,8 +77,7 @@ public function testLock()
 
         $this->assertEquals(200, $this->response->status, 'Got an incorrect status back. Response body: '.$this->response->getBodyAsString());
 
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", 'xmlns\\1="urn:DAV"', $this->response->getBodyAsString());
-        $xml = simplexml_load_string($body);
+        $xml = $this->getSanitizedBodyAsXml();
         $xml->registerXPathNamespace('d', 'urn:DAV');
 
         $elements = [
@@ -128,8 +127,7 @@ public function testLockWithContext()
 
         $this->assertEquals(200, $this->response->status, 'Got an incorrect status back. Response body: '.$this->response->getBodyAsString());
 
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", 'xmlns\\1="urn:DAV"', $this->response->getBodyAsString());
-        $xml = simplexml_load_string($body);
+        $xml = $this->getSanitizedBodyAsXml();
         $xml->registerXPathNamespace('d', 'urn:DAV');
 
         $lockRoot = $xml->xpath('/d:prop/d:lockdiscovery/d:activelock/d:lockroot/d:href');

diff --git a/tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php b/tests/Sabre/DAV/ServerPropsInfiniteDepthTest.php
@@ -120,8 +120,7 @@ public function testLockDiscovery()
 
         $this->sendRequest($xml);
 
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", 'xmlns\\1="urn:DAV"', $this->response->getBodyAsString());
-        $xml = simplexml_load_string($body);
+        $xml = $this->getSanitizedBodyAsXml();
         $xml->registerXPathNamespace('d', 'urn:DAV');
 
         $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:lockdiscovery');
@@ -138,7 +137,7 @@ public function testUnknownProperty()
 </d:propfind>';
 
         $this->sendRequest($xml);
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", 'xmlns\\1="urn:DAV"', $this->response->getBodyAsString());
+        $body = $this->getSanitizedBody();
         $xml = simplexml_load_string($body);
         $xml->registerXPathNamespace('d', 'urn:DAV');
         $pathTests = [
@@ -168,7 +167,7 @@ public function testFilesThatAreSiblingsOfDirectoriesShouldBeReportedAsFiles()
 </d:propfind>';
 
         $this->sendRequest($xml);
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", 'xmlns\\1="urn:DAV"', $this->response->getBodyAsString());
+        $body = $this->getSanitizedBody();
         $xml = simplexml_load_string($body);
         $xml->registerXPathNamespace('d', 'urn:DAV');
         $pathTests = [

diff --git a/tests/Sabre/DAV/ServerPropsTest.php b/tests/Sabre/DAV/ServerPropsTest.php
@@ -55,8 +55,7 @@ public function testPropFindEmptyBody()
             $this->response->getHeaders()
          );
 
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", 'xmlns\\1="urn:DAV"', $this->response->getBodyAsString());
-        $xml = simplexml_load_string($body);
+        $xml = $this->getSanitizedBodyAsXml();
         $xml->registerXPathNamespace('d', 'urn:DAV');
 
         list($data) = $xml->xpath('/d:multistatus/d:response/d:href');
@@ -66,6 +65,36 @@ public function testPropFindEmptyBody()
         $this->assertEquals(1, count($data));
     }
 
+    public function testPropFindEmptyBodyDepth1Custom()
+    {
+        // Add custom property to nodes.
+        $this->server->on('propFind', function (PropFind $propFind, INode $node) {
+            $propFind->set('{DAV:}ishidden', '1');
+        });
+
+        $this->sendRequest('', '/', ['Depth' => 1]);
+        $this->assertEquals(207, $this->response->status);
+
+        $this->assertEquals([
+                'X-Sabre-Version' => [Version::VERSION],
+                'Content-Type' => ['application/xml; charset=utf-8'],
+                'DAV' => ['1, 3, extended-mkcol, 2'],
+                'Vary' => ['Brief,Prefer'],
+            ],
+            $this->response->getHeaders()
+         );
+
+        $xml = $this->getSanitizedBodyAsXml();
+        $xml->registerXPathNamespace('d', 'urn:DAV');
+
+        $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:ishidden');
+        $this->assertEquals(5, count($data), 'Response should contain 5 elements');
+
+        foreach ($data as $prop) {
+            $this->assertEquals('1', $prop[0]);
+        }
+    }
+
     public function testPropFindEmptyBodyFile()
     {
         $this->sendRequest('', '/test2.txt', []);
@@ -80,8 +109,7 @@ public function testPropFindEmptyBodyFile()
             $this->response->getHeaders()
          );
 
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", 'xmlns\\1="urn:DAV"', $this->response->getBodyAsString());
-        $xml = simplexml_load_string($body);
+        $xml = $this->getSanitizedBodyAsXml();
         $xml->registerXPathNamespace('d', 'urn:DAV');
 
         list($data) = $xml->xpath('/d:multistatus/d:response/d:href');
@@ -102,8 +130,7 @@ public function testSupportedLocks()
 
         $this->sendRequest($xml);
 
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", 'xmlns\\1="urn:DAV"', $this->response->getBodyAsString());
-        $xml = simplexml_load_string($body);
+        $xml = $this->getSanitizedBodyAsXml();
         $xml->registerXPathNamespace('d', 'urn:DAV');
 
         $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:supportedlock/d:lockentry');
@@ -136,8 +163,7 @@ public function testLockDiscovery()
 
         $this->sendRequest($xml);
 
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", 'xmlns\\1="urn:DAV"', $this->response->getBodyAsString());
-        $xml = simplexml_load_string($body);
+        $xml = $this->getSanitizedBodyAsXml();
         $xml->registerXPathNamespace('d', 'urn:DAV');
 
         $data = $xml->xpath('/d:multistatus/d:response/d:propstat/d:prop/d:lockdiscovery');
@@ -154,7 +180,7 @@ public function testUnknownProperty()
 </d:propfind>';
 
         $this->sendRequest($xml);
-        $body = preg_replace("/xmlns(:[A-Za-z0-9_])?=(\"|\')DAV:(\"|\')/", 'xmlns\\1="urn:DAV"', $this->response->getBodyAsString());
+        $body = $this->getSanitizedBody();
         $xml = simplexml_load_string($body);
         $xml->registerXPathNamespace('d', 'urn:DAV');
         $pathTests = [