| author | |
| committer | |
| log | eb8d89d397b222c147975b63bb30fcc8fd959468 |
| tree | b91754c45527fd72485359434d3a68725ab69740 |
| parent | a6e4327e47cc55ebb24fa311e6f9408bc61ec773 |
| signature | Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU |
Copyparty refuses every non-unpost delete inside a share. A sitecustomize
patch maps share paths onto the source folder and deletes as the share
owner, refusing the share root and paths outside the share.
Assisted-by: claude-opus-5.52 files changed, 54 insertions(+), 0 deletions(-)
service/copyparty/service.pkl+5| ... | @@ -13,6 +13,10 @@ secrets { | ... | @@ -13,6 +13,10 @@ secrets { |
| 13 | container { | 13 | container { |
| 14 | image = "docker.io/copyparty/ac@sha256:b2054d65e05daa8982ca17c26b12b74315c0ce586a03ff9018a59c80731b9e19" | 14 | image = "docker.io/copyparty/ac@sha256:b2054d65e05daa8982ca17c26b12b74315c0ce586a03ff9018a59c80731b9e19" |
| 15 | 15 | ||
| 16 | env { | ||
| 17 | ["PYTHONPATH"] = "/patch" | ||
| 18 | } | ||
| 19 | |||
| 16 | http { | 20 | http { |
| 17 | containerPort = 3923 | 21 | containerPort = 3923 |
| 18 | subdomain = "file" | 22 | subdomain = "file" |
| ... | @@ -32,6 +36,7 @@ container { | ... | @@ -32,6 +36,7 @@ container { |
| 32 | ["/cfg"] {} | 36 | ["/cfg"] {} |
| 33 | ["/w"] {} | 37 | ["/w"] {} |
| 34 | ["/hooks/reject-apple-cruft.py"] { config = "reject-apple-cruft.py" } | 38 | ["/hooks/reject-apple-cruft.py"] { config = "reject-apple-cruft.py" } |
| 39 | ["/patch/sitecustomize.py"] { config = "share-delete.py" } | ||
| 35 | ["/w/clover"] { src = if (site.preview) null else site.cloverRoot; readOnly = site.cloverReadOnly } | 40 | ["/w/clover"] { src = if (site.preview) null else site.cloverRoot; readOnly = site.cloverReadOnly } |
| 36 | ["/w/clover/Media"] { src = if (site.preview) null else site.mediaRoot; readOnly = site.mediaReadOnly } | 41 | ["/w/clover/Media"] { src = if (site.preview) null else site.mediaRoot; readOnly = site.mediaReadOnly } |
| 37 | ["/w/media"] { src = if (site.preview) null else site.mediaRoot; readOnly = site.mediaReadOnly } | 42 | ["/w/media"] { src = if (site.preview) null else site.mediaRoot; readOnly = site.mediaReadOnly } |
service/copyparty/share-delete.py created+49| ... | @@ -0,0 +1,49 @@ | ||
| 1 | """Lets share links with the delete right delete files, as the share's owner. | ||
| 2 | |||
| 3 | Upstream refuses every non-unpost delete inside a share because deletion runs | ||
| 4 | against the source volume, so this maps each share path onto its source folder. | ||
| 5 | """ | ||
| 6 | import importlib.machinery | ||
| 7 | import sys | ||
| 8 | |||
| 9 | |||
| 10 | def patch(httpcli): | ||
| 11 | original = httpcli.HttpCli.handle_rm | ||
| 12 | |||
| 13 | def handle_rm(self, req): | ||
| 14 | share = self.vn | ||
| 15 | if not share.shr_src or "unpost" in self.uparam or self.args.no_del: | ||
| 16 | return original(self, req) | ||
| 17 | if not req: | ||
| 18 | req = [self.vpath] | ||
| 19 | elif self.is_vproxied: | ||
| 20 | req = [path[len(self.args.SR):] for path in req] | ||
| 21 | source, root = share.shr_src | ||
| 22 | paths = [] | ||
| 23 | for path in req: | ||
| 24 | node, rem = self.asrv.vfs.get(path.strip("/"), self.uname, False, False, False, True) | ||
| 25 | if node is not share or not rem or share.shr_files and rem.split("/")[0] not in share.shr_files: | ||
| 26 | raise httpcli.Pebkac(403, "only files and folders inside this share can be deleted") | ||
| 27 | paths.append("/".join(part for part in (source.vpath, root, rem) if part)) | ||
| 28 | limit = int(self.uparam.get("lim") or 0) | ||
| 29 | result = self.conn.hsrv.broker.ask( | ||
| 30 | "up2k.handle_rm", share.shr_owner, self.ip, paths, [limit, limit] if limit else [], False, False) | ||
| 31 | self.loud_reply(result.get()) | ||
| 32 | return True | ||
| 33 | |||
| 34 | httpcli.HttpCli.handle_rm = handle_rm | ||
| 35 | |||
| 36 | |||
| 37 | class Finder: | ||
| 38 | @staticmethod | ||
| 39 | def find_spec(name, path, target=None): | ||
| 40 | if name != "copyparty.httpcli": | ||
| 41 | return None | ||
| 42 | sys.meta_path.remove(Finder) | ||
| 43 | spec = importlib.machinery.PathFinder.find_spec(name, path) | ||
| 44 | load = spec.loader.exec_module | ||
| 45 | spec.loader.exec_module = lambda module: (load(module), patch(module)) | ||
| 46 | return spec | ||
| 47 | |||
| 48 | |||
| 49 | sys.meta_path.insert(0, Finder) | ||