Merge pull request #719 from fruux/fix-broken-uriencoding

Fix broken uriencoding
sabre-io · Sep 15, 2015 · afb7b9d · afb7b9d
2 parents 8d98bd5 + 03fb8ed
commit afb7b9d
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 3 deletions.
diff --git a/lib/DAV/Server.php b/lib/DAV/Server.php
@@ -523,7 +523,12 @@ function getRequestUri() {
     }
 
     /**
-     * Calculates the uri for a request, making sure that the base uri is stripped out
+     * Turns a URI such as the REQUEST_URI into a local path.
+     *
+     * This method:
+     *   * strips off the base path
+     *   * normalizes the path
+     *   * uri-decodes the path
      *
      * @param string $uri
      * @throws Exception\Forbidden A permission denied exception is thrown whenever there was an attempt to supply a uri outside of the base uri

diff --git a/lib/DAV/Xml/Element/Response.php b/lib/DAV/Xml/Element/Response.php
@@ -122,7 +122,7 @@ function xmlSerialize(Writer $writer) {
         if ($status = $this->getHTTPStatus()) {
             $writer->writeElement('{DAV:}status', 'HTTP/1.1 ' . $status . ' ' . \Sabre\HTTP\Response::$statusCodes[$status]);
         }
-        $writer->writeElement('{DAV:}href', $writer->contextUri . $this->getHref());
+        $writer->writeElement('{DAV:}href', $writer->contextUri . \Sabre\HTTP\encodePath($this->getHref()));
         foreach ($this->getResponseProperties() as $status => $properties) {
 
             // Skipping empty lists

diff --git a/lib/DAV/Xml/Property/Href.php b/lib/DAV/Xml/Property/Href.php
@@ -105,7 +105,7 @@ function xmlSerialize(Writer $writer) {
 
         foreach ($this->getHrefs() as $href) {
             if ($this->autoPrefix) {
-                $href = $writer->contextUri . $href;
+                $href = $writer->contextUri . \Sabre\HTTP\encodePath($href);
             }
             $writer->writeElement('{DAV:}href', $href);
         }

diff --git a/tests/Sabre/DAV/Xml/Element/ResponseTest.php b/tests/Sabre/DAV/Xml/Element/ResponseTest.php
@@ -212,6 +212,38 @@ function testDeserializeComplexProperty() {
 
     }
 
+    /**
+     * @depends testSimple
+     */
+    function testSerializeUrlencoding() {
+
+        $innerProps = [
+            200 => [
+                '{DAV:}displayname' => 'my file',
+            ],
+        ];
+
+        $property = new Response('space here', $innerProps);
+
+        $xml = $this->write(['{DAV:}root' => ['{DAV:}response' => $property]]);
+
+        $this->assertXmlStringEqualsXmlString(
+'<?xml version="1.0"?>
+<d:root xmlns:d="DAV:">
+  <d:response>
+    <d:href>/space%20here</d:href>
+    <d:propstat>
+      <d:prop>
+        <d:displayname>my file</d:displayname>
+      </d:prop>
+      <d:status>HTTP/1.1 200 OK</d:status>
+    </d:propstat>
+  </d:response>
+</d:root>
+', $xml);
+
+    }
+
     /**
      * In the case of {DAV:}prop, a deserializer should never get called, if
      * the property element is empty.

diff --git a/tests/Sabre/DAV/Xml/Property/HrefTest.php b/tests/Sabre/DAV/Xml/Property/HrefTest.php
@@ -27,6 +27,21 @@ function testSerialize() {
         $this->assertXmlStringEqualsXmlString(
 '<?xml version="1.0"?>
 <d:anything xmlns:d="DAV:"><d:href>/bla/path</d:href></d:anything>
+', $xml);
+
+    }
+    function testSerializeSpace() {
+
+        $href = new Href('path alsopath');
+        $this->assertEquals('path alsopath', $href->getHref());
+
+        $this->contextUri = '/bla/';
+
+        $xml = $this->write(['{DAV:}anything' => $href]);
+
+        $this->assertXmlStringEqualsXmlString(
+'<?xml version="1.0"?>
+<d:anything xmlns:d="DAV:"><d:href>/bla/path%20alsopath</d:href></d:anything>
 ', $xml);
 
     }