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

error-message cleanup

Browse source
This commit is contained in:
ed 2021-09-07 20:51:07 +02:00
parent 9149fe6cdd
commit 21662c9f3f
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
copyparty/httpcli.py
View file

@ -505,7 +505,7 @@ class HttpCli(object):
if "get" in opt: if "get" in opt:
return self.handle_get() return self.handle_get()
raise Pebkac(405, "POST({}) is disabled".format(ctype)) raise Pebkac(405, "POST({}) is disabled in server config".format(ctype))
raise Pebkac(405, "don't know how to handle POST({})".format(ctype)) raise Pebkac(405, "don't know how to handle POST({})".format(ctype))
@ -1614,7 +1614,7 @@ class HttpCli(object):
raise Pebkac(403, "not allowed for user " + self.uname) raise Pebkac(403, "not allowed for user " + self.uname)
if self.args.no_rescan: if self.args.no_rescan:
raise Pebkac(403, "disabled by argv") raise Pebkac(403, "the rescan feature is disabled in server config")
vn, _ = self.asrv.vfs.get(self.vpath, self.uname, True, True) vn, _ = self.asrv.vfs.get(self.vpath, self.uname, True, True)
@ -1633,7 +1633,7 @@ class HttpCli(object):
raise Pebkac(403, "not allowed for user " + self.uname) raise Pebkac(403, "not allowed for user " + self.uname)
if self.args.no_stack: if self.args.no_stack:
raise Pebkac(403, "disabled by argv") raise Pebkac(403, "the stackdump feature is disabled in server config")
ret = "<pre>{}\n{}".format(time.time(), alltrace()) ret = "<pre>{}\n{}".format(time.time(), alltrace())
self.reply(ret.encode("utf-8")) self.reply(ret.encode("utf-8"))
@ -1697,7 +1697,7 @@ class HttpCli(object):
def tx_ups(self): def tx_ups(self):
if not self.args.unpost: if not self.args.unpost:
raise Pebkac(400, "the unpost feature was disabled by server config") raise Pebkac(400, "the unpost feature is disabled in server config")
filt = self.uparam.get("filter") filt = self.uparam.get("filter")
lm = "ups [{}]".format(filt) lm = "ups [{}]".format(filt)
@ -1735,7 +1735,7 @@ class HttpCli(object):
raise Pebkac(403, "not allowed for user " + self.uname) raise Pebkac(403, "not allowed for user " + self.uname)
if self.args.no_del: if self.args.no_del:
raise Pebkac(403, "disabled by argv") raise Pebkac(403, "the delete feature is disabled in server config")
if not req: if not req:
req = [self.vpath] req = [self.vpath]
@ -1748,7 +1748,7 @@ class HttpCli(object):
raise Pebkac(403, "not allowed for user " + self.uname) raise Pebkac(403, "not allowed for user " + self.uname)
if self.args.no_mv: if self.args.no_mv:
raise Pebkac(403, "disabled by argv") raise Pebkac(403, "the rename/move feature is disabled in server config")
# full path of new loc (incl filename) # full path of new loc (incl filename)
dst = self.uparam.get("move") dst = self.uparam.get("move")

12
copyparty/up2k.py
View file

@ -1405,7 +1405,7 @@ class Up2k(object):
except: except:
# unpost with missing permissions? try read+write and verify with db # unpost with missing permissions? try read+write and verify with db
if not self.args.unpost: if not self.args.unpost:
raise Pebkac(400, "the unpost feature was disabled by server config") raise Pebkac(400, "the unpost feature is disabled in server config")
unpost = True unpost = True
permsets = [[True, True]] permsets = [[True, True]]
@ -1520,13 +1520,13 @@ class Up2k(object):
dabs = dvn.canonical(drem) dabs = dvn.canonical(drem)
drd, dfn = vsplit(drem) drd, dfn = vsplit(drem)
n1 = svp.split('/')[-1] n1 = svp.split("/")[-1]
n2 = dvp.split('/')[-1] n2 = dvp.split("/")[-1]
if n1.startswith('.') or n2.startswith('.'): if n1.startswith(".") or n2.startswith("."):
if self.args.no_dot_mv: if self.args.no_dot_mv:
raise Pebkac(400, "moving dotfiles was disabled by server config") raise Pebkac(400, "moving dotfiles is disabled in server config")
elif self.args.no_dot_ren and n1 != n2: elif self.args.no_dot_ren and n1 != n2:
raise Pebkac(400, "renaming dotfiles was disabled by server config") raise Pebkac(400, "renaming dotfiles is disabled in server config")
if bos.path.exists(dabs): if bos.path.exists(dabs):
raise Pebkac(400, "mv2: target file exists") raise Pebkac(400, "mv2: target file exists")