copyparty 1.13.3__py3-none-any.whl → 1.13.4__py3-none-any.whl

copyparty/httpcli.py

@@ -642,8 +642,12 @@ class HttpCli(object):
                 if not self._check_nonfatal(pex, post):
                     self.keepalive = False
 
-                em = str(ex)
-                msg = em if pex is ex else min_ex()
+                if pex is ex:
+                    em = msg = str(ex)
+                else:
+                    em = repr(ex)
+                    msg = min_ex()
+
                 if pex.code != 404 or self.do_log:
                     self.log(
                         "%s\033[0m, %s" % (msg, self.vpath),
@@ -691,6 +695,7 @@ class HttpCli(object):
             self.vpath,
             self.host,
             self.uname,
+            "",
             time.time(),
             0,
             self.ip,
@@ -1627,6 +1632,7 @@ class HttpCli(object):
                                     self.vpath,
                                     self.host,
                                     self.uname,
+                                    self.asrv.vfs.get_perms(self.vpath, self.uname),
                                     time.time(),
                                     len(buf),
                                     self.ip,
@@ -1670,6 +1676,8 @@ class HttpCli(object):
         remains = int(self.headers.get("content-length", -1))
         if remains == -1:
             self.keepalive = False
+            self.in_hdr_recv = True
+            self.s.settimeout(max(self.args.s_tbody // 20, 1))
             return read_socket_unbounded(self.sr, bufsz), remains
         else:
             return read_socket(self.sr, bufsz, remains), remains
@@ -1774,6 +1782,7 @@ class HttpCli(object):
                 self.vpath,
                 self.host,
                 self.uname,
+                self.asrv.vfs.get_perms(self.vpath, self.uname),
                 at,
                 remains,
                 self.ip,
@@ -1864,6 +1873,7 @@ class HttpCli(object):
             self.vpath,
             self.host,
             self.uname,
+            self.asrv.vfs.get_perms(self.vpath, self.uname),
             mt,
             post_sz,
             self.ip,
@@ -1900,6 +1910,9 @@ class HttpCli(object):
                 0 if ANYWIN else bos.stat(path).st_ino,
             )[: vfs.flags["fk"]]
 
+        if "media" in self.uparam or "medialinks" in vfs.flags:
+            vsuf += "&v" if vsuf else "?v"
+
         vpath = "/".join([x for x in [vfs.vpath, rem, fn] if x])
         vpath = quotep(vpath)
 
@@ -2021,7 +2034,7 @@ class HttpCli(object):
 
         v = self.uparam[k]
 
-        if self._use_dirkey():
+        if self._use_dirkey(self.vn, ""):
             vn = self.vn
             rem = self.rem
         else:
@@ -2543,6 +2556,7 @@ class HttpCli(object):
                         self.vpath,
                         self.host,
                         self.uname,
+                        self.asrv.vfs.get_perms(self.vpath, self.uname),
                         at,
                         0,
                         self.ip,
@@ -2606,6 +2620,7 @@ class HttpCli(object):
                         self.vpath,
                         self.host,
                         self.uname,
+                        self.asrv.vfs.get_perms(self.vpath, self.uname),
                         at,
                         sz,
                         self.ip,
@@ -2681,6 +2696,9 @@ class HttpCli(object):
                     0 if ANYWIN or not ap else bos.stat(ap).st_ino,
                 )[: vfs.flags["fk"]]
 
+            if "media" in self.uparam or "medialinks" in vfs.flags:
+                vsuf += "&v" if vsuf else "?v"
+
             vpath = "{}/{}".format(upload_vpath, lfn).strip("/")
             rel_url = quotep(self.args.RS + vpath) + vsuf
             msg += 'sha512: {} // {} // {} bytes // <a href="/{}">{}</a> {}\n'.format(
@@ -2847,6 +2865,7 @@ class HttpCli(object):
                 self.vpath,
                 self.host,
                 self.uname,
+                self.asrv.vfs.get_perms(self.vpath, self.uname),
                 time.time(),
                 0,
                 self.ip,
@@ -2885,6 +2904,7 @@ class HttpCli(object):
             self.vpath,
             self.host,
             self.uname,
+            self.asrv.vfs.get_perms(self.vpath, self.uname),
             new_lastmod,
             sz,
             self.ip,
@@ -2939,22 +2959,24 @@ class HttpCli(object):
 
         return file_lastmod, True
 
-    def _use_dirkey(self, ap  = "")  :
+    def _use_dirkey(self, vn , ap )  :
         if self.can_read or not self.can_get:
             return False
 
-        if self.vn.flags.get("dky"):
+        if vn.flags.get("dky"):
             return True
 
         req = self.uparam.get("k") or ""
         if not req:
             return False
 
-        dk_len = self.vn.flags.get("dk")
+        dk_len = vn.flags.get("dk")
         if not dk_len:
             return False
 
-        ap = ap or self.vn.canonical(self.rem)
+        if not ap:
+            ap = vn.canonical(self.rem)
+
         zs = self.gen_fk(2, self.args.dk_salt, ap, 0, 0)[:dk_len]
         if req == zs:
             return True
@@ -2963,6 +2985,71 @@ class HttpCli(object):
         self.log(t % (zs, req, self.req, ap), 6)
         return False
 
+    def _use_filekey(self, vn , ap , st )  :
+        if self.can_read or not self.can_get:
+            return False
+
+        req = self.uparam.get("k") or ""
+        if not req:
+            return False
+
+        fk_len = vn.flags.get("fk")
+        if not fk_len:
+            return False
+
+        if not ap:
+            ap = self.vn.canonical(self.rem)
+
+        alg = 2 if "fka" in vn.flags else 1
+
+        zs = self.gen_fk(
+            alg, self.args.fk_salt, ap, st.st_size, 0 if ANYWIN else st.st_ino
+        )[:fk_len]
+
+        if req == zs:
+            return True
+
+        t = "wrong filekey, want %s, got %s\n  vp: %s\n  ap: %s"
+        self.log(t % (zs, req, self.req, ap), 6)
+        return False
+
+    def _add_logues(
+        self, vn , abspath , lnames  
+    )   :
+        logues = ["", ""]
+        if not self.args.no_logues:
+            for n, fn in enumerate([".prologue.html", ".epilogue.html"]):
+                if lnames is not None and fn not in lnames:
+                    continue
+                fn = os.path.join(abspath, fn)
+                if bos.path.exists(fn):
+                    with open(fsenc(fn), "rb") as f:
+                        logues[n] = f.read().decode("utf-8")
+                    if "exp" in vn.flags:
+                        logues[n] = self._expand(
+                            logues[n], vn.flags.get("exp_lg") or []
+                        )
+
+        readme = ""
+        if not self.args.no_readme and not logues[1]:
+            if lnames is None:
+                fns = ["README.md", "readme.md"]
+            elif "readme.md" in lnames:
+                fns = [lnames["readme.md"]]
+            else:
+                fns = []
+
+            for fn in fns:
+                fn = os.path.join(abspath, fn)
+                if bos.path.isfile(fn):
+                    with open(fsenc(fn), "rb") as f:
+                        readme = f.read().decode("utf-8")
+                        break
+            if readme and "exp" in vn.flags:
+                readme = self._expand(readme, vn.flags.get("exp_md") or [])
+
+        return logues, readme
+
     def _expand(self, txt , phs )  :
         for ph in phs:
             if ph.startswith("hdr."):
@@ -2992,6 +3079,7 @@ class HttpCli(object):
         logtail = ""
 
         if ptop is not None:
+            ap_data = "<%s>" % (req_path,)
             try:
                 dp, fn = os.path.split(req_path)
                 tnam = fn + ".PARTIAL"
@@ -3338,7 +3426,16 @@ class HttpCli(object):
 
         if lower < upper and not broken:
             with open(req_path, "rb") as f:
-                remains = sendfile_py(self.log, lower, upper, f, self.s, wr_sz, wr_slp)
+                remains = sendfile_py(
+                    self.log,
+                    lower,
+                    upper,
+                    f,
+                    self.s,
+                    wr_sz,
+                    wr_slp,
+                    not self.args.no_poll,
+                )
 
         spd = self._spd((upper - lower) - remains)
         if self.do_log:
@@ -3850,7 +3947,7 @@ class HttpCli(object):
         dk_sz = False
         if dk:
             vn, rem = vfs.get(top, self.uname, False, False)
-            if vn.flags.get("dks") and self._use_dirkey(vn.canonical(rem)):
+            if vn.flags.get("dks") and self._use_dirkey(vn, vn.canonical(rem)):
                 dk_sz = vn.flags.get("dk")
 
         dots = False
@@ -4159,6 +4256,9 @@ class HttpCli(object):
                 add_og = True
             og_fn = ""
 
+        if "v" in self.uparam:
+            add_og = og_ua = True
+
         if "b" in self.uparam:
             self.out_headers["X-Robots-Tag"] = "noindex, nofollow"
 
@@ -4171,9 +4271,20 @@ class HttpCli(object):
             if idx and hasattr(idx, "p_end"):
                 icur = idx.get_cur(dbv)
 
+        if "k" in self.uparam or "dky" in vn.flags:
+            if is_dir:
+                use_dirkey = self._use_dirkey(vn, abspath)
+                use_filekey = False
+            else:
+                use_filekey = self._use_filekey(vn, abspath, st)
+                use_dirkey = False
+        else:
+            use_dirkey = use_filekey = False
+
         th_fmt = self.uparam.get("th")
         if self.can_read or (
-            self.can_get and (vn.flags.get("dk") or "fk" not in vn.flags)
+            self.can_get
+            and (use_filekey or use_dirkey or (not is_dir and "fk" not in vn.flags))
         ):
             if th_fmt is not None:
                 nothumb = "dthumb" in dbv.flags
@@ -4190,18 +4301,21 @@ class HttpCli(object):
                             if cfn:
                                 fn = cfn[0]
                                 fp = os.path.join(abspath, fn)
-                                if bos.path.exists(fp):
-                                    vrem = "{}/{}".format(vrem, fn).strip("/")
-                                    is_dir = False
+                                st = bos.stat(fp)
+                                vrem = "{}/{}".format(vrem, fn).strip("/")
+                                is_dir = False
                         except:
                             pass
                     else:
                         for fn in self.args.th_covers:
                             fp = os.path.join(abspath, fn)
-                            if bos.path.exists(fp):
+                            try:
+                                st = bos.stat(fp)
                                 vrem = "{}/{}".format(vrem, fn).strip("/")
                                 is_dir = False
                                 break
+                            except:
+                                pass
 
                     if is_dir:
                         return self.tx_svg("folder")
@@ -4253,21 +4367,10 @@ class HttpCli(object):
 
         if not is_dir and (self.can_read or self.can_get):
             if not self.can_read and not fk_pass and "fk" in vn.flags:
-                alg = 2 if "fka" in vn.flags else 1
-                correct = self.gen_fk(
-                    alg,
-                    self.args.fk_salt,
-                    abspath,
-                    st.st_size,
-                    0 if ANYWIN else st.st_ino,
-                )[: vn.flags["fk"]]
-                got = self.uparam.get("k")
-                if got != correct:
-                    t = "wrong filekey, want %s, got %s\n  vp: %s\n  ap: %s"
-                    self.log(t % (correct, got, self.req, abspath), 6)
+                if not use_filekey:
                     return self.tx_404()
 
-            if add_og:
+            if add_og and not abspath.lower().endswith(".md"):
                 if og_ua or self.host not in self.headers.get("referer", ""):
                     self.vpath, og_fn = vsplit(self.vpath)
                     vpath = self.vpath
@@ -4282,7 +4385,7 @@ class HttpCli(object):
                 (abspath.endswith(".md") or self.can_delete)
                 and "nohtml" not in vn.flags
                 and (
-                    "v" in self.uparam
+                    ("v" in self.uparam and abspath.endswith(".md"))
                     or "edit" in self.uparam
                     or "edit2" in self.uparam
                 )
@@ -4295,7 +4398,7 @@ class HttpCli(object):
                 )
 
         elif is_dir and not self.can_read:
-            if self._use_dirkey(abspath):
+            if use_dirkey:
                 is_dk = True
             elif not self.can_write:
                 return self.tx_404(True)
@@ -4352,29 +4455,6 @@ class HttpCli(object):
             tpl = "browser2"
             is_js = False
 
-        logues = ["", ""]
-        if not self.args.no_logues:
-            for n, fn in enumerate([".prologue.html", ".epilogue.html"]):
-                fn = os.path.join(abspath, fn)
-                if bos.path.exists(fn):
-                    with open(fsenc(fn), "rb") as f:
-                        logues[n] = f.read().decode("utf-8")
-                    if "exp" in vn.flags:
-                        logues[n] = self._expand(
-                            logues[n], vn.flags.get("exp_lg") or []
-                        )
-
-        readme = ""
-        if not self.args.no_readme and not logues[1]:
-            for fn in ["README.md", "readme.md"]:
-                fn = os.path.join(abspath, fn)
-                if bos.path.isfile(fn):
-                    with open(fsenc(fn), "rb") as f:
-                        readme = f.read().decode("utf-8")
-                        break
-            if readme and "exp" in vn.flags:
-                readme = self._expand(readme, vn.flags.get("exp_md") or [])
-
         vf = vn.flags
         unlist = vf.get("unlist", "")
         ls_ret = {
@@ -4393,8 +4473,6 @@ class HttpCli(object):
             "frand": bool(vn.flags.get("rand")),
             "unlist": unlist,
             "perms": perms,
-            "logues": logues,
-            "readme": readme,
         }
         cgv = {
             "ls0": None,
@@ -4412,8 +4490,8 @@ class HttpCli(object):
             "have_zip": (not self.args.no_zip),
             "have_unpost": int(self.args.unpost),
             "sb_md": "" if "no_sb_md" in vf else (vf.get("md_sbf") or "y"),
-            "readme": readme,
             "dgrid": "grid" in vf,
+            "dgsel": "gsel" in vf,
             "dsort": vf["sort"],
             "dcrop": vf["crop"],
             "dth3x": vf["th3x"],
@@ -4434,7 +4512,6 @@ class HttpCli(object):
             "have_b_u": (self.can_write and self.uparam.get("b") == "u"),
             "sb_lg": "" if "no_sb_lg" in vf else (vf.get("lg_sbf") or "y"),
             "url_suf": url_suf,
-            "logues": logues,
             "title": html_escape("%s %s" % (self.args.bname, self.vpath), crlf=True),
             "srv_info": srv_infot,
             "dtheme": self.args.theme,
@@ -4454,6 +4531,10 @@ class HttpCli(object):
             j2a["no_prism"] = True
 
         if not self.can_read and not is_dk:
+            logues, readme = self._add_logues(vn, abspath, None)
+            ls_ret["logues"] = j2a["logues"] = logues
+            ls_ret["readme"] = cgv["readme"] = readme
+
             if is_ls:
                 return self.tx_ls(ls_ret)
 
@@ -4510,6 +4591,8 @@ class HttpCli(object):
         ):
             ls_names = exclude_dotfiles(ls_names)
 
+        lnames = {x.lower(): x for x in ls_names}
+
         add_dk = vf.get("dk")
         add_fk = vf.get("fk")
         fk_alg = 2 if "fka" in vf else 1
@@ -4699,9 +4782,45 @@ class HttpCli(object):
         else:
             taglist = list(tagset)
 
+        logues, readme = self._add_logues(vn, abspath, lnames)
+        ls_ret["logues"] = j2a["logues"] = logues
+        ls_ret["readme"] = cgv["readme"] = readme
+
         if not files and not dirs and not readme and not logues[0] and not logues[1]:
             logues[1] = "this folder is empty"
 
+        if "descript.ion" in lnames and os.path.isfile(
+            os.path.join(abspath, lnames["descript.ion"])
+        ):
+            rem = []
+            with open(os.path.join(abspath, lnames["descript.ion"]), "rb") as f:
+                for bln in [x.strip() for x in f]:
+                    try:
+                        if bln.endswith(b"\x04\xc2"):
+                            # multiline comment; replace literal r"\n" with " // "
+                            bln = bln.replace(br"\\n", b" // ")[:-2]
+                        ln = bln.decode("utf-8", "replace")
+                        if ln.startswith('"'):
+                            fn, desc = ln.split('" ', 1)
+                            fn = fn[1:]
+                        else:
+                            fn, desc = ln.split(" ", 1)
+                        fe = next(
+                            (x for x in files if x["name"].lower() == fn.lower()), None
+                        )
+                        if fe:
+                            fe["tags"]["descript.ion"] = desc
+                        else:
+                            t = "<li><code>%s</code> %s</li>"
+                            rem.append(t % (html_escape(fn), html_escape(desc)))
+                    except:
+                        pass
+            if "descript.ion" not in taglist:
+                taglist.insert(0, "descript.ion")
+            if rem and not logues[1]:
+                t = "<h3>descript.ion</h3><ul>\n"
+                logues[1] = t + "\n".join(rem) + "</ul>"
+
         if is_ls:
             ls_ret["dirs"] = dirs
             ls_ret["files"] = files
@@ -4771,14 +4890,13 @@ class HttpCli(object):
                         self.conn.hsrv.j2[tpl] = j2env.get_template(tname)
             thumb = ""
             is_pic = is_vid = is_au = False
-            covernames = self.args.th_coversd
-            for fn in ls_names:
-                if fn.lower() in covernames:
-                    thumb = fn
+            for fn in self.args.th_coversd:
+                if fn in lnames:
+                    thumb = lnames[fn]
                     break
             if og_fn:
                 ext = og_fn.split(".")[-1].lower()
-                if ext in self.thumbcli.thumbable:
+                if self.thumbcli and ext in self.thumbcli.thumbable:
                     is_pic = (
                         ext in self.thumbcli.fmt_pil
                         or ext in self.thumbcli.fmt_vips

copyparty/httpsrv.py

@@ -12,7 +12,7 @@ import time
 
 import queue
 
-from .__init__ import ANYWIN, CORES, EXE, MACOS, TYPE_CHECKING, EnvParams
+from .__init__ import ANYWIN, CORES, EXE, MACOS, TYPE_CHECKING, EnvParams, unicode
 
 try:
     MNFE = ModuleNotFoundError
@@ -331,11 +331,11 @@ class HttpSrv(object):
 
             try:
                 sck, saddr = srv_sck.accept()
-                cip, cport = saddr[:2]
+                cip = unicode(saddr[0])
                 if cip.startswith("::ffff:"):
                     cip = cip[7:]
 
-                addr = (cip, cport)
+                addr = (cip, saddr[1])
             except (OSError, socket.error) as ex:
                 if self.stopping:
                     break

copyparty/mdns.py

@@ -357,7 +357,7 @@ class MDNS(MCast):
             except:
                 pass
 
-        self.srv = {}
+        self.srv.clear()
 
     def eat(self, buf , addr  , sck )  :
         cip = addr[0]

copyparty/mtag.py

@@ -133,6 +133,9 @@ def au_unpk(
             zil = [x for x in zil if x.filename.lower().split(".")[-1] == au]
             fi = zf.open(zil[0])
 
+        else:
+            raise Exception("unknown compression %s" % (pk,))
+
         with os.fdopen(fd, "wb") as fo:
             while True:
                 buf = fi.read(32768)

copyparty/smbd.py

@@ -237,7 +237,7 @@ class SMB(object):
 
             xbu = vfs.flags.get("xbu")
             if xbu and not runhook(
-                self.nlog, xbu, ap, vpath, "", "", 0, 0, "1.7.6.2", 0, ""
+                self.nlog, xbu, ap, vpath, "", "", "", 0, 0, "1.7.6.2", 0, ""
             ):
                 yeet("blocked by xbu server config: " + vpath)
 

copyparty/ssdp.py

@@ -184,7 +184,7 @@ class SSDPd(MCast):
             except:
                 pass
 
-        self.srv = {}
+        self.srv.clear()
 
     def eat(self, buf , addr  )  :
         cip = addr[0]

copyparty/svchub.py

@@ -473,8 +473,10 @@ class SvcHub(object):
         zsl = al.th_covers.split(",")
         zsl = [x.strip() for x in zsl]
         zsl = [x for x in zsl if x]
-        al.th_covers = set(zsl)
-        al.th_coversd = set(zsl + ["." + x for x in zsl])
+        al.th_covers = zsl
+        al.th_coversd = zsl + ["." + x for x in zsl]
+        al.th_covers_set = set(al.th_covers)
+        al.th_coversd_set = set(al.th_coversd)
 
         for k in "c".split(" "):
             vl = getattr(al, k)

copyparty/tcpsrv.py

@@ -15,6 +15,7 @@ from .util import (
     E_ADDR_IN_USE,
     E_ADDR_NOT_AVAIL,
     E_UNREACH,
+    HAVE_IPV6,
     IP6ALL,
     Netdev,
     min_ex,
@@ -108,8 +109,10 @@ class TcpSrv(object):
 
         eps = {
             "127.0.0.1": Netdev("127.0.0.1", 0, "", "local only"),
-            "::1": Netdev("::1", 0, "", "local only"),
         }
+        if HAVE_IPV6:
+            eps["::1"] = Netdev("::1", 0, "", "local only")
+
         nonlocals = [x for x in self.args.i if x not in [k.split("/")[0] for k in eps]]
         if nonlocals:
             try:

copyparty/tftpd.py

@@ -33,7 +33,7 @@ from partftpy import (
 )
 from partftpy.TftpShared import TftpException
 
-from .__init__ import EXE, TYPE_CHECKING
+from .__init__ import EXE, PY2, TYPE_CHECKING
 from .authsrv import VFS
 from .bos import bos
 from .util import BytesIO, Daemon, ODict, exclude_dotfiles, min_ex, runhook, undot
@@ -92,7 +92,7 @@ class Tftpd(object):
                 TftpServer,
             ]
             cbak = []
-            if not self.args.tftp_no_fast and not EXE:
+            if not self.args.tftp_no_fast and not EXE and not PY2:
                 try:
                     ptn = re.compile(r"(^\s*)log\.debug\(.*\)$")
                     for C in Cs:
@@ -102,7 +102,7 @@ class Tftpd(object):
                         cfn = C.__spec__.origin
                         exec (compile(src2, filename=cfn, mode="exec"), C.__dict__)
                 except Exception:
-                    t = "failed to optimize tftp code; run with --tftp-noopt if there are issues:\n"
+                    t = "failed to optimize tftp code; run with --tftp-no-fast if there are issues:\n"
                     self.log("tftp", t + min_ex(), 3)
                     for n, zd in enumerate(cbak):
                         Cs[n].__dict__ = zd
@@ -147,11 +147,6 @@ class Tftpd(object):
 
         self._disarm(fos)
 
-        ip = next((x for x in self.args.i if ":" not in x), None)
-        if not ip:
-            self.log("tftp", "IPv6 not supported for tftp; listening on 0.0.0.0", 3)
-            ip = "0.0.0.0"
-
         self.port = int(self.args.tftp)
         self.srv = []
         self.ips = []
@@ -165,7 +160,7 @@ class Tftpd(object):
         if "::" in ips:
             ips.append("0.0.0.0")
 
-        if self.args.ftp4:
+        if self.args.tftp4:
             ips = [x for x in ips if ":" not in x]
 
         ips = list(ODict.fromkeys(ips))  # dedup
@@ -330,7 +325,7 @@ class Tftpd(object):
 
             xbu = vfs.flags.get("xbu")
             if xbu and not runhook(
-                self.nlog, xbu, ap, vpath, "", "", 0, 0, "8.3.8.7", 0, ""
+                self.nlog, xbu, ap, vpath, "", "", "", 0, 0, "8.3.8.7", 0, ""
             ):
                 yeet("blocked by xbu server config: " + vpath)