diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-10-14 22:18:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-10-14 22:18:58 +0000 |
| commit | 71af37b6c35cdc8b9239cb4d7477052a0f4530b2 (patch) | |
| tree | 84c293a0320ed5f4f48f3ad4f3b43bebc01ea86e | |
| parent | a0ae37eb3ea96a394f10d3f38e8b454d2d7a98e0 (diff) | |
| parent | 3866991918beb818aa26aeab287a247f4732f6e7 (diff) | |
| download | keystone-2013.2.rc2.tar.gz | |
Merge "set user_update policy to admin_required" into milestone-proposed2013.2.rc2
| -rw-r--r-- | etc/policy.json | 2 | ||||
| -rw-r--r-- | keystone/tests/test_v3_auth.py | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/etc/policy.json b/etc/policy.json index 648d14e21..5ce86fa25 100644 --- a/etc/policy.json +++ b/etc/policy.json @@ -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"]], diff --git a/keystone/tests/test_v3_auth.py b/keystone/tests/test_v3_auth.py index b75f9fd02..33fa119e0 100644 --- a/keystone/tests/test_v3_auth.py +++ b/keystone/tests/test_v3_auth.py @@ -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' % |