openstack
/
keystone
Code Issues Proposed changes

Merge "set user_update policy to admin_required" into milestone-proposed

This commit is contained in:
Jenkins 2013-10-14 22:18:58 +00:00 committed by Gerrit Code Review
parent a0ae37eb3e 3866991918
commit 71af37b6c3
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/policy.json
View File

@ -35,7 +35,7 @@
"identity:get_user": [["rule:admin_required"]],
"identity:list_users": [["rule:admin_required"]],
"identity:create_user": [["rule:admin_required"]],
"identity:update_user": [["rule:admin_or_owner"]],
"identity:update_user": [["rule:admin_required"]],
"identity:delete_user": [["rule:admin_required"]],
"identity:get_group": [["rule:admin_required"]],

5
keystone/tests/test_v3_auth.py
View File

@ -2220,14 +2220,9 @@ class TestTrustAuth(TestAuthInfo):
self.user_id, expected_status=200,
token=trust_token)
auth_data = self.build_authentication_request(
user_id=self.trustee_user['id'],
password=self.trustee_user['password'])
self.assertValidUserResponse(
self.patch('/users/%s' % self.trustee_user['id'],
body={'user': {'password': uuid.uuid4().hex}},
auth=auth_data,
expected_status=200))
self.get('/OS-TRUST/trusts?trustor_user_id=%s' %