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: add volflag dky (skip keycheck)

Browse source
This commit is contained in:
ed 2024-03-27 21:03:58 +00:00
parent ef52e2c06c
commit 0ae12868e5
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1852,6 +1852,8 @@ share specific folders in a volume without giving away full read-access to the
volflag `dk` generates dirkeys (per-directory accesskeys) for all folders, granting read-access to that folder; by default only that folder itself, no subfolders volflag `dk` generates dirkeys (per-directory accesskeys) for all folders, granting read-access to that folder; by default only that folder itself, no subfolders
volflag `dky` disables the actual key-check, meaning anyone can see the contents of a folder where they have `g` access, but not its subdirectories
volflag `dks` lets people enter subfolders as well, and also enables download-as-zip/tar volflag `dks` lets people enter subfolders as well, and also enables download-as-zip/tar
dirkeys are generated based on another salt (`--dk-salt`) + filesystem-path and have a few limitations: dirkeys are generated based on another salt (`--dk-salt`) + filesystem-path and have a few limitations:

7
copyparty/authsrv.py
View file

@ -1688,8 +1688,15 @@ class AuthSrv(object):
dk = vol.flags.get("dk") dk = vol.flags.get("dk")
dks = vol.flags.get("dks") dks = vol.flags.get("dks")
dky = vol.flags.get("dky")
if dks is not None and dky is not None:
t = "WARNING: volume /%s has both dks and dky enabled; this is too yolo and not permitted"
raise Exception(t % (vol.vpath,))
if dks and not dk: if dks and not dk:
dk = dks dk = dks
if dky and not dk:
dk = dky
if dk: if dk:
vol.flags["dk"] = int(dk) if dk is not True else 8 vol.flags["dk"] = int(dk) if dk is not True else 8

10
copyparty/httpcli.py
View file

@ -2879,6 +2879,9 @@ class HttpCli(object):
if self.can_read or not self.can_get: if self.can_read or not self.can_get:
return False return False
if self.vn.flags.get("dky"):
return True
req = self.uparam.get("k") or "" req = self.uparam.get("k") or ""
if not req: if not req:
return False return False
@ -4234,8 +4237,11 @@ class HttpCli(object):
add_fk = vf.get("fk") add_fk = vf.get("fk")
fk_alg = 2 if "fka" in vf else 1 fk_alg = 2 if "fka" in vf else 1
if add_dk: if add_dk:
zs = self.gen_fk(2, self.args.dk_salt, abspath, 0, 0)[:add_dk] if vf.get("dky"):
ls_ret["dk"] = cgv["dk"] = zs add_dk = False
else:
zs = self.gen_fk(2, self.args.dk_salt, abspath, 0, 0)[:add_dk]
ls_ret["dk"] = cgv["dk"] = zs
dirs = [] dirs = []
files = [] files = []