diff --git a/service/copyparty/service.pkl b/service/copyparty/service.pkl index ea1e6d9a8c6d7e9f7cdd9be88189e6468f864aad..06be9ff73cfe613c084d5bcdf956bb4b17dd2f1e 100644 --- a/service/copyparty/service.pkl +++ b/service/copyparty/service.pkl @@ -13,6 +13,10 @@ secrets { container { image = "docker.io/copyparty/ac@sha256:b2054d65e05daa8982ca17c26b12b74315c0ce586a03ff9018a59c80731b9e19" + env { + ["PYTHONPATH"] = "/patch" + } + http { containerPort = 3923 subdomain = "file" @@ -32,6 +36,7 @@ container { ["/cfg"] {} ["/w"] {} ["/hooks/reject-apple-cruft.py"] { config = "reject-apple-cruft.py" } + ["/patch/sitecustomize.py"] { config = "share-delete.py" } ["/w/clover"] { src = if (site.preview) null else site.cloverRoot; readOnly = site.cloverReadOnly } ["/w/clover/Media"] { src = if (site.preview) null else site.mediaRoot; readOnly = site.mediaReadOnly } ["/w/media"] { src = if (site.preview) null else site.mediaRoot; readOnly = site.mediaReadOnly } diff --git a/service/copyparty/share-delete.py b/service/copyparty/share-delete.py new file mode 100644 index 0000000000000000000000000000000000000000..90bc65859008462ceff2a5f60a6fc3a7f1308a9d --- /dev/null +++ b/service/copyparty/share-delete.py @@ -0,0 +1,49 @@ +"""Lets share links with the delete right delete files, as the share's owner. + +Upstream refuses every non-unpost delete inside a share because deletion runs +against the source volume, so this maps each share path onto its source folder. +""" +import importlib.machinery +import sys + + +def patch(httpcli): + original = httpcli.HttpCli.handle_rm + + def handle_rm(self, req): + share = self.vn + if not share.shr_src or "unpost" in self.uparam or self.args.no_del: + return original(self, req) + if not req: + req = [self.vpath] + elif self.is_vproxied: + req = [path[len(self.args.SR):] for path in req] + source, root = share.shr_src + paths = [] + for path in req: + node, rem = self.asrv.vfs.get(path.strip("/"), self.uname, False, False, False, True) + if node is not share or not rem or share.shr_files and rem.split("/")[0] not in share.shr_files: + raise httpcli.Pebkac(403, "only files and folders inside this share can be deleted") + paths.append("/".join(part for part in (source.vpath, root, rem) if part)) + limit = int(self.uparam.get("lim") or 0) + result = self.conn.hsrv.broker.ask( + "up2k.handle_rm", share.shr_owner, self.ip, paths, [limit, limit] if limit else [], False, False) + self.loud_reply(result.get()) + return True + + httpcli.HttpCli.handle_rm = handle_rm + + +class Finder: + @staticmethod + def find_spec(name, path, target=None): + if name != "copyparty.httpcli": + return None + sys.meta_path.remove(Finder) + spec = importlib.machinery.PathFinder.find_spec(name, path) + load = spec.loader.exec_module + spec.loader.exec_module = lambda module: (load(module), patch(module)) + return spec + + +sys.meta_path.insert(0, Finder)