mirror of
https://github.com/9001/copyparty.git
synced 2026-06-18 20:22:27 -06:00
fix wrong dks in tree/navpane (closes #1392);
wrong key due to url-escaped foldername as input also fixes "wrong dirkey" logspam as parent levels are built
This commit is contained in:
parent
ac05b4f1e6
commit
228c3dfa79
|
|
@ -5835,6 +5835,7 @@ class HttpCli(object):
|
|||
excl, target = (target.split("/", 1) + [""])[:2]
|
||||
sub = self.gen_tree("/".join([top, excl]).strip("/"), target, dk)
|
||||
ret["k" + quotep(excl)] = sub
|
||||
dk = ""
|
||||
|
||||
vfs = self.asrv.vfs
|
||||
dk_sz = False
|
||||
|
|
@ -5874,16 +5875,16 @@ class HttpCli(object):
|
|||
else:
|
||||
dirs = exclude_dotfiles(dirs)
|
||||
|
||||
dirs = [quotep(x) for x in dirs if x != excl]
|
||||
|
||||
if dk_sz and fsroot:
|
||||
kdirs = []
|
||||
fsroot_ = os.path.join(fsroot, "")
|
||||
for dn in dirs:
|
||||
for dn in [x for x in dirs if x != excl]:
|
||||
ap = fsroot_ + dn
|
||||
zs = self.gen_fk(2, self.args.dk_salt, ap, 0, 0)[:dk_sz]
|
||||
kdirs.append(dn + "?k=" + zs)
|
||||
kdirs.append(quotep(dn) + "?k=" + zs)
|
||||
dirs = kdirs
|
||||
else:
|
||||
dirs = [quotep(x) for x in dirs if x != excl]
|
||||
|
||||
if vfs_virt:
|
||||
for x in vfs_virt:
|
||||
|
|
|
|||
Loading…
Reference in a new issue