Skip to content

Fix RemoteResourceNotFound in Request::info when webdav_root include special characters on ownCloud/NextCloud server #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix RemoteResourceNotFound in Request::info when webdav_root include special characters on ownCloud/NextCloud server #26

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e05548c
Fix RemoteResourceNotFound in Request::info when webdav_root includes…
romrom1948 Mar 25, 2019
978aee7
Fix RemoteResourceNotFound in Request::is_dir when webdav_root includ…
romrom1948 Mar 26, 2019
31e39ad
Merge pull request #2 from romrom1948/romrom1948-patch-nc-quote-2
romrom1948 Mar 26, 2019
dd11bf0
Merge pull request #1 from romrom1948/romrom1948-patch-nc-quote
romrom1948 Mar 26, 2019
9a887c8
Add etag support in webdav.client.info() (code from https://github.co…
romrom1948 Nov 6, 2019
e5203f9
Fix bug in #e05548c54f85999ca6bc507482e7098cca03cfd9
romrom1948 Nov 6, 2019
d5723b9
Fix the output of Request::list when path includes special characters…
romrom1948 Nov 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions webdav/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def parse(response):
urns = parse(response)

path = "{root}{path}".format(root=self.webdav.root, path=directory_urn.path())
return [urn.filename() for urn in urns if urn.path() != path and urn.path() != path[:-1]]
return [urn.filename() for urn in urns if urn.path() != unquote(path) and urn.path() != unquote(path[:-1])]

except pycurl.error:
raise NotConnection(self.webdav.hostname)
Expand Down Expand Up @@ -751,7 +751,8 @@ def parse(response, path):
'created': ".//{DAV:}creationdate",
'name': ".//{DAV:}displayname",
'size': ".//{DAV:}getcontentlength",
'modified': ".//{DAV:}getlastmodified"
'modified': ".//{DAV:}getlastmodified",
'etag': ".//{DAV:}getetag"
}

resps = tree.findall("{DAV:}response")
Expand All @@ -765,13 +766,19 @@ def parse(response, path):
continue
else:
path_with_sep = "{path}{sep}".format(path=path, sep=Urn.separate)
if not path == urn and not path_with_sep == urn:
path_unquoted = unquote(path)
if not path == urn and not path_with_sep == urn and not path_unquoted == urn:
continue

info = dict()
for (name, value) in find_attributes.items():
info[name] = resp.findtext(value)
return info

try:
info['etag'] = info['etag'][1:-1] # remove quotes from etag
except KeyError:
pass

raise RemoteResourceNotFound(path)
except etree.XMLSyntaxError:
Expand Down Expand Up @@ -800,7 +807,7 @@ def parse(response, path):

path = "{root}{path}".format(root=self.webdav.root, path=urn.path())

return parse(response, path)
return parse(response, unquote(path))

except pycurl.error:
raise NotConnection(self.webdav.hostname)
Expand All @@ -824,7 +831,9 @@ def parse(response, path):
continue
else:
path_with_sep = "{path}{sep}".format(path=path, sep=Urn.separate)
if not path == urn and not path_with_sep == urn:
path_unquoted = unquote(path)

if not path == urn and not path_with_sep == urn and not path_unquoted == urn:
continue
type = resp.find(".//{DAV:}resourcetype")
if type is None:
Expand Down