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

fix bugs detected by pyright but not pylance:

Browse source 
* race-the-beam broke in v1.13.3 (i'm good at this)

* wrong logger type in certgen
This commit is contained in:
ed 2024-07-13 01:09:19 +02:00
parent 1cdb170290
commit f37187a041
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
copyparty/cert.py
View file

@ -12,7 +12,7 @@ from .util import Netdev, runcmd, wrename, wunlink
HAVE_CFSSL = True HAVE_CFSSL = True
if True: # pylint: disable=using-constant-test if True: # pylint: disable=using-constant-test
from .util import RootLogger from .util import NamedLogger, RootLogger
if ANYWIN: if ANYWIN:
@ -83,6 +83,8 @@ def _read_crt(args, fn):
def _gen_ca(log: "RootLogger", args): def _gen_ca(log: "RootLogger", args):
nlog: "NamedLogger" = lambda msg, c=0: log("cert-gen-ca", msg, c)
expiry = _read_crt(args, "ca.pem")[0] expiry = _read_crt(args, "ca.pem")[0]
if time.time() + args.crt_cdays * 60 * 60 * 24 * 0.1 < expiry: if time.time() + args.crt_cdays * 60 * 60 * 24 * 0.1 < expiry:
return return
@ -113,16 +115,18 @@ def _gen_ca(log: "RootLogger", args):
bname = os.path.join(args.crt_dir, "ca") bname = os.path.join(args.crt_dir, "ca")
try: try:
wunlink(log, bname + ".key", VF) wunlink(nlog, bname + ".key", VF)
except: except:
pass pass
wrename(log, bname + "-key.pem", bname + ".key", VF) wrename(nlog, bname + "-key.pem", bname + ".key", VF)
wunlink(log, bname + ".csr", VF) wunlink(nlog, bname + ".csr", VF)
log("cert", "new ca OK", 2) log("cert", "new ca OK", 2)
def _gen_srv(log: "RootLogger", args, netdevs: dict[str, Netdev]): def _gen_srv(log: "RootLogger", args, netdevs: dict[str, Netdev]):
nlog: "NamedLogger" = lambda msg, c=0: log("cert-gen-srv", msg, c)
names = args.crt_ns.split(",") if args.crt_ns else [] names = args.crt_ns.split(",") if args.crt_ns else []
if not args.crt_exact: if not args.crt_exact:
for n in names[:]: for n in names[:]:
@ -196,11 +200,11 @@ def _gen_srv(log: "RootLogger", args, netdevs: dict[str, Netdev]):
bname = os.path.join(args.crt_dir, "srv") bname = os.path.join(args.crt_dir, "srv")
try: try:
wunlink(log, bname + ".key", VF) wunlink(nlog, bname + ".key", VF)
except: except:
pass pass
wrename(log, bname + "-key.pem", bname + ".key", VF) wrename(nlog, bname + "-key.pem", bname + ".key", VF)
wunlink(log, bname + ".csr", VF) wunlink(nlog, bname + ".csr", VF)
with open(os.path.join(args.crt_dir, "ca.pem"), "rb") as f: with open(os.path.join(args.crt_dir, "ca.pem"), "rb") as f:
ca = f.read() ca = f.read()

11
copyparty/httpcli.py
View file

@ -3421,7 +3421,16 @@ class HttpCli(object):
if lower < upper and not broken: if lower < upper and not broken:
with open(req_path, "rb") as f: 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) spd = self._spd((upper - lower) - remains)
if self.do_log: if self.do_log: