ouczbs/anki-sync-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove redundant checks, check if user exists before changing password

Browse Source
This commit is contained in:
flan 2018-08-28 17:34:29 +02:00
parent dbdb3ffb3b
commit 2538db5c07
1 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ankisyncctl.py
View File

@ -20,28 +20,17 @@ def usage():
print(" passwd <username> - change password of a user") print(" passwd <username> - change password of a user")
def adduser(username): def adduser(username):
if username: password = getpass.getpass("Enter password for {}: ".format(username))
password = getpass.getpass("Enter password for {}: ".format(username))
user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH) user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH)
user_manager.add_user(username, password) user_manager.add_user(username, password)
else:
usage()
def deluser(username): def deluser(username):
if username and os.path.isfile(AUTHDBPATH): user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH)
user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH) try:
user_manager.del_user(username)
try: except ValueError as error:
user_manager.del_user(username) print("Could not delete user {}: {}".format(username, error), file=sys.stderr)
except ValueError as error:
print("Could not delete user {}: {}"
.format(username, error), file=sys.stderr)
elif not username:
usage()
else:
print("{}: Database file does not exist".format(sys.argv[0]),
file=sys.stderr)
def lsuser(): def lsuser():
user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH) user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH)
@ -53,18 +42,17 @@ def lsuser():
print("Could not list users: {}".format(error), file=sys.stderr) print("Could not list users: {}".format(error), file=sys.stderr)
def passwd(username): def passwd(username):
if os.path.isfile(AUTHDBPATH): user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH)
password = getpass.getpass("Enter password for {}: ".format(username))
user_manager = SqliteUserManager(AUTHDBPATH, COLLECTIONPATH) if username not in user_manager.user_list():
try: print("User {} doesn't exist".format(username))
user_manager.set_password_for_user(username, password) return
except ValueError as error:
print("Could not set password for user {}: {}" password = getpass.getpass("Enter password for {}: ".format(username))
.format(username, error), file=sys.stderr) try:
else: user_manager.set_password_for_user(username, password)
print("{}: Database file does not exist".format(sys.argv[0]), except ValueError as error:
file=sys.stderr) print("Could not set password for user {}: {}".format(username, error), file=sys.stderr)
def main(): def main():
argc = len(sys.argv) argc = len(sys.argv)