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

dirkeys: fix 403 in dks volumes

Browse source
This commit is contained in:
ed 2024-03-27 20:34:34 +00:00
parent 32c912bb16
commit ef52e2c06c
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
copyparty/httpcli.py
View file

@ -2875,7 +2875,7 @@ class HttpCli(object):
return file_lastmod, True return file_lastmod, True
def _use_dirkey(self, ap: str = "", throw: bool = False) -> bool: def _use_dirkey(self, ap: str = "") -> bool:
if self.can_read or not self.can_get: if self.can_read or not self.can_get:
return False return False
@ -2894,9 +2894,6 @@ class HttpCli(object):
t = "wrong dirkey, want %s, got %s\n vp: %s\n ap: %s" t = "wrong dirkey, want %s, got %s\n vp: %s\n ap: %s"
self.log(t % (zs, req, self.req, ap), 6) self.log(t % (zs, req, self.req, ap), 6)
if throw:
raise Pebkac(403)
return False return False
def _expand(self, txt: str, phs: list[str]) -> str: def _expand(self, txt: str, phs: list[str]) -> str:
@ -3608,8 +3605,7 @@ class HttpCli(object):
dk_sz = False dk_sz = False
if dk: if dk:
vn, rem = vfs.get(top, self.uname, False, False) vn, rem = vfs.get(top, self.uname, False, False)
if vn.flags.get("dks"): if vn.flags.get("dks") and self._use_dirkey(vn.canonical(rem)):
self._use_dirkey(vn.canonical(rem), True)
dk_sz = vn.flags.get("dk") dk_sz = vn.flags.get("dk")
dots = False dots = False
@ -3623,7 +3619,9 @@ class HttpCli(object):
[[True, False], [False, True]], [[True, False], [False, True]],
) )
dots = self.uname in vn.axs.udot dots = self.uname in vn.axs.udot
dk_sz = vn.flags.get("dk")
except: except:
dk_sz = None
vfs_ls = [] vfs_ls = []
vfs_virt = {} vfs_virt = {}
for v in self.rvol: for v in self.rvol: