fix panic when zero accounts

This commit is contained in:
ed 2021-06-28 15:20:40 +02:00
parent 062df3f0c3
commit 0d46d548b9
2 changed files with 4 additions and 2 deletions

View file

@ -693,8 +693,10 @@ class AuthSrv(object):
self.user = user self.user = user
self.iuser = {v: k for k, v in user.items()} self.iuser = {v: k for k, v in user.items()}
self.re_pwd = None
pwds = [re.escape(x) for x in self.iuser.keys()] pwds = [re.escape(x) for x in self.iuser.keys()]
self.re_pwd = re.compile("=(" + "|".join(pwds) + ")([]&; ]|$)") if pwds:
self.re_pwd = re.compile("=(" + "|".join(pwds) + ")([]&; ]|$)")
# import pprint # import pprint
# pprint.pprint({"usr": user, "rd": mread, "wr": mwrite, "mnt": mount}) # pprint.pprint({"usr": user, "rd": mread, "wr": mwrite, "mnt": mount})

View file

@ -55,7 +55,7 @@ class HttpCli(object):
def log(self, msg, c=0): def log(self, msg, c=0):
ptn = self.asrv.re_pwd ptn = self.asrv.re_pwd
if ptn.search(msg): if ptn and ptn.search(msg):
msg = ptn.sub(self.unpwd, msg) msg = ptn.sub(self.unpwd, msg)
self.log_func(self.log_src, msg, c) self.log_func(self.log_src, msg, c)