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

webdav: misc fixes

Browse source
This commit is contained in:
ed 2022-11-26 20:06:48 +00:00
parent 53b32f97e8
commit c1315a3b39
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
copyparty/__init__.py
View file

@ -12,11 +12,11 @@ except:
TYPE_CHECKING = False TYPE_CHECKING = False
if True: if True:
from typing import Any, Callable from typing import Any, Union, Callable
PY2 = sys.version_info < (3,) PY2 = sys.version_info < (3,)
if not PY2: if not PY2:
unicode: Callable[[str], str] = str unicode: Callable[[Union[str, int, float]], str] = str
else: else:
sys.dont_write_bytecode = True sys.dont_write_bytecode = True
unicode = unicode # noqa: F821 # pylint: disable=undefined-variable,self-assigning-variable unicode = unicode # noqa: F821 # pylint: disable=undefined-variable,self-assigning-variable

18
copyparty/httpcli.py
View file

@ -425,7 +425,7 @@ class HttpCli(object):
raise Pebkac(400, 'invalid HTTP mode "{0}"'.format(self.mode)) raise Pebkac(400, 'invalid HTTP mode "{0}"'.format(self.mode))
except Exception as ex: except Exception as ex:
if not hasattr(ex, "code"): if not isinstance(ex, Pebkac):
pex = Pebkac(500) pex = Pebkac(500)
else: else:
pex: Pebkac = ex # type: ignore pex: Pebkac = ex # type: ignore
@ -793,6 +793,10 @@ class HttpCli(object):
_, vfs_ls, vfs_virt = vn.ls( _, vfs_ls, vfs_virt = vn.ls(
rem, self.uname, not self.args.no_scandir, [[True, False]] rem, self.uname, not self.args.no_scandir, [[True, False]]
) )
if not self.args.ed:
names = set(exclude_dotfiles([x[0] for x in vfs_ls]))
vfs_ls = [x for x in vfs_ls if x[0] in names]
zi = int(time.time()) zi = int(time.time())
zsr = os.stat_result((16877, -1, -1, 1, 1000, 1000, 8, zi, zi, zi)) zsr = os.stat_result((16877, -1, -1, 1, 1000, 1000, 8, zi, zi, zi))
ls = [{"vp": vp, "st": st} for vp, st in vfs_ls] ls = [{"vp": vp, "st": st} for vp, st in vfs_ls]
@ -826,22 +830,21 @@ class HttpCli(object):
ret = '<?xml version="1.0" encoding="{}"?>\n<D:multistatus xmlns:D="DAV:">' ret = '<?xml version="1.0" encoding="{}"?>\n<D:multistatus xmlns:D="DAV:">'
ret = ret.format(uenc) ret = ret.format(uenc)
for x in fgen: for x in fgen:
vp = x["vp"] rp = vjoin(vtop, x["vp"])
st: os.stat_result = x["st"] st: os.stat_result = x["st"]
rp = vjoin(vtop, vp)
isdir = stat.S_ISDIR(st.st_mode) isdir = stat.S_ISDIR(st.st_mode)
t = "<D:response><D:href>/{}{}</D:href><D:propstat><D:prop>" t = "<D:response><D:href>/{}{}</D:href><D:propstat><D:prop>"
ret += t.format(quotep(rp), "/" if isdir and vp else "") ret += t.format(quotep(rp), "/" if isdir and rp else "")
pvs: dict[str, str] = { pvs: dict[str, str] = {
"displayname": html_escape(vp.split("/")[-1]), "displayname": html_escape(rp.split("/")[-1]),
"getlastmodified": formatdate(st.st_mtime, usegmt=True), "getlastmodified": formatdate(st.st_mtime, usegmt=True),
"resourcetype": '<D:collection xmlns:D="DAV:"/>' if isdir else "", "resourcetype": '<D:collection xmlns:D="DAV:"/>' if isdir else "",
"supportedlock": '<D:lockentry xmlns:D="DAV:"><D:lockscope><D:exclusive/></D:lockscope><D:locktype><D:write/></D:locktype></D:lockentry>', "supportedlock": '<D:lockentry xmlns:D="DAV:"><D:lockscope><D:exclusive/></D:lockscope><D:locktype><D:write/></D:locktype></D:lockentry>',
} }
if not isdir: if not isdir:
pvs["getcontenttype"] = guess_mime(vp) pvs["getcontenttype"] = guess_mime(rp)
pvs["getcontentlength"] = str(st.st_size) pvs["getcontentlength"] = str(st.st_size)
for k, v in pvs.items(): for k, v in pvs.items():
@ -868,6 +871,7 @@ class HttpCli(object):
ret = self.send_chunk(ret, enc, chunksz) ret = self.send_chunk(ret, enc, chunksz)
self.send_chunk("", enc, chunksz) self.send_chunk("", enc, chunksz)
# self.reply(ret.encode(enc, "replace"),207, "text/xml; charset=" + enc)
return True return True
def handle_proppatch(self) -> bool: def handle_proppatch(self) -> bool:
@ -882,6 +886,7 @@ class HttpCli(object):
raise Pebkac(401, "authenticate") raise Pebkac(401, "authenticate")
from xml.etree import ElementTree as ET from xml.etree import ElementTree as ET
from .dxml import mkenod, mktnod, parse_xml from .dxml import mkenod, mktnod, parse_xml
self.asrv.vfs.get(self.vpath, self.uname, False, False) self.asrv.vfs.get(self.vpath, self.uname, False, False)
@ -940,6 +945,7 @@ class HttpCli(object):
raise Pebkac(401, "authenticate") raise Pebkac(401, "authenticate")
from xml.etree import ElementTree as ET from xml.etree import ElementTree as ET
from .dxml import mkenod, mktnod, parse_xml from .dxml import mkenod, mktnod, parse_xml
vn, rem = self.asrv.vfs.get(self.vpath, self.uname, False, False) vn, rem = self.asrv.vfs.get(self.vpath, self.uname, False, False)