yetangitu/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-10-05 19:42:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dirkeys' into hovudstraum

Browse source
This commit is contained in:
ed 2024-03-25 10:34:08 +00:00
commit 20870fda79
9 changed files with 256 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

12
copyparty/authsrv.py
View file

@ -555,7 +555,12 @@ class VFS(object):
# no vfs nodes in the list of real inodes
real = [x for x in real if x[0] not in self.nodes]
dbv = self.dbv or self
for name, vn2 in sorted(self.nodes.items()):
if vn2.dbv == dbv and self.flags.get("dk"):
virt_vis[name] = vn2
continue
ok = False
zx = vn2.axs
axs = [zx.uread, zx.uwrite, zx.umove, zx.udel, zx.uget]
@ -1681,6 +1686,13 @@ class AuthSrv(object):
vol.flags["fk"] = int(fk) if fk is not True else 8
have_fk = True
dk = vol.flags.get("dk")
dks = vol.flags.get("dks")
if dks and not dk:
dk = dks
if dk:
vol.flags["dk"] = int(dk) if dk is not True else 8
if have_fk and re.match(r"^[0-9\.]+$", self.args.fk_salt):
self.log("filekey salt: {}".format(self.args.fk_salt))