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

let webdav replace empty files when sufficiently safe

Browse source
This commit is contained in:
ed 2022-10-22 01:31:18 +02:00
parent 32e826efbc
commit 1c2fedd2bf
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
copyparty/httpcli.py
View file

@ -404,7 +404,7 @@ class HttpCli(object):
elif self.mode == "PROPFIND": elif self.mode == "PROPFIND":
return self.handle_propfind() and self.keepalive return self.handle_propfind() and self.keepalive
elif self.mode == "DELETE": elif self.mode == "DELETE":
return self.handle_rm([]) and self.keepalive return self.handle_delete() and self.keepalive
elif self.mode == "PROPPATCH": elif self.mode == "PROPPATCH":
return self.handle_proppatch() and self.keepalive return self.handle_proppatch() and self.keepalive
elif self.mode == "LOCK": elif self.mode == "LOCK":
@ -1041,6 +1041,10 @@ class HttpCli(object):
self.send_headers(0, 200, headers=ret) self.send_headers(0, 200, headers=ret)
return True return True
def handle_delete(self) -> bool:
self.log("DELETE " + self.req)
return self.handle_rm([])
def handle_put(self) -> bool: def handle_put(self) -> bool:
self.log("PUT " + self.req) self.log("PUT " + self.req)
@ -1232,8 +1236,22 @@ class HttpCli(object):
if rnd and not self.args.nw: if rnd and not self.args.nw:
fn = self.rand_name(fdir, fn, rnd) fn = self.rand_name(fdir, fn, rnd)
if is_put and "daw" in vfs.flags: if is_put and self.args.dav:
params["overwrite"] = "a" # allow overwrite if volflag daw is set, or all the following is true:
# * file exists and is empty
# * there is no .PARTIAL
path = os.path.join(fdir, fn)
tnam = fn + ".PARTIAL"
if self.args.dotpart:
tnam = "." + tnam
if "daw" in vfs.flags or (
not bos.path.exists(os.path.join(fdir, tnam))
and bos.path.exists(path)
and not bos.path.getsize(path)
):
params["overwrite"] = "a"
with ren_open(fn, *open_a, **params) as zfw: with ren_open(fn, *open_a, **params) as zfw:
f, fn = zfw["orz"] f, fn = zfw["orz"]