* davcmd.py:

* reimplemented `copytree()` URI derivation logic using `urllib.parse` and `os.path`. * WebDAVServer.py, propfind.py, davcopy.py, utils: * Moved the responsibility of adding newlines to the end of response XML out of WebDAVServer.py and into the XML generation routines in propfind.py, davcopy.py, and utils.py. * utils.py: * Altered `is_prefix()` to use `os.path.commonpath()` instead of a substring comparison.
andrewleech · andrewleech · Dec 30, 2022 · Dec 1, 2019 · Dec 2, 2019 · Dec 9, 2019
commit 86f8c86a73ee0cc4d0d62da79ebc1cdebbb9c3a4
diff --git a/pywebdav/lib/davcmd.py b/pywebdav/lib/davcmd.py
@@ -14,6 +14,7 @@
 from .utils import create_treelist, is_prefix
 from .errors import *
 from six.moves import range
+import os
 
 def deltree(dc,uri,exclude={}):
     """ delete a tree of resources
@@ -128,7 +129,7 @@ def copytree(dc,src,dst,overwrite=None):
     dc  -- dataclass to use
     src -- src uri from where to copy
     dst -- dst uri
-    overwrite -- if 1 then delete dst uri before
+    overwrite -- if True then delete dst uri before
 
     returns dict of uri:error_code tuples from which
     another method can create a multistatus xml element.
@@ -149,8 +150,14 @@ def copytree(dc,src,dst,overwrite=None):
     tlist = create_treelist(dc,src)
     result = {}
 
-    # prepare destination URIs (get the prefix)
-    dpath = urllib.parse.urlparse(dst)[2]
+    # Extract the path out of the source URI.
+    src_path = urllib.parse.urlparse(src).path
+
+    # Parse the destination URI.
+    # We'll be using it to construct destination URIs,
+    # so we don't just retain the path, like we did with
+    # the source.
+    dst_parsed = urllib.parse.urlparse(dst)
 
     for element in tlist:
         problem_uris = list(result.keys())
@@ -160,24 +167,34 @@ def copytree(dc,src,dst,overwrite=None):
         # able to copy in problem_uris which is the prefix
         # of the actual element. If it is, then we cannot
         # copy this as well but do not generate another error.
-        ok=1
+        ok=True
         for p in problem_uris:
             if is_prefix(p,element):
-                ok=None
+                ok=False
                 break
 
-        if not ok: continue
+        if not ok:
+            continue
+
+        # Find the element's path relative to the source.
+        element_path = urllib.parse.urlparse(element).path
+        element_path_rel = os.path.relpath(element_path, start=src_path)
+        # Append this relative path to the destination.
+        if element_path_rel == '.':
+            # os.path.relpath("/somedir", start="/somedir") returns
+            # a result of ".", which we don't want to append to the
+            # destination path.
+            dst_path = dst_parsed.path
+        else:
+            dst_path = os.path.join(dst_parsed.path, element_path_rel)
+
+        # Generate destination URI using our derived destination path.
+        dst_uri = urllib.parse.urlunparse(dst_parsed._replace(path=os.path.join(dst_parsed.path, element_path_rel)))
 
-        # now create the destination URI which corresponds to
-        # the actual source URI. -> actual_dst
-        # ("subtract" the base src from the URI and prepend the
-        # dst prefix to it.)
-        esrc=element.replace(src,b"")
-        actual_dst=dpath+esrc
 
         # now copy stuff
         try:
-            copy(dc,element,actual_dst)
+            copy(dc,element,dst_uri)
         except DAV_Error as error:
             (ec,dd) = error.args
             result[element]=ec
@@ -216,6 +233,11 @@ def movetree(dc,src,dst,overwrite=None):
     # first copy it
     res = copytree(dc,src,dst,overwrite)
 
+    # TODO: shouldn't we check res for errors and bail out before
+    # the delete if we find any?
+    # TODO: or, better yet, is there anything preventing us from
+    # reimplementing this using `shutil.move()`?
+
     # then delete it
     res = deltree(dc,src,exclude=res)
 

diff --git a/pywebdav/lib/davcopy.py b/pywebdav/lib/davcopy.py
@@ -99,4 +99,4 @@ def tree_action(self):
                 re.appendChild(st)
                 ms.appendChild(re)
 
-        return doc.toxml(encoding="utf-8")
+        return doc.toxml(encoding="utf-8") + b"\n"
diff --git a/pywebdav/lib/propfind.py b/pywebdav/lib/propfind.py
@@ -116,7 +116,7 @@ def create_propname(self):
                 if uri_childs:
                     uri_list.extend(uri_childs)
 
-        return doc.toxml(encoding="utf-8")
+        return doc.toxml(encoding="utf-8") + b"\n"
 
     def create_allprop(self):
         """ return a list of all properties """
@@ -180,7 +180,7 @@ def create_prop(self):
                 if uri_childs:
                     uri_list.extend(uri_childs)
 
-        return doc.toxml(encoding="utf-8")
+        return doc.toxml(encoding="utf-8") + b"\n"
 
     def mk_propname_response(self, uri, propnames, doc):
         """ make a new <prop> result element for a PROPNAME request

diff --git a/pywebdav/lib/report.py b/pywebdav/lib/report.py
@@ -55,7 +55,7 @@ def create_propname(self):
                 if uri_childs:
                     uri_list.extend(uri_childs)
 
-        return doc.toxml(encoding="utf-8")
+        return doc.toxml(encoding="utf-8") + b"\n"
 
     def create_prop(self):
         """ handle a <prop> request
@@ -117,5 +117,5 @@ def create_prop(self):
                 if uri_childs:
                     uri_list.extend(uri_childs)
 
-        return doc.toxml(encoding="utf-8")
+        return doc.toxml(encoding="utf-8") + b"\n"
 
diff --git a/pywebdav/lib/utils.py b/pywebdav/lib/utils.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 import time
 import re
+import os
 
 from xml.dom import minidom
 from six.moves import urllib
@@ -75,10 +76,9 @@ def create_treelist(dataclass,uri):
 
 def is_prefix(uri1,uri2):
     """ returns 1 of uri1 is a prefix of uri2 """
-    if uri2[:len(uri1)]==uri1:
-        return 1
-    else:
-        return None
+    path1 = urllib.parse.urlparse(uri1).path
+    path2 = urllib.parse.urlparse(uri2).path
+    return os.path.commonpath([path1, path2]) == path2
 
 def quote_uri(uri):
     """ quote an URL but not the protocol part """
@@ -122,7 +122,7 @@ def make_xmlresponse(result):
         re.appendChild(st)
         doc.documentElement.appendChild(re)
 
-    return doc.toxml(encoding="utf-8")
+    return doc.toxml(encoding="utf-8") + b"\n"
 
 # taken from App.Common