sabre-io · DeepDiver1975 · May 3, 2016
diff --git a/lib/CardDAV/AddressBook.php b/lib/CardDAV/AddressBook.php
@@ -101,8 +101,10 @@ function getMultipleChildren(array $paths) {
         $objs = $this->carddavBackend->getMultipleCards($this->addressBookInfo['id'], $paths);
         $children = [];
         foreach ($objs as $obj) {
-            $obj['acl'] = $this->getChildACL();
-            $children[] = new Card($this->carddavBackend, $this->addressBookInfo, $obj);
+            if (is_array($obj)) {
+                $obj['acl'] = $this->getChildACL();
+                $children[] = new Card($this->carddavBackend, $this->addressBookInfo, $obj);
+            }
         }
         return $children;
 

diff --git a/lib/DAV/Client.php b/lib/DAV/Client.php
@@ -2,6 +2,7 @@
 
 namespace Sabre\DAV;
 
+use Sabre\DAV\Xml\Response\MultiStatus;
 use Sabre\HTTP;
 use Sabre\Uri;
 
@@ -422,6 +423,7 @@ function getAbsoluteUrl($url) {
      */
     function parseMultiStatus($body) {
 
+        /** @var MultiStatus $multistatus */
         $multistatus = $this->xml->expect('{DAV:}multistatus', $body);
 
         $result = [];

diff --git a/lib/DAV/Server.php b/lib/DAV/Server.php
@@ -1013,30 +1013,28 @@ function getPropertiesIteratorForPath($path, $propertyNames = [], $depth = 0) {
      * @return array
      */
     function getPropertiesForMultiplePaths(array $paths, array $propertyNames = []) {
-
         $result = [
         ];
-
         $nodes = $this->tree->getMultipleNodes($paths);
-
         foreach ($nodes as $path => $node) {
-
-            $propFind = new PropFind($path, $propertyNames);
-            $r = $this->getPropertiesByNode($propFind, $node);
-            if ($r) {
-                $result[$path] = $propFind->getResultForMultiStatus();
+            if (is_null($node)) {
+                $result[$path] = [];
                 $result[$path]['href'] = $path;
-
-                $resourceType = $this->getResourceTypeForNode($node);
-                if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
-                    $result[$path]['href'] .= '/';
+                $result[$path]['status'] = 404;
+            } else {
+                $propFind = new PropFind($path, $propertyNames);
+                $r = $this->getPropertiesByNode($propFind, $node);
+                if ($r) {
+                    $result[$path] = $propFind->getResultForMultiStatus();
+                    $result[$path]['href'] = $path;
+                    $resourceType = $this->getResourceTypeForNode($node);
+                    if (in_array('{DAV:}collection', $resourceType) || in_array('{DAV:}principal', $resourceType)) {
+                        $result[$path]['href'] .= '/';
+                    }
                 }
             }
-
         }
-
         return $result;
-
     }
 
 
@@ -1670,9 +1668,11 @@ function generateMultiStatus($fileProperties, $strip404s = false) {
             if ($strip404s) {
                 unset($entry[404]);
             }
+            $status = isset($entry['status']) ? $entry['status'] : null;
             $response = new Xml\Element\Response(
                 ltrim($href, '/'),
-                $entry
+                $entry,
+                $status
             );
             $w->write([
                 'name'  => '{DAV:}response',

diff --git a/lib/DAV/Tree.php b/lib/DAV/Tree.php
@@ -2,6 +2,7 @@
 
 namespace Sabre\DAV;
 
+use Sabre\DAV\Exception\NotFound;
 use Sabre\Uri;
 
 /**
@@ -266,20 +267,37 @@ function getMultipleNodes($paths) {
 
         foreach ($parents as $parent => $children) {
 
-            $parentNode = $this->getNodeForPath($parent);
+            try {
+                $parentNode = $this->getNodeForPath($parent);
+            } catch (NotFound $ex) {
+                foreach ($children as $child) {
+                    $fullPath = $parent . '/' . $child;
+                    $result[$fullPath] = null;
+                }
+                continue;
+            }
             if ($parentNode instanceof IMultiGet) {
                 foreach ($parentNode->getMultipleChildren($children) as $childNode) {
                     $fullPath = $parent . '/' . $childNode->getName();
                     $result[$fullPath] = $childNode;
                     $this->cache[$fullPath] = $childNode;
                 }
+                foreach ($children as $child) {
+                    $fullPath = $parent . '/' . $child;
+                    if (!isset($result[$fullPath])) {
+                        $result[$fullPath] = null;
+                    }
+                }
             } else {
                 foreach ($children as $child) {
                     $fullPath = $parent . '/' . $child;
-                    $result[$fullPath] = $this->getNodeForPath($fullPath);
+                    try {
+                        $result[$fullPath] = $this->getNodeForPath($fullPath);
+                    } catch (NotFound $ex) {
+                        $result[$fullPath] = null;
+                    }
                 }
             }
-
         }
 
         return $result;

diff --git a/lib/DAV/Xml/Element/Response.php b/lib/DAV/Xml/Element/Response.php
@@ -27,7 +27,7 @@ class Response implements Element {
     protected $href;
 
     /**
-     * Propertylist, ordered by HTTP status code
+     * Property list, ordered by HTTP status code
      *
      * @var array
      */
@@ -119,7 +119,7 @@ function getResponseProperties() {
      */
     function xmlSerialize(Writer $writer) {
 
-        if ($status = $this->getHTTPStatus()) {
+        if ($status = $this->getHttpStatus()) {
             $writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]);
         }
         $writer->writeElement('{DAV:}href', $writer->contextUri . \Sabre\HTTP\encodePath($this->getHref()));
@@ -137,9 +137,8 @@ function xmlSerialize(Writer $writer) {
             $writer->writeElement('{DAV:}prop', $properties);
             $writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]);
             $writer->endElement(); // {DAV:}propstat
-
         }
-        if ($empty) {
+        if ($empty && !$status) {
             /*
              * The WebDAV spec _requires_ at least one DAV:propstat to appear for
              * every DAV:response. In some circumstances however, there are no

diff --git a/tests/Sabre/CardDAV/MultiGetTest.php b/tests/Sabre/CardDAV/MultiGetTest.php
@@ -96,4 +96,62 @@ function testMultiGetVCard4() {
         ], $result);
 
     }
+
+    function testMultiGet404() {
+
+        $request = HTTP\Sapi::createFromServerArray([
+            'REQUEST_METHOD' => 'REPORT',
+            'REQUEST_URI'    => '/addressbooks/user1/book1',
+        ]);
+
+        $request->setBody(
+            '<?xml version="1.0"?>
+<c:addressbook-multiget xmlns:d="DAV:" xmlns:c="urn:ietf:params:xml:ns:carddav">
+    <d:prop>
+      <d:getetag />
+      <c:address-data />
+    </d:prop>
+    <d:href>/addressbooks/user1/unknown/card1</d:href>
+    <d:href>/addressbooks/user1/book1/card1</d:href>
+    <d:href>/addressbooks/user1/book1/unknown-card</d:href>
+</c:addressbook-multiget>'
+        );
+
+        $response = new HTTP\ResponseMock();
+
+        $this->server->httpRequest = $request;
+        $this->server->httpResponse = $response;
+
+        $this->server->exec();
+
+        $this->assertEquals(207, $response->status, 'Incorrect status code. Full response body:' . $response->body);
+
+        $this->assertXmlStringEqualsXmlString('<?xml version="1.0"?>
+<d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns" xmlns:card="urn:ietf:params:xml:ns:carddav">
+ <d:response>
+  <d:status>HTTP/1.1 404 Not Found</d:status>
+  <d:href>/addressbooks/user1/unknown/card1</d:href>
+ </d:response>
+ <d:response>
+  <d:href>/addressbooks/user1/book1/card1</d:href>
+    <d:propstat>
+      <d:prop>
+        <d:getetag>"ffe3b42186ba156c84fc1581c273f01c"</d:getetag>
+        <card:address-data>BEGIN:VCARD
+VERSION:3.0
+UID:12345
+END:VCARD</card:address-data>
+      </d:prop>
+      <d:status>HTTP/1.1 200 OK</d:status>
+    </d:propstat>
+ </d:response>
+ <d:response>
+  <d:status>HTTP/1.1 404 Not Found</d:status>
+  <d:href>/addressbooks/user1/book1/unknown-card</d:href>
+ </d:response>
+</d:multistatus>', $response->body);
+
+    }
+
+
 }
diff --git a/tests/Sabre/DAV/Sync/PluginTest.php b/tests/Sabre/DAV/Sync/PluginTest.php
@@ -96,6 +96,7 @@ function testSyncInitialSyncCollection() {
 
         $this->assertEquals(207, $response->status, 'Full response body:' . $response->body);
 
+        /** @var DAV\Xml\Response\MultiStatus $multiStatus */
         $multiStatus = $this->server->xml->parse($response->getBodyAsString());
 
         // Checking the sync-token

diff --git a/tests/Sabre/DAVACL/PrincipalMatchTest.php b/tests/Sabre/DAVACL/PrincipalMatchTest.php
@@ -28,10 +28,6 @@ function testPrincipalMatch() {
 <d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns">
     <d:status>HTTP/1.1 200 OK</d:status>
     <d:href>/principals/user1</d:href>
-    <d:propstat>
-        <d:prop/>
-        <d:status>HTTP/1.1 418 I'm a teapot</d:status>
-    </d:propstat>
 </d:multistatus>
 XML;