mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 09:02:15 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix v1.16.0 webdav upload regression; closes #119

Browse source
This commit is contained in:
ed 2024-11-23 23:32:56 +00:00
parent b10843d051
commit 7dfbfc7227
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
copyparty/httpcli.py
View file

@ -704,7 +704,7 @@ class HttpCli(object):
if pex.code != 404 or self.do_log: if pex.code != 404 or self.do_log:
self.log( self.log(
"%s\033[0m, %s" % (msg, self.vpath), "http%d: %s\033[0m, %s" % (pex.code, msg, self.vpath),
6 if em.startswith("client d/c ") else 3, 6 if em.startswith("client d/c ") else 3,
) )
@ -1413,12 +1413,13 @@ class HttpCli(object):
vst = os.stat_result((16877, -1, -1, 1, 1000, 1000, 8, zi, zi, zi)) vst = os.stat_result((16877, -1, -1, 1, 1000, 1000, 8, zi, zi, zi))
try: try:
topdir = {"vp": "", "st": bos.stat(tap)} st = bos.stat(tap)
except OSError as ex: except OSError as ex:
if ex.errno not in (errno.ENOENT, errno.ENOTDIR): if ex.errno not in (errno.ENOENT, errno.ENOTDIR):
raise raise
raise Pebkac(404) raise Pebkac(404)
topdir = {"vp": "", "st": st}
fgen: Iterable[dict[str, Any]] = [] fgen: Iterable[dict[str, Any]] = []
depth = self.headers.get("depth", "infinity").lower() depth = self.headers.get("depth", "infinity").lower()
@ -1454,6 +1455,12 @@ class HttpCli(object):
wrap=False, wrap=False,
) )
elif depth == "0" or not stat.S_ISDIR(st.st_mode):
# propfind on a file; return as topdir
if not self.can_read and not self.can_get:
self.log("inaccessible: [%s]" % (self.vpath,))
raise Pebkac(401, "authenticate")
elif depth == "1": elif depth == "1":
_, vfs_ls, vfs_virt = vn.ls( _, vfs_ls, vfs_virt = vn.ls(
rem, rem,
@ -1472,9 +1479,6 @@ class HttpCli(object):
fgen = [{"vp": vp, "st": st} for vp, st in vfs_ls] fgen = [{"vp": vp, "st": st} for vp, st in vfs_ls]
fgen += [{"vp": v, "st": vst} for v in vfs_virt] fgen += [{"vp": v, "st": vst} for v in vfs_virt]
elif depth == "0":
pass
else: else:
t = "invalid depth value '{}' (must be either '0' or '1'{})" t = "invalid depth value '{}' (must be either '0' or '1'{})"
t2 = " or 'infinity'" if self.args.dav_inf else "" t2 = " or 'infinity'" if self.args.dav_inf else ""