From eea2e917f5a306b7f22a6c2bcca7033c815d9ec4 Mon Sep 17 00:00:00 2001 From: krateng Date: Tue, 29 Mar 2022 04:33:44 +0200 Subject: [PATCH] Fixed password setup --- maloja/proccontrol/setup.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/maloja/proccontrol/setup.py b/maloja/proccontrol/setup.py index 9e212e1..630e9b4 100644 --- a/maloja/proccontrol/setup.py +++ b/maloja/proccontrol/setup.py @@ -63,16 +63,17 @@ def setup(): print("Password has been set.") elif auth.defaultuser.checkpw("admin"): # if the actual pw is admin, it means we've never set this up properly (eg first start after update) - newpw, newpw_repeat = 1, 2 - while newpw != newpw_repeat: + while True: newpw = prompt("Please set a password for web backend access. Leave this empty to generate a random password.",skip=SKIP,secret=True) if newpw is None: newpw = randomstring(32) print("Generated password:",col["yellow"](newpw)) + break else: newpw_repeat = prompt("Please type again to confirm.",skip=SKIP,secret=True) if newpw != newpw_repeat: print("Passwords do not match!") - else: auth.defaultuser.setpw(newpw) + else: break + auth.defaultuser.setpw(newpw) if malojaconfig["SEND_STATS"] is None: answer = ask("I would like to know how many people use Maloja. Would it be okay to send a daily ping to my server (this contains no data that isn't accessible via your web interface already)?",default=True,skip=SKIP)