copyparty 1.15.9__py3-none-any.whl → 1.15.10__py3-none-any.whl

copyparty/__main__.py

@@ -1299,6 +1299,7 @@ def add_logging(ap):
     ap2.add_argument("--log-conn", action="store_true", help="debug: print tcp-server msgs")
     ap2.add_argument("--log-htp", action="store_true", help="debug: print http-server threadpool scaling")
     ap2.add_argument("--ihead", metavar="HEADER", type=u, action='append', help="print request \033[33mHEADER\033[0m; [\033[32m*\033[0m]=all")
+    ap2.add_argument("--ohead", metavar="HEADER", type=u, action='append', help="print response \033[33mHEADER\033[0m; [\033[32m*\033[0m]=all")
     ap2.add_argument("--lf-url", metavar="RE", type=u, default=r"^/\.cpr/|\?th=[wj]$|/\.(_|ql_|DS_Store$|localized$)", help="dont log URLs matching regex \033[33mRE\033[0m")
 
 
@@ -1452,6 +1453,7 @@ def add_ui(ap, retry):
     ap2.add_argument("--pb-url", metavar="URL", type=u, default="https://github.com/9001/copyparty", help="powered-by link; disable with \033[33m-np\033[0m")
     ap2.add_argument("--ver", action="store_true", help="show version on the control panel (incompatible with \033[33m-nb\033[0m)")
     ap2.add_argument("--k304", metavar="NUM", type=int, default=0, help="configure the option to enable/disable k304 on the controlpanel (workaround for buggy reverse-proxies); [\033[32m0\033[0m] = hidden and default-off, [\033[32m1\033[0m] = visible and default-off, [\033[32m2\033[0m] = visible and default-on")
+    ap2.add_argument("--no304", metavar="NUM", type=int, default=0, help="configure the option to enable/disable no304 on the controlpanel (workaround for buggy caching in browsers); [\033[32m0\033[0m] = hidden and default-off, [\033[32m1\033[0m] = visible and default-off, [\033[32m2\033[0m] = visible and default-on")
     ap2.add_argument("--md-sbf", metavar="FLAGS", type=u, default="downloads forms popups scripts top-navigation-by-user-activation", help="list of capabilities to ALLOW for README.md docs (volflag=md_sbf); see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/iframe#attr-sandbox")
     ap2.add_argument("--lg-sbf", metavar="FLAGS", type=u, default="downloads forms popups scripts top-navigation-by-user-activation", help="list of capabilities to ALLOW for prologue/epilogue docs  (volflag=lg_sbf)")
     ap2.add_argument("--no-sb-md", action="store_true", help="don't sandbox README/PREADME.md documents (volflags: no_sb_md | sb_md)")
@@ -1749,6 +1751,9 @@ def main(argv  = None)  :
     if al.ihead:
         al.ihead = [x.lower() for x in al.ihead]
 
+    if al.ohead:
+        al.ohead = [x.lower() for x in al.ohead]
+
     if HAVE_SSL:
         if al.ssl_ver:
             configure_ssl_ver(al)

copyparty/__version__.py

@@ -1,8 +1,8 @@
 # coding: utf-8
 
-VERSION = (1, 15, 9)
+VERSION = (1, 15, 10)
 CODENAME = "fill the drives"
-BUILD_DT = (2024, 10, 18)
+BUILD_DT = (2024, 10, 26)
 
 S_VERSION = ".".join(map(str, VERSION))
 S_BUILD_DT = "{0:04d}-{1:02d}-{2:02d}".format(*BUILD_DT)

copyparty/authsrv.py

@@ -545,15 +545,14 @@ class VFS(object):
             return self._get_dbv(vrem)
 
         shv, srem = src
-        return shv, vjoin(srem, vrem)
+        return shv._get_dbv(vjoin(srem, vrem))
 
     def _get_dbv(self, vrem )   :
         dbv = self.dbv
         if not dbv:
             return self, vrem
 
-        tv = [self.vpath[len(dbv.vpath) :].lstrip("/"), vrem]
-        vrem = "/".join([x for x in tv if x])
+        vrem = vjoin(self.vpath[len(dbv.vpath) :].lstrip("/"), vrem)
         return dbv, vrem
 
     def canonical(self, rem , resolve  = True)  :
@@ -2633,7 +2632,7 @@ class AuthSrv(object):
         ]
 
         csv = set("i p th_covers zm_on zm_off zs_on zs_off".split())
-        zs = "c ihead mtm mtp on403 on404 xad xar xau xiu xban xbd xbr xbu xm"
+        zs = "c ihead ohead mtm mtp on403 on404 xad xar xau xiu xban xbd xbr xbu xm"
         lst = set(zs.split())
         askip = set("a v c vc cgen exp_lg exp_md theme".split())
         fskip = set("exp_lg exp_md mv_re_r mv_re_t rm_re_r rm_re_t".split())

copyparty/httpcli.py

@@ -2,7 +2,6 @@
 from __future__ import print_function, unicode_literals
 
 import argparse  # typechk
-import calendar
 import copy
 import errno
 import gzip
@@ -19,7 +18,6 @@ import threading  # typechk
 import time
 import uuid
 from datetime import datetime
-from email.utils import parsedate
 from operator import itemgetter
 
 import jinja2  # typechk
