heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent unhandled exception on non-existant user.

Browse Source 
These changes bring `makeadmin` and `changepw` in-line with the approach used in `deleteuser`.

I've also made the error messages more consistent: list the username and full sentences.
This commit is contained in:
Ben Sturmfels 2015-08-23 20:37:15 +10:00 committed by Christopher Allan Webber
parent 03bb1b7907
commit be2621a43c
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mediagoblin/gmg_commands/users.py
View File

@ -74,13 +74,14 @@ def adduser(args):
entry.all_privileges = default_privileges entry.all_privileges = default_privileges
entry.save() entry.save()
print(u"User created (and email marked as verified)") print(u"User created (and email marked as verified).")
def makeadmin_parser_setup(subparser): def makeadmin_parser_setup(subparser):
subparser.add_argument( subparser.add_argument(
'username', 'username',
help="Username to give admin level") help="Username to give admin level",
type=six.text_type)
def makeadmin(args): def makeadmin(args):
@ -89,24 +90,25 @@ def makeadmin(args):
db = mg_globals.database db = mg_globals.database
user = db.LocalUser.query.filter( user = db.LocalUser.query.filter(
LocalUser.username==six.text_type(args.username.lower()) LocalUser.username==args.username.lower()
).one() ).first()
if user: if user:
user.all_privileges.append( user.all_privileges.append(
db.Privilege.query.filter( db.Privilege.query.filter(
db.Privilege.privilege_name==u'admin').one() db.Privilege.privilege_name==u'admin').one()
) )
user.save() user.save()
print(u'The user is now Admin') print(u'The user %s is now an admin.' % args.username)
else: else:
print(u'The user doesn\'t exist') print(u'The user %s doesn\'t exist.' % args.username)
sys.exit(1) sys.exit(1)
def changepw_parser_setup(subparser): def changepw_parser_setup(subparser):
subparser.add_argument( subparser.add_argument(
'username', 'username',
help="Username used to login") help="Username used to login",
type=six.text_type)
subparser.add_argument( subparser.add_argument(
'password', 'password',
help="Your NEW supersecret word to login") help="Your NEW supersecret word to login")
@ -118,14 +120,14 @@ def changepw(args):
db = mg_globals.database db = mg_globals.database
user = db.LocalUser.query.filter( user = db.LocalUser.query.filter(
LocalUser.username==six.text_type(args.username.lower()) LocalUser.username==args.username.lower()
).one() ).first()
if user: if user:
user.pw_hash = auth.gen_password_hash(args.password) user.pw_hash = auth.gen_password_hash(args.password)
user.save() user.save()
print(u'Password successfully changed') print(u'Password successfully changed for user %s.' % args.username)
else: else:
print(u'The user doesn\'t exist') print(u'The user %s doesn\'t exist.' % args.username)
sys.exit(1) sys.exit(1)
@ -146,7 +148,7 @@ def deleteuser(args):
).first() ).first()
if user: if user:
user.delete() user.delete()
print('The user %s has been deleted' % args.username) print('The user %s has been deleted.' % args.username)
else: else:
print('The user %s doesn\'t exist' % args.username) print('The user %s doesn\'t exist.' % args.username)
sys.exit(1) sys.exit(1)