From 40fb2630977d0afed9a9c7ea76b73906c738930a Mon Sep 17 00:00:00 2001 From: ed Date: Sat, 17 Jan 2026 20:35:06 +0000 Subject: [PATCH] rephrase "see serverlog" --- copyparty/__main__.py | 2 +- copyparty/authsrv.py | 2 +- copyparty/httpcli.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/copyparty/__main__.py b/copyparty/__main__.py index d45f165c..1cf04745 100644 --- a/copyparty/__main__.py +++ b/copyparty/__main__.py @@ -1591,7 +1591,7 @@ def add_safety(ap): ap2.add_argument("--no-robots", action="store_true", help="adds http and html headers asking search engines to not index anything (volflag=norobots)") ap2.add_argument("--logout", metavar="H", type=float, default=8086.0, help="logout clients after \033[33mH\033[0m hours of inactivity; [\033[32m0.0028\033[0m]=10sec, [\033[32m0.1\033[0m]=6min, [\033[32m24\033[0m]=day, [\033[32m168\033[0m]=week, [\033[32m720\033[0m]=month, [\033[32m8760\033[0m]=year)") ap2.add_argument("--dont-ban", metavar="TXT", type=u, default="no", help="anyone at this accesslevel or above will not get banned: [\033[32mav\033[0m]=admin-in-volume, [\033[32maa\033[0m]=has-admin-anywhere, [\033[32mrw\033[0m]=read-write, [\033[32mauth\033[0m]=authenticated, [\033[32many\033[0m]=disable-all-bans, [\033[32mno\033[0m]=anyone-can-get-banned") - ap2.add_argument("--banmsg", metavar="TXT", type=u, default="thank you for playing \u00a0 (see serverlog and readme)", help="the response to send to banned users; can be @ban.html to send the contents of ban.html") + ap2.add_argument("--banmsg", metavar="TXT", type=u, default="thank you for playing \u00a0 (see fileserver log and readme)", help="the response to send to banned users; can be @ban.html to send the contents of ban.html") ap2.add_argument("--ban-pw", metavar="N,W,B", type=u, default="9,60,1440", help="more than \033[33mN\033[0m wrong passwords in \033[33mW\033[0m minutes = ban for \033[33mB\033[0m minutes; disable with [\033[32mno\033[0m]") ap2.add_argument("--ban-pwc", metavar="N,W,B", type=u, default="5,60,1440", help="more than \033[33mN\033[0m password-changes in \033[33mW\033[0m minutes = ban for \033[33mB\033[0m minutes; disable with [\033[32mno\033[0m]") ap2.add_argument("--ban-404", metavar="N,W,B", type=u, default="50,60,1440", help="hitting more than \033[33mN\033[0m 404's in \033[33mW\033[0m minutes = ban for \033[33mB\033[0m minutes; only affects users who cannot see directory listings because their access is either g/G/h") diff --git a/copyparty/authsrv.py b/copyparty/authsrv.py index 99492b9f..7088682f 100644 --- a/copyparty/authsrv.py +++ b/copyparty/authsrv.py @@ -101,7 +101,7 @@ UP_MTE_MAP = { # db-order } SEE_LOG = "see log for details" -SEESLOG = " (see serverlog for details)" +SEESLOG = " (see fileserver log for details)" SSEELOG = " ({})".format(SEE_LOG) BAD_CFG = "invalid config; {}".format(SEE_LOG) SBADCFG = " ({})".format(BAD_CFG) diff --git a/copyparty/httpcli.py b/copyparty/httpcli.py index b7e74c6b..01a073f8 100644 --- a/copyparty/httpcli.py +++ b/copyparty/httpcli.py @@ -855,7 +855,7 @@ class HttpCli(object): guess = "modifying" if (origin and host) else "stripping" t = "cors-reject %s because request-header Origin=%r does not match request-protocol %r and host %r based on request-header Host=%r (note: if this request is not malicious, check if your reverse-proxy is accidentally %s request headers, in particular 'Origin', for example by running copyparty with --ihead='*' to show all request headers)" self.log(t % (self.mode, origin, proto, self.host, host, guess), 3) - raise Pebkac(403, "rejected by cors-check (see serverlog)") + raise Pebkac(403, "rejected by cors-check (see fileserver log)") # getattr(self.mode) is not yet faster than this if self.mode == "POST": @@ -3230,7 +3230,7 @@ class HttpCli(object): if num_left < 0: if bail1: return False - raise Pebkac(500, "unconfirmed; see serverlog") + raise Pebkac(500, "unconfirmed; see fileserver log") if not num_left and fpool: with self.u2mutex: