Skip to content
Snippets Groups Projects
Commit 532fc8d1 authored by Florian Spreckelsen's avatar Florian Spreckelsen
Browse files

Merge branch 'f-user-realm-new' into 'dev'

ENH: set user realm when chaning passwords

See merge request !147
parents eb79cfbd ef1bdf81
Branches
Tags
2 merge requests!159Release 0.16.o,!147ENH: set user realm when chaning passwords
Pipeline #57176 passed with warnings
...@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ...@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### ### Added ###
* Official support for Python 3.13 * Official support for Python 3.13
* Optional `realm` argument for `linkahead_admin.py set_user_password`
which defaults to `None`, i.e., the server's default realm.
### Changed ### ### Changed ###
......
...@@ -42,6 +42,13 @@ __updated__ = '2018-12-11' ...@@ -42,6 +42,13 @@ __updated__ = '2018-12-11'
def do_update_role(args): def do_update_role(args):
"""
Update the description of a role.
Allowed keyword arguments:
role_name: Name of the role to update
role_description: New description of the role
"""
try: try:
admin._update_role(name=args.role_name, description=args.role_description) admin._update_role(name=args.role_name, description=args.role_description)
except (HTTPResourceNotFoundError, HTTPForbiddenError) as e: except (HTTPResourceNotFoundError, HTTPForbiddenError) as e:
...@@ -139,7 +146,6 @@ def do_create_user(args): ...@@ -139,7 +146,6 @@ def do_create_user(args):
try: try:
admin._insert_user(name=args.user_name, admin._insert_user(name=args.user_name,
email=args.user_email, password=password) email=args.user_email, password=password)
if args.activate_user: if args.activate_user:
do_activate_user(args) do_activate_user(args)
except (HTTPForbiddenError, HTTPClientError) as e: except (HTTPForbiddenError, HTTPClientError) as e:
...@@ -169,7 +175,7 @@ def do_set_user_password(args): ...@@ -169,7 +175,7 @@ def do_set_user_password(args):
else: else:
password = args.user_password password = args.user_password
try: try:
admin._update_user(name=args.user_name, password=password) admin._update_user(name=args.user_name, password=password, realm=args.realm)
except (HTTPResourceNotFoundError, HTTPForbiddenError, HTTPClientError) as e: except (HTTPResourceNotFoundError, HTTPForbiddenError, HTTPClientError) as e:
print(f"Error: Cannot set password for user '{args.user_name}', " print(f"Error: Cannot set password for user '{args.user_name}', "
f"reason: '{e.msg}'") f"reason: '{e.msg}'")
...@@ -457,6 +463,12 @@ USAGE ...@@ -457,6 +463,12 @@ USAGE
metavar='USERNAME', metavar='USERNAME',
dest="user_name", dest="user_name",
help="The name of the user who's password is to be set.") help="The name of the user who's password is to be set.")
subparser.add_argument(
metavar='REALM',
dest="realm",
nargs="?",
default=None,
help="The realm of the user who's password is to be set.")
subparser.add_argument( subparser.add_argument(
metavar='PASSWORD', metavar='PASSWORD',
nargs="?", nargs="?",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment