diff options
Diffstat (limited to 'keystone/contrib/user_crud/core.py')
| -rw-r--r-- | keystone/contrib/user_crud/core.py | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/keystone/contrib/user_crud/core.py b/keystone/contrib/user_crud/core.py index 79144ae5..f9f09b89 100644 --- a/keystone/contrib/user_crud/core.py +++ b/keystone/contrib/user_crud/core.py @@ -17,6 +17,7 @@ import copy import uuid +from keystone.common import extension from keystone.common import logging from keystone.common import wsgi from keystone import exception @@ -26,6 +27,25 @@ from keystone import identity LOG = logging.getLogger(__name__) +extension.register_public_extension( + 'OS-KSCRUD', { + 'name': 'OpenStack Keystone User CRUD', + 'namespace': 'http://docs.openstack.org/identity/api/ext/' + 'OS-KSCRUD/v1.0', + 'alias': 'OS-KSCRUD', + 'updated': '2013-07-07T12:00:0-00:00', + 'description': 'OpenStack extensions to Keystone v2.0 API ' + 'enabling User Operations.', + 'links': [ + { + 'rel': 'describedby', + # TODO(ayoung): needs a description + 'type': 'text/html', + 'href': 'https://github.com/openstack/identity-api', + } + ]}) + + class UserController(identity.controllers.User): def set_user_password(self, context, user_id, user): token_id = context.get('token_id') @@ -43,7 +63,7 @@ class UserController(identity.controllers.User): try: user_ref = self.identity_api.authenticate( user_id=user_id_from_token, - password=original_password)[0] + password=original_password) if not user_ref.get('enabled', True): # NOTE(dolph): why can't you set a disabled user's password? raise exception.Unauthorized('User is disabled') |