@@ -107,6 +105,7 @@ from .util import (
     unquotep,
     vjoin,
     vol_san,
+    vroots,
     vsplit,
     wrename,
     wunlink,
@@ -123,6 +122,11 @@ _ = (argparse, threading)
 
 NO_CACHE = {"Cache-Control": "no-cache"}
 
+ALL_COOKIES = "k304 no304 js idxh dots cppwd cppws".split()
+
+H_CONN_KEEPALIVE = "Connection: Keep-Alive"
+H_CONN_CLOSE = "Connection: Close"
+
 LOGUES = [[0, ".prologue.html"], [1, ".epilogue.html"]]
 
 READMES = [[0, ["preadme.md", "PREADME.md"]], [1, ["readme.md", "README.md"]]]
@@ -787,11 +791,11 @@ class HttpCli(object):
 
     def k304(self)  :
         k304 = self.cookies.get("k304")
-        return (
-            k304 == "y"
-            or (self.args.k304 == 2 and k304 != "n")
-            or ("; Trident/" in self.ua and not k304)
-        )
+        return k304 == "y" or (self.args.k304 == 2 and k304 != "n")
+
+    def no304(self)  :
+        no304 = self.cookies.get("no304")
+        return no304 == "y" or (self.args.no304 == 2 and no304 != "n")
 
     def _build_html_head(self, maybe_html , kv  )  :
         html = str(maybe_html)
@@ -826,25 +830,28 @@ class HttpCli(object):
     )  :
         response = ["%s %s %s" % (self.http_ver, status, HTTPCODE[status])]
 
-        if length is not None:
-            response.append("Content-Length: " + unicode(length))
-
-        if status == 304 and self.k304():
-            self.keepalive = False
-
-        # close if unknown length, otherwise take client's preference
-        response.append("Connection: " + ("Keep-Alive" if self.keepalive else "Close"))
-        response.append("Date: " + formatdate())
-
         # headers{} overrides anything set previously
         if headers:
             self.out_headers.update(headers)
 
-        # default to utf8 html if no content-type is set
-        if not mime:
-            mime = self.out_headers.get("Content-Type") or "text/html; charset=utf-8"
+        if status == 304:
+            self.out_headers.pop("Content-Length", None)
+            self.out_headers.pop("Content-Type", None)
+            self.out_headerlist.clear()
+            if self.k304():
+                self.keepalive = False
+        else:
+            if length is not None:
+                response.append("Content-Length: " + unicode(length))
+
+            if mime:
+                self.out_headers["Content-Type"] = mime
+            elif "Content-Type" not in self.out_headers:
+                self.out_headers["Content-Type"] = "text/html; charset=utf-8"
 
-        self.out_headers["Content-Type"] = mime
+        # close if unknown length, otherwise take client's preference
+        response.append(H_CONN_KEEPALIVE if self.keepalive else H_CONN_CLOSE)
+        response.append("Date: " + formatdate())
 
         for k, zs in list(self.out_headers.items()) + self.out_headerlist:
             response.append("%s: %s" % (k, zs))
@@ -858,6 +865,19 @@ class HttpCli(object):
                 self.cbonk(self.conn.hsrv.gmal, zs, "cc_hdr", "Cc in out-hdr")
                 raise Pebkac(999)
 
+        if self.args.ohead and self.do_log:
+            keys = self.args.ohead
+            if "*" in keys:
+                lines = response[1:]
+            else:
+                lines = []
+                for zs in response[1:]:
+                    if zs.split(":")[0].lower() in keys:
+                        lines.append(zs)
+            for zs in lines:
+                hk, hv = zs.split(": ")
+                self.log("[O] {}: \033[33m[{}]".format(hk, hv), 5)
+
         response.append("\r\n")
         try:
             self.s.sendall("\r\n".join(response).encode("utf-8"))
@@ -937,13 +957,14 @@ class HttpCli(object):
 
         lines = [
             "%s %s %s" % (self.http_ver or "HTTP/1.1", status, HTTPCODE[status]),
-            "Connection: Close",
+            H_CONN_CLOSE,
         ]
 
         if body:
             lines.append("Content-Length: " + unicode(len(body)))
 
-        self.s.sendall("\r\n".join(lines).encode("utf-8") + b"\r\n\r\n" + body)
+        lines.append("\r\n")
+        self.s.sendall("\r\n".join(lines).encode("utf-8") + body)
 
     def urlq(self, add  , rm )  :
         """
@@ -1177,12 +1198,6 @@ class HttpCli(object):
             if "stack" in self.uparam:
                 return self.tx_stack()
 
-            if "ups" in self.uparam:
-                return self.tx_ups()
-
-            if "k304" in self.uparam:
-                return self.set_k304()
-
             if "setck" in self.uparam:
                 return self.setck()
 
@@ -1198,6 +1213,10 @@ class HttpCli(object):
         if "h" in self.uparam:
             return self.tx_mounts()
 
+        if "ups" in self.uparam:
+            # vpath is used for share translation
+            return self.tx_ups()
+
         if "rss" in self.uparam:
             return self.tx_rss()
 
@@ -2380,6 +2399,15 @@ class HttpCli(object):
             if "purl" in ret:
                 ret["purl"] = self.args.SR + ret["purl"]
 
+        if self.args.shr and self.vpath.startswith(self.args.shr1):
+            # strip common suffix (uploader's folder structure)
+            vp_req, vp_vfs = vroots(self.vpath, vjoin(dbv.vpath, vrem))
+            if not ret["purl"].startswith(vp_vfs):
+                t = "share-mapping failed; req=[%s] dbv=[%s] vrem=[%s] n1=[%s] n2=[%s] purl=[%s]"
+                zt = (self.vpath, dbv.vpath, vrem, vp_req, vp_vfs, ret["purl"])
+                raise Pebkac(500, t % zt)
+            ret["purl"] = vp_req + ret["purl"][len(vp_vfs) :]
+
         ret = json.dumps(ret)
         self.log(ret)
         self.reply(ret.encode("utf-8"), mime="application/json")
@@ -2472,7 +2500,11 @@ class HttpCli(object):
                 chashes.append(siblings[n : n + clen])
 
         vfs, _ = self.asrv.vfs.get(self.vpath, self.uname, False, True)
-        ptop = (vfs.dbv or vfs).realpath
+        ptop = vfs.get_dbv("")[0].realpath
+        # if this is a share, then get_dbv has been overridden to return
+        # the dbv (which does not exist as a property). And its realpath
+        # could point into the middle of its origin vfs node, meaning it
+        # is not necessarily registered with up2k, so get_dbv is crucial
 
         broker = self.conn.hsrv.broker
         x = broker.ask("up2k.handle_chunks", ptop, wark, chashes)
@@ -3378,25 +3410,29 @@ class HttpCli(object):
         self.reply(response.encode("utf-8"))
         return True
 
-    def _chk_lastmod(self, file_ts )   :
+    def _chk_lastmod(self, file_ts )    :
+        # ret: lastmod, do_send, can_range
         file_lastmod = formatdate(file_ts)
-        cli_lastmod = self.headers.get("if-modified-since")
-        if cli_lastmod:
-            try:
-                # some browser append "; length=573"
-                cli_lastmod = cli_lastmod.split(";")[0].strip()
-                cli_dt = parsedate(cli_lastmod)
-                cli_ts = calendar.timegm(cli_dt)
-                return file_lastmod, int(file_ts) > int(cli_ts)
-            except Exception as ex:
-                self.log(
-                    "lastmod {}\nremote: [{}]\n local: [{}]".format(
-                        repr(ex), cli_lastmod, file_lastmod
-                    )
-                )
-                return file_lastmod, file_lastmod != cli_lastmod
+        c_ifrange = self.headers.get("if-range")
+        c_lastmod = self.headers.get("if-modified-since")
+
+        if not c_ifrange and not c_lastmod:
+            return file_lastmod, True, True
+
+        if c_ifrange and c_ifrange != file_lastmod:
+            t = "sending entire file due to If-Range; cli(%s) file(%s)"
+            self.log(t % (c_ifrange, file_lastmod), 6)
+            return file_lastmod, True, False
+
+        do_send = c_lastmod != file_lastmod
+        if do_send and c_lastmod:
+            t = "sending body due to If-Modified-Since cli(%s) file(%s)"
+            self.log(t % (c_lastmod, file_lastmod), 6)
+        elif not do_send and self.no304():
+            do_send = True
+            self.log("sending body due to no304")
 
-        return file_lastmod, True
+        return file_lastmod, do_send, True
 
     def _use_dirkey(self, vn , ap )  :
         if self.can_read or not self.can_get:
@@ -3546,7 +3582,7 @@ class HttpCli(object):
         # if-modified
 
         if file_ts > 0:
-            file_lastmod, do_send = self._chk_lastmod(int(file_ts))
+            file_lastmod, do_send, _ = self._chk_lastmod(int(file_ts))
             self.out_headers["Last-Modified"] = file_lastmod
             if not do_send:
                 status = 304
@@ -3708,7 +3744,7 @@ class HttpCli(object):
         #
         # if-modified
 
-        file_lastmod, do_send = self._chk_lastmod(int(file_ts))
+        file_lastmod, do_send, can_range = self._chk_lastmod(int(file_ts))
         self.out_headers["Last-Modified"] = file_lastmod
         if not do_send:
             status = 304
@@ -3752,7 +3788,14 @@ class HttpCli(object):
 
         # let's not support 206 with compression
         # and multirange / multipart is also not-impl (mostly because calculating contentlength is a pain)
-        if do_send and not is_compressed and hrange and file_sz and "," not in hrange:
+        if (
+            do_send
+            and not is_compressed
+            and hrange
+            and can_range
+            and file_sz
+            and "," not in hrange
+        ):
             try:
                 if not hrange.lower().startswith("bytes"):
                     raise Exception()
@@ -4223,7 +4266,7 @@ class HttpCli(object):
             sz_md = len(lead) + len(fullfile)
 
         file_ts = int(max(ts_md, self.E.t0))
-        file_lastmod, do_send = self._chk_lastmod(file_ts)
+        file_lastmod, do_send, _ = self._chk_lastmod(file_ts)
         self.out_headers["Last-Modified"] = file_lastmod
         self.out_headers.update(NO_CACHE)
         status = 200 if do_send else 304
@@ -4409,7 +4452,7 @@ class HttpCli(object):
             rvol=rvol,
             wvol=wvol,
             avol=avol,
-            in_shr=self.args.shr and self.vpath.startswith(self.args.shr[1:]),
+            in_shr=self.args.shr and self.vpath.startswith(self.args.shr1),
             vstate=vstate,
             ups=ups,
             scanning=vs["scanning"],
@@ -4419,7 +4462,9 @@ class HttpCli(object):
             dbwt=vs["dbwt"],
             url_suf=suf,
             k304=self.k304(),
+            no304=self.no304(),
             k304vis=self.args.k304 > 0,
+            no304vis=self.args.no304 > 0,
             ver=S_VERSION if self.args.ver else "",
             chpw=self.args.chpw and self.uname != "*",
             ahttps="" if self.is_https else "https://" + self.host + self.req,
@@ -4427,29 +4472,21 @@ class HttpCli(object):
         self.reply(html.encode("utf-8"))
         return True
 
-    def set_k304(self)  :
-        v = self.uparam["k304"].lower()
-        if v in "yn":
-            dur = 86400 * 299
-        else:
-            dur = 0
-            v = "x"
-
-        ck = gencookie("k304", v, self.args.R, False, dur)
-        self.out_headerlist.append(("Set-Cookie", ck))
-        self.redirect("", "?h#cc")
-        return True
-
     def setck(self)  :
         k, v = self.uparam["setck"].split("=", 1)
-        t = 0 if v == "" else 86400 * 299
+        t = 0 if v in ("", "x") else 86400 * 299
         ck = gencookie(k, v, self.args.R, False, t)
         self.out_headerlist.append(("Set-Cookie", ck))
-        self.reply(b"o7\n")
+        if "cc" in self.ouparam:
+            self.redirect("", "?h#cc")
+        else:
+            self.reply(b"o7\n")
         return True
 
     def set_cfg_reset(self)  :
-        for k in ("k304", "js", "idxh", "dots", "cppwd", "cppws"):
+        for k in ALL_COOKIES:
+            if k not in self.cookies:
+                continue
             cookie = gencookie(k, "x", self.args.R, False)
             self.out_headerlist.append(("Set-Cookie", cookie))
 
@@ -4479,7 +4516,7 @@ class HttpCli(object):
 
         t = t.format(self.args.SR)
         qv = quotep(self.vpaths) + self.ourlq()
-        in_shr = self.args.shr and self.vpath.startswith(self.args.shr[1:])
+        in_shr = self.args.shr and self.vpath.startswith(self.args.shr1)
         html = self.j2s("splash", this=self, qvpath=qv, in_shr=in_shr, msg=t)
         self.reply(html.encode("utf-8"), status=rc)
         return True
@@ -4642,6 +4679,11 @@ class HttpCli(object):
         lm = "ups [{}]".format(filt)
         self.log(lm)
 
+        if self.args.shr and self.vpath.startswith(self.args.shr1):
+            shr_dbv, shr_vrem = self.vn.get_dbv(self.rem)
+        else:
+            shr_dbv = None
+
         ret   = []
         t0 = time.time()
         lim = time.time() - self.args.unpost
@@ -4662,7 +4704,12 @@ class HttpCli(object):
         else:
             allvols = list(self.asrv.vfs.all_vols.values())
 
-        allvols = [x for x in allvols if "e2d" in x.flags]
+        allvols = [
+            x
+            for x in allvols
+            if "e2d" in x.flags
+            and ("*" in x.axs.uwrite or self.uname in x.axs.uwrite or x == shr_dbv)
+        ]
 
         for vol in allvols:
             cur = idx.get_cur(vol)
@@ -4712,6 +4759,15 @@ class HttpCli(object):
 
         ret = ret[:2000]
 
+        if shr_dbv:
+            # translate vpaths from share-target to share-url
+            # to satisfy access checks
+            vp_shr, vp_vfs = vroots(self.vpath, vjoin(shr_dbv.vpath, shr_vrem))
+            for v in ret:
+                vp = v["vp"]
+                if vp.startswith(vp_vfs):
+                    v["vp"] = vp_shr + vp[len(vp_vfs) :]
+
         if self.is_vproxied:
             for v in ret:
                 v["vp"] = self.args.SR + v["vp"]
@@ -4841,7 +4897,7 @@ class HttpCli(object):
         if m:
             raise Pebkac(400, "sharekey has illegal character [%s]" % (m[1],))
 
-        if vp.startswith(self.args.shr[1:]):
+        if vp.startswith(self.args.shr1):
             raise Pebkac(400, "yo dawg...")
 
         cur = idx.get_shr()

copyparty/svchub.py

@@ -217,13 +217,14 @@ class SvcHub(object):
         args.chpw_no = noch
 
         if args.ipu:
-            iu, nm = load_ipu(self.log, args.ipu)
+            iu, nm = load_ipu(self.log, args.ipu, True)
             setattr(args, "ipu_iu", iu)
             setattr(args, "ipu_nm", nm)
 
         if not self.args.no_ses:
             self.setup_session_db()
 
+        args.shr1 = ""
         if args.shr:
             self.setup_share_db()
 
@@ -372,6 +373,14 @@ class SvcHub(object):
 
         self.broker = Broker(self)
 
+        # create netmaps early to avoid firewall gaps,
+        # but the mutex blocks multiprocessing startup
+        for zs in "ipu_iu ftp_ipa_nm tftp_ipa_nm".split():
+            try:
+                getattr(args, zs).mutex = threading.Lock()
+            except:
+                pass
+
     def setup_session_db(self)  :
         if not HAVE_SQLITE3:
             self.args.no_ses = True
@@ -444,6 +453,7 @@ class SvcHub(object):
             raise Exception(t)
 
         al.shr = "/%s/" % (al.shr,)
+        al.shr1 = al.shr[1:]
 
         create = True
         modified = False
@@ -751,8 +761,8 @@ class SvcHub(object):
         al.idp_h_grp = al.idp_h_grp.lower()
         al.idp_h_key = al.idp_h_key.lower()
 
-        al.ftp_ipa_nm = build_netmap(al.ftp_ipa or al.ipa)
-        al.tftp_ipa_nm = build_netmap(al.tftp_ipa or al.ipa)
+        al.ftp_ipa_nm = build_netmap(al.ftp_ipa or al.ipa, True)
+        al.tftp_ipa_nm = build_netmap(al.tftp_ipa or al.ipa, True)
 
         mte = ODict.fromkeys(DEF_MTE.split(","), True)
         al.mte = odfusion(mte, al.mte)
@@ -799,6 +809,24 @@ class SvcHub(object):
         if len(al.tcolor) == 3:  # fc5 => ffcc55
             al.tcolor = "".join([x * 2 for x in al.tcolor])
 
+        zs = al.u2sz
+        zsl = zs.split(",")
+        if len(zsl) not in (1, 3):
+            t = "invalid --u2sz; must be either one number, or a comma-separated list of three numbers (min,default,max)"
+            raise Exception(t)
+        if len(zsl) < 3:
+            zsl = ["1", zs, zs]
+        zi2 = 1
+        for zs in zsl:
+            zi = int(zs)
+            # arbitrary constraint (anything above 2 GiB is probably unintended)
+            if zi < 1 or zi > 2047:
+                raise Exception("invalid --u2sz; minimum is 1, max is 2047")
+            if zi < zi2:
+                raise Exception("invalid --u2sz; values must be equal or ascending")
+            zi2 = zi
+        al.u2sz = ",".join(zsl)
+
         return True
 
     def _ipa2re(self, txt)  :

copyparty/up2k.py

@@ -3886,11 +3886,9 @@ class Up2k(object):
             if unpost:
                 raise Pebkac(400, "cannot unpost folders")
         elif stat.S_ISLNK(st.st_mode) or stat.S_ISREG(st.st_mode):
-            dbv, vrem = self.asrv.vfs.get(vpath, uname, *permsets[0])
-            dbv, vrem = dbv.get_dbv(vrem)
-            voldir = vsplit(vrem)[0]
+            voldir = vsplit(rem)[0]
             vpath_dir = vsplit(vpath)[0]
-            g = [(dbv, voldir, vpath_dir, adir, [(fn, 0)], [], {})]  # type: ignore
+            g = [(vn, voldir, vpath_dir, adir, [(fn, 0)], [], {})]  # type: ignore
         else:
             self.log("rm: skip type-{:x} file [{}]".format(st.st_mode, atop))
             return 0, [], []
@@ -3917,7 +3915,10 @@ class Up2k(object):
                 volpath = ("%s/%s" % (vrem, fn)).strip("/")
                 vpath = ("%s/%s" % (dbv.vpath, volpath)).strip("/")
                 self.log("rm %s\n  %s" % (vpath, abspath))
-                _ = dbv.get(volpath, uname, *permsets[0])
+                if not unpost:
+                    # recursion-only sanchk
+                    _ = dbv.get(volpath, uname, *permsets[0])
+
                 if xbd:
                     if not runhook(
                         self.log,

copyparty/util.py

@@ -647,13 +647,20 @@ class HLog(logging.Handler):
 
 class NetMap(object):
     def __init__(
-        self, ips , cidrs , keep_lo=False, strict_cidr=False
+        self,
+        ips ,
+        cidrs ,
+        keep_lo=False,
+        strict_cidr=False,
+        defer_mutex=False,
     )  :
         """
         ips: list of plain ipv4/ipv6 IPs, not cidr
         cidrs: list of cidr-notation IPs (ip/prefix)
         """
-        self.mutex = threading.Lock()
+
+        # fails multiprocessing; defer assignment
+        self.mutex  = None if defer_mutex else threading.Lock()
 
         if "::" in ips:
             ips = [x for x in ips if x != "::"] + list(
@@ -692,6 +699,8 @@ class NetMap(object):
         try:
             return self.cache[ip]
         except:
+            # intentionally crash the calling thread if unset:
+
             with self.mutex:
                 return self._map(ip)
 
@@ -2109,6 +2118,23 @@ def unquotep(txt )  :
     return w8dec(unq2)
 
 
+def vroots(vp1 , vp2 )   :
+    """
+    input("q/w/e/r","a/s/d/e/r") output("/q/w/","/a/s/d/")
+    """
+    while vp1 and vp2:
+        zt1 = vp1.rsplit("/", 1) if "/" in vp1 else ("", vp1)
+        zt2 = vp2.rsplit("/", 1) if "/" in vp2 else ("", vp2)
+        if zt1[1] != zt2[1]:
+            break
+        vp1 = zt1[0]
+        vp2 = zt2[0]
+    return (
+        "/%s/" % (vp1,) if vp1 else "/",
+        "/%s/" % (vp2,) if vp2 else "/",
+    )
+
+
 def vsplit(vpath )   :
     if "/" not in vpath:
         return "", vpath
@@ -2568,7 +2594,7 @@ def list_ips()  :
     return list(ret)
 
 
-def build_netmap(csv ):
+def build_netmap(csv , defer_mutex  = False):
     csv = csv.lower().strip()
 
     if csv in ("any", "all", "no", ",", ""):
@@ -2603,10 +2629,12 @@ def build_netmap(csv ):
         cidrs.append(zs)
 
     ips = [x.split("/")[0] for x in cidrs]
-    return NetMap(ips, cidrs, True)
+    return NetMap(ips, cidrs, True, False, defer_mutex)
 
 
-def load_ipu(log , ipus )    :
+def load_ipu(
+    log , ipus , defer_mutex  = False
+)    :
     ip_u = {"": "*"}
     cidr_u = {}
     for ipu in ipus:
@@ -2623,7 +2651,7 @@ def load_ipu(log , ipus )    :
         cidr_u[cidr] = uname
         ip_u[cip] = uname
     try:
-        nm = NetMap(["::"], list(cidr_u.keys()), True, True)
+        nm = NetMap(["::"], list(cidr_u.keys()), True, True, defer_mutex)
     except Exception as ex:
         t = "failed to translate --ipu into netmap, probably due to invalid config: %r"
         log("root", t % (ex,), 1)

copyparty/web/a/partyfuse.py

@@ -844,7 +844,7 @@ def main():
 
     # dircache is always a boost,
     #   only want to disable it for tests etc,
-    cdn = 9  # max num dirs; 0=disable
+    cdn = 24  # max num dirs; keep larger than max dir depth; 0=disable
     cds = 1  # numsec until an entry goes stale
 
     where = "local directory"

copyparty/web/splash.html

@@ -129,11 +129,20 @@
 
 			{% if k304 or k304vis %}
 			{% if k304 %}
-			<li><a id="h" href="{{ r }}/?k304=n">disable k304</a> (currently enabled)
+			<li><a id="h" href="{{ r }}/?cc&setck=k304=n">disable k304</a> (currently enabled)
 			{%- else %}
-			<li><a id="i" href="{{ r }}/?k304=y" class="r">enable k304</a> (currently disabled)
+			<li><a id="i" href="{{ r }}/?cc&setck=k304=y" class="r">enable k304</a> (currently disabled)
 			{% endif %}
-			<blockquote id="j">enabling this will disconnect your client on every HTTP 304, which can prevent some buggy proxies from getting stuck (suddenly not loading pages), <em>but</em> it will also make things slower in general</blockquote></li>
+			<blockquote id="j">enabling k304 will disconnect your client on every HTTP 304, which can prevent some buggy proxies from getting stuck (suddenly not loading pages), <em>but</em> it will also make things slower in general</blockquote></li>
+			{% endif %}
+
+			{% if no304 or no304vis %}
+			{% if no304 %}
+			<li><a id="ab" href="{{ r }}/?cc&setck=no304=n">disable no304</a> (currently enabled)
+			{%- else %}
+			<li><a id="ac" href="{{ r }}/?cc&setck=no304=y" class="r">enable no304</a> (currently disabled)
+			{% endif %}
+			<blockquote id="ad">enabling no304 will disable all caching; try this if k304 wasn't enough. This will waste a huge amount of network traffic!</blockquote></li>
 			{% endif %}
 
 			<li><a id="k" href="{{ r }}/?reset" class="r" onclick="localStorage.clear();return true">reset client settings</a></li>

{copyparty-1.15.9.dist-info → copyparty-1.15.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: copyparty
-Version: 1.15.9
+Version: 1.15.10
 Summary: Portable file server with accelerated resumable uploads, deduplication, WebDAV, FTP, zeroconf, media indexer, video thumbnails, audio transcoding, and write-only folders
 Author-email: ed <copyparty@ocv.me>
 License: MIT
@@ -21,6 +21,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: Jython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -1987,6 +1988,9 @@ quick summary of more eccentric web-browsers trying to view a directory index:
 | **ie4** and **netscape** 4.0  | can browse, upload with `?b=u`, auth with `&pw=wark` |
 | **ncsa mosaic** 2.7       | does not get a pass, [pic1](https://user-images.githubusercontent.com/241032/174189227-ae816026-cf6f-4be5-a26e-1b3b072c1b2f.png) - [pic2](https://user-images.githubusercontent.com/241032/174189225-5651c059-5152-46e9-ac26-7e98e497901b.png) |
 | **SerenityOS** (7e98457)  | hits a page fault, works with `?b=u`, file upload not-impl |
+| **nintendo 3ds**          | can browse, upload, view thumbnails (thx bnjmn) |
+
+<p align="center"><img src="https://github.com/user-attachments/assets/88deab3d-6cad-4017-8841-2f041472b853" /></p>
 
 
 # client examples

{copyparty-1.15.9.dist-info → copyparty-1.15.10.dist-info}/RECORD

@@ -1,7 +1,7 @@
 copyparty/__init__.py,sha256=Chqw7uXX4r_-a2p6-xthrrqVHFI4aZdW45sWU7UvqeE,2597
-copyparty/__main__.py,sha256=rx8OlvcX3M-SQOvkrYT9C-HN7GmlPUx5p_2Vqv_LEo4,110949
-copyparty/__version__.py,sha256=PMcIJPKN9PvxPb2mIFEiFAsp9HLavA8qaM4ckTc7cNE,258
-copyparty/authsrv.py,sha256=Iw_4lJUhRU9q3qCQucGWRtJOFKYrYd5omL5nmwGvw-k,98979
+copyparty/__main__.py,sha256=S9jBx-HMqtUusAjpA64akmN4SKeRMGS5dNfzS4-miC4,111480
+copyparty/__version__.py,sha256=fkcFvGlCD_NUIpsBFycKnSiV9ebZj5bDCWyy5H38XJw,259
+copyparty/authsrv.py,sha256=FNb0l3o57R9xnYrZsqjTOqPwWkXGgP9YdX7NWx0ZMow,98955
 copyparty/broker_mp.py,sha256=jsHUM2BSfRVRyZT869iPCqYEHSqedk6VkwvygZwbEZE,4017
 copyparty/broker_mpw.py,sha256=PYFgQfssOCfdI6qayW1ZjO1j1-7oez094muhYMbPOz0,3339
 copyparty/broker_thr.py,sha256=MXrwjusP0z1LPURUhi5jx_TL3jrXhYcDrJPDSKu6EEU,1705
@@ -11,7 +11,7 @@ copyparty/cfg.py,sha256=E9iBGNjIUrDAPLFRgKsVOmAknP9bDE27xh0gkmNdH1s,10127
 copyparty/dxml.py,sha256=lZpg-kn-kQsXRtNY1n6fRaS-b7uXzMCyv8ovKnhZcZc,1548
 copyparty/fsutil.py,sha256=5CshJWO7CflfaRRNOb3JxghUH7W5rmS_HWNmKfx42MM,4538
 copyparty/ftpd.py,sha256=G_h1urfIikzfCWGXnW9p-rioWdNM_Je6vWYq0-QSbC8,17580
-copyparty/httpcli.py,sha256=irIxsAI0KpNvxoenK16zkezttl4sUSNUB59yBr8L6VA,199053
+copyparty/httpcli.py,sha256=rb-QxygFrRM7LEmTadMKn4FZ2bl5ddoPfJXsRrItKDg,201389
 copyparty/httpconn.py,sha256=mQSgljh0Q-jyWjF4tQLrHbRKRe9WKl19kGqsGMsJpWo,6880
 copyparty/httpsrv.py,sha256=d_UiGnQKniBoEV68lNFgnYm-byda7uj56mFf-YC7piI,17223
 copyparty/ico.py,sha256=eWSxEae4wOCfheHl-m-wchYvFRAR_97kJDb4NGaB-Z8,3561
@@ -24,15 +24,15 @@ copyparty/smbd.py,sha256=Or7RF13cl1r3ncnpVh8BqyAGqH2Oa04O9iPZWCoB0Bo,14609
 copyparty/ssdp.py,sha256=R1Z61GZOxBMF2Sk4RTxKWMOemogmcjEWG-CvLihd45k,7023
 copyparty/star.py,sha256=tV5BbX6AiQ7N4UU8DYtSTckNYeoeey4DBqq4LjfymbY,3818
 copyparty/sutil.py,sha256=JTMrQwcWH85hXB_cKG206eDZ967WZDGaP00AWvl_gB0,3214
-copyparty/svchub.py,sha256=FuQGFBm-lJfe28M-SMBLieHy8jdWIQMkONK2GcWZU_E,40105
+copyparty/svchub.py,sha256=sfA_2BIXf0GP6-vNJGsttcvuVTjMek7TXWoGhYSa1bg,41178
 copyparty/szip.py,sha256=sDypi1_yR6-62fIZ_3D0L9PfIzCUiK_3JqcaJCvTBCs,8601
 copyparty/tcpsrv.py,sha256=l_vb9FoF0AJur0IoqHNUSBDqMgBO_MRUZeDszi1UNfY,19881
 copyparty/tftpd.py,sha256=jZbf2JpeJmkuQWJErmAPG-dKhtYNvIUHbkAgodSXw9Y,13582
 copyparty/th_cli.py,sha256=o6FMkerYvAXS455z3DUossVztu_nzFlYSQhs6qN6Jt8,4636
 copyparty/th_srv.py,sha256=hI9wY1E_9N9Cgqvtr8zADeVqqiLGTiTdAnYAA7WFvJw,29346
 copyparty/u2idx.py,sha256=HLO49L1zmpJtBcJiXgD12a6pAlQdnf2pFelHMA7habw,13462
-copyparty/up2k.py,sha256=2K21-Scz4c3_Y9MzAPmvq3_LEOIkFnx7KLR6hqJkP18,165419
-copyparty/util.py,sha256=eJU7a5O-bZf_MEplCVmLoS3r5mjPC3-2khqZVTYGw-c,92653
+copyparty/up2k.py,sha256=PYAcSuiEJAikQSDGNodyv-jXNtGxmN-KB8_hZ4989Qg,165385
+copyparty/util.py,sha256=bV_zxOiG3GIxt91EkTR7r-YjvR7WOM9IIvg0zuq0s7k,93378
 copyparty/bos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 copyparty/bos/bos.py,sha256=Wb7eWsXJgR5AFlBR9ZOyKrLTwy-Kct9RrGiOu4Jo37Y,1622
 copyparty/bos/path.py,sha256=yEjCq2ki9CvxA5sCT8pS0keEXwugs0ZeUyUhdBziOCI,777
@@ -57,7 +57,7 @@ copyparty/stolen/ifaddr/_win32.py,sha256=EE-QyoBgeB7lYQ6z62VjXNaRozaYfCkaJBHGNA8
 copyparty/web/baguettebox.js.gz,sha256=YIaxFDsubJfGIdzzxA-cL6GwJVmpWZyaPhW9hHcOIIw,7964
 copyparty/web/browser.css.gz,sha256=4bAS9Xkl2fflhaxRSRSVoYQcpXsg1mCWxsYjId7phbU,11610
 copyparty/web/browser.html,sha256=ISpfvWEawufJCYZIqvuXiyUgiXgjmOTtScz4zrEaypI,4870
-copyparty/web/browser.js.gz,sha256=7rubbEoqFlNn7FPF0mz3L2LQeWuPzw95MYpIaZmcczE,84985
+copyparty/web/browser.js.gz,sha256=yDhq0t-6R9OCv--ca_dCCsg7ZkhJjN3Y-9-PQdZPRpg,85071
 copyparty/web/browser2.html,sha256=NRUZ08GH-e2YcGXcoz0UjYg6JIVF42u4IMX4HHwWTmg,1587
 copyparty/web/cf.html,sha256=lJThtNFNAQT1ClCHHlivAkDGE0LutedwopXD62Z8Nys,589
 copyparty/web/dbg-audio.js.gz,sha256=Ma-KZtK8LnmiwNvNKFKXMPYl_Nn_3U7GsJ6-DRWC2HE,688
@@ -75,8 +75,8 @@ copyparty/web/shares.css.gz,sha256=T2fSezuluDVIiNIERAuUREByhHFlIwwNyx7EBOAVVyQ,4
 copyparty/web/shares.html,sha256=ZNHtLBM-Y4BX2qa9AGTrZzZp_IP5PLM3QvFMYKolFfM,2494
 copyparty/web/shares.js.gz,sha256=814O61mxLSWs0AO2fbGJ8d4BSPB7pE9NdkKiVf1gj6E,926
 copyparty/web/splash.css.gz,sha256=RjdNoIT5BSxXRFu0ldMUH4ghRNUMCTs2mGKzstrpI6o,1033
-copyparty/web/splash.html,sha256=pUbsso_W3Q7bso8fy8qxh-fHDrrLm39mBBTIlTeH63w,5235
-copyparty/web/splash.js.gz,sha256=Xoccku-2vE3tABo-88q3Cl4koHs_AE76T8QvMy4u6T8,2540
+copyparty/web/splash.html,sha256=_09d2C79S4sIyaks5pPdq1PBgabdlEFhB6Z-KiynwD8,5699
+copyparty/web/splash.js.gz,sha256=f9aSzI0vw0teK52MBi8Y9FsSMURDfRdZFEvpzqNBon8,2694
 copyparty/web/svcs.html,sha256=P5YZimYLeQMT0uz6u3clQSNZRc5Zs0Ok-ffcbcGSYuc,11762
 copyparty/web/svcs.js.gz,sha256=k81ZvZ3I-f4fMHKrNGGOgOlvXnCBz0mVjD-8mieoWCA,520
 copyparty/web/ui.css.gz,sha256=wloSacrHgP722hy4XiOvVY2GI9-V4zvfvzu84LLWS_o,2779
@@ -84,7 +84,7 @@ copyparty/web/up2k.js.gz,sha256=lGR1Xb0RkIZ1eHmncsSwWRuFc6FC2rZalvjo3oNTV1s,2329
 copyparty/web/util.js.gz,sha256=NvjPYhIa0-C_NhUyW-Ra-XinUCRjj8G3pYq1zJHYWEk,14805
 copyparty/web/w.hash.js.gz,sha256=l3GpSJD6mcU-1CRWkIj7PybgbjlfSr8oeO3vortIrQk,1105
 copyparty/web/a/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-copyparty/web/a/partyfuse.py,sha256=fa9bBYNJHvtWpNVjQyyFzx6JOK7MJL1u0zj80PBYQKs,27960
+copyparty/web/a/partyfuse.py,sha256=efBOupuGVCaGVGylJ-mcx0kz6paqc2sk8kHIprfGUQU,27993
 copyparty/web/a/u2c.py,sha256=ZmLcGuOWB66ZkAMpJBiR1Xpa75PgpzdFRTt3GGVCorc,49533
 copyparty/web/a/webdav-cfg.bat,sha256=Y4NoGZlksAIg4cBMb7KdJrpKC6Nx97onaTl6yMjaimk,1449
 copyparty/web/dd/2.png,sha256=gJ14XFPzaw95L6z92fSq9eMPikSQyu-03P1lgiGe0_I,258
@@ -106,9 +106,9 @@ copyparty/web/deps/prismd.css.gz,sha256=ObUlksQVr-OuYlTz-I4B23TeBg2QDVVGRnWBz8cV
 copyparty/web/deps/scp.woff2,sha256=w99BDU5i8MukkMEL-iW0YO9H4vFFZSPWxbkH70ytaAg,8612
 copyparty/web/deps/sha512.ac.js.gz,sha256=lFZaCLumgWxrvEuDr4bqdKHsqjX82AbVAb7_F45Yk88,7033
 copyparty/web/deps/sha512.hw.js.gz,sha256=vqoXeracj-99Z5MfY3jK2N4WiSzYQdfjy0RnUlQDhSU,8110
-copyparty-1.15.9.dist-info/LICENSE,sha256=gOr4h33pCsBEg9uIy9AYmb7qlocL4V9t2uPJS5wllr0,1072
-copyparty-1.15.9.dist-info/METADATA,sha256=1GMM2x8ZO0z3TgiQgCB6xEiiahXsn3PdeiA7Uni_D_4,139807
-copyparty-1.15.9.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-copyparty-1.15.9.dist-info/entry_points.txt,sha256=4zw6a3rqASywQomiYLObjjlxybaI65LYYOTJwgKz7b0,128
-copyparty-1.15.9.dist-info/top_level.txt,sha256=LnYUPsDyk-8kFgM6YJLG4h820DQekn81cObKSu9g-sI,10
-copyparty-1.15.9.dist-info/RECORD,,
+copyparty-1.15.10.dist-info/LICENSE,sha256=gOr4h33pCsBEg9uIy9AYmb7qlocL4V9t2uPJS5wllr0,1072
+copyparty-1.15.10.dist-info/METADATA,sha256=DhJZfQ1d9CPtx3LXk0ga7thnke1xWg3GJI_HlTPXZLw,140056
+copyparty-1.15.10.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+copyparty-1.15.10.dist-info/entry_points.txt,sha256=4zw6a3rqASywQomiYLObjjlxybaI65LYYOTJwgKz7b0,128
+copyparty-1.15.10.dist-info/top_level.txt,sha256=LnYUPsDyk-8kFgM6YJLG4h820DQekn81cObKSu9g-sI,10
+copyparty-1.15.10.dist-info/RECORD,,