1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
|
From b449d86ee56960adacfcf2086f07b57324f51d4e Mon Sep 17 00:00:00 2001
From: Douglas Mendizábal <dmendiza@redhat.com>
Date: Wed, 27 Mar 2024 08:55:54 -0500
Subject: [PATCH] Allow admin to access tokens and credentials
This patch modifies a few policies to allow users with the "admin" role
to access /v3/auth/tokens and /v3/credentials. These policies were
missed when we implemented Phase 1 of Secure RBAC.
Change-Id: Id789c09121f1405f7ba5e4926498dab4ad98e057
(cherry picked from commit b31007e1b2ecbea5e1268d3e28d6230d0f5d09b2)
(cherry picked from commit 0dcc423a2621943ab9188cff3edb9bc488339fe0)
(cherry picked from commit 570c19e91bc3212f748221bdab5f2976f479fa13)
---
diff --git a/keystone/common/policies/application_credential.py b/keystone/common/policies/application_credential.py
index bae998a..12958d8 100644
--- a/keystone/common/policies/application_credential.py
+++ b/keystone/common/policies/application_credential.py
@@ -46,7 +46,7 @@
application_credential_policies = [
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'get_application_credential',
- check_str=base.RULE_SYSTEM_READER_OR_OWNER,
+ check_str=base.ADMIN_OR_SYSTEM_READER_OR_OWNER,
scope_types=['system', 'project'],
description='Show application credential details.',
operations=[{'path': resource_path,
@@ -56,7 +56,7 @@
deprecated_rule=deprecated_get_application_credentials_for_user),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'list_application_credentials',
- check_str=base.RULE_SYSTEM_READER_OR_OWNER,
+ check_str=base.ADMIN_OR_SYSTEM_READER_OR_OWNER,
scope_types=['system', 'project'],
description='List application credentials for a user.',
operations=[{'path': collection_path,
@@ -73,7 +73,7 @@
'method': 'POST'}]),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'delete_application_credential',
- check_str=base.RULE_SYSTEM_ADMIN_OR_OWNER,
+ check_str=base.RULE_ADMIN_OR_OWNER,
scope_types=['system', 'project'],
description='Delete an application credential.',
operations=[{'path': resource_path,
diff --git a/keystone/common/policies/base.py b/keystone/common/policies/base.py
index 5b323f5..39df9ea 100644
--- a/keystone/common/policies/base.py
+++ b/keystone/common/policies/base.py
@@ -48,16 +48,20 @@
SYSTEM_ADMIN = 'role:admin and system_scope:all'
DOMAIN_READER = 'role:reader and domain_id:%(target.domain_id)s'
RULE_SYSTEM_ADMIN_OR_OWNER = '(' + SYSTEM_ADMIN + ') or rule:owner'
-RULE_SYSTEM_READER_OR_OWNER = '(' + SYSTEM_READER + ') or rule:owner'
+ADMIN_OR_SYSTEM_READER_OR_OWNER = (
+ '(' + RULE_ADMIN_REQUIRED + ') or '
+ '(' + SYSTEM_READER + ') or rule:owner'
+)
RULE_ADMIN_OR_SYSTEM_READER = 'rule:admin_required or (' + SYSTEM_READER + ')'
# Credential and EC2 Credential policies
-SYSTEM_READER_OR_CRED_OWNER = (
+ADMIN_OR_SYSTEM_READER_OR_CRED_OWNER = (
+ '(' + RULE_ADMIN_REQUIRED + ') or '
'(' + SYSTEM_READER + ') '
'or user_id:%(target.credential.user_id)s'
)
-SYSTEM_ADMIN_OR_CRED_OWNER = (
- '(' + SYSTEM_ADMIN + ') '
+ADMIN_OR_CRED_OWNER = (
+ '(' + RULE_ADMIN_REQUIRED + ') '
'or user_id:%(target.credential.user_id)s'
)
diff --git a/keystone/common/policies/credential.py b/keystone/common/policies/credential.py
index 675e318..41d49f6 100644
--- a/keystone/common/policies/credential.py
+++ b/keystone/common/policies/credential.py
@@ -54,7 +54,7 @@
credential_policies = [
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'get_credential',
- check_str=base.SYSTEM_READER_OR_CRED_OWNER,
+ check_str=base.ADMIN_OR_SYSTEM_READER_OR_CRED_OWNER,
scope_types=['system', 'project'],
description='Show credentials details.',
operations=[{'path': '/v3/credentials/{credential_id}',
@@ -63,7 +63,7 @@
),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'list_credentials',
- check_str=base.SYSTEM_READER_OR_CRED_OWNER,
+ check_str=base.ADMIN_OR_SYSTEM_READER_OR_CRED_OWNER,
scope_types=['system', 'project'],
description='List credentials.',
operations=[{'path': '/v3/credentials',
@@ -72,7 +72,7 @@
),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'create_credential',
- check_str=base.SYSTEM_ADMIN_OR_CRED_OWNER,
+ check_str=base.ADMIN_OR_CRED_OWNER,
scope_types=['system', 'project'],
description='Create credential.',
operations=[{'path': '/v3/credentials',
@@ -81,7 +81,7 @@
),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'update_credential',
- check_str=base.SYSTEM_ADMIN_OR_CRED_OWNER,
+ check_str=base.ADMIN_OR_CRED_OWNER,
scope_types=['system', 'project'],
description='Update credential.',
operations=[{'path': '/v3/credentials/{credential_id}',
@@ -90,7 +90,7 @@
),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'delete_credential',
- check_str=base.SYSTEM_ADMIN_OR_CRED_OWNER,
+ check_str=base.ADMIN_OR_CRED_OWNER,
scope_types=['system', 'project'],
description='Delete credential.',
operations=[{'path': '/v3/credentials/{credential_id}',
diff --git a/keystone/common/policies/ec2_credential.py b/keystone/common/policies/ec2_credential.py
index 9e52709..0a87658 100644
--- a/keystone/common/policies/ec2_credential.py
+++ b/keystone/common/policies/ec2_credential.py
@@ -48,7 +48,7 @@
ec2_credential_policies = [
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'ec2_get_credential',
- check_str=base.SYSTEM_READER_OR_CRED_OWNER,
+ check_str=base.ADMIN_OR_SYSTEM_READER_OR_CRED_OWNER,
scope_types=['system', 'project'],
description='Show ec2 credential details.',
operations=[{'path': ('/v3/users/{user_id}/credentials/OS-EC2/'
@@ -58,7 +58,7 @@
),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'ec2_list_credentials',
- check_str=base.RULE_SYSTEM_READER_OR_OWNER,
+ check_str=base.ADMIN_OR_SYSTEM_READER_OR_OWNER,
scope_types=['system', 'project'],
description='List ec2 credentials.',
operations=[{'path': '/v3/users/{user_id}/credentials/OS-EC2',
@@ -67,7 +67,7 @@
),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'ec2_create_credential',
- check_str=base.RULE_SYSTEM_ADMIN_OR_OWNER,
+ check_str=base.RULE_ADMIN_OR_OWNER,
scope_types=['system', 'project'],
description='Create ec2 credential.',
operations=[{'path': '/v3/users/{user_id}/credentials/OS-EC2',
@@ -76,7 +76,7 @@
),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'ec2_delete_credential',
- check_str=base.SYSTEM_ADMIN_OR_CRED_OWNER,
+ check_str=base.ADMIN_OR_CRED_OWNER,
scope_types=['system', 'project'],
description='Delete ec2 credential.',
operations=[{'path': ('/v3/users/{user_id}/credentials/OS-EC2/'
diff --git a/keystone/common/policies/token.py b/keystone/common/policies/token.py
index cb321b0..974c8d9 100644
--- a/keystone/common/policies/token.py
+++ b/keystone/common/policies/token.py
@@ -38,13 +38,15 @@
deprecated_since=versionutils.deprecated.TRAIN
)
-SYSTEM_ADMIN_OR_TOKEN_SUBJECT = (
- '(role:admin and system_scope:all) or rule:token_subject' # nosec
+ADMIN_OR_TOKEN_SUBJECT = (
+ base.RULE_ADMIN_REQUIRED + ' or rule:token_subject' # nosec
)
-SYSTEM_USER_OR_TOKEN_SUBJECT = (
+ADMIN_OR_SYSTEM_USER_OR_TOKEN_SUBJECT = (
+ base.RULE_ADMIN_REQUIRED + ' or '
'(role:reader and system_scope:all) or rule:token_subject' # nosec
)
-SYSTEM_USER_OR_SERVICE_OR_TOKEN_SUBJECT = (
+ADMIN_OR_SYSTEM_USER_OR_SERVICE_OR_TOKEN_SUBJECT = (
+ base.RULE_ADMIN_REQUIRED + ' or '
'(role:reader and system_scope:all) ' # nosec
'or rule:service_role or rule:token_subject' # nosec
)
@@ -53,7 +55,7 @@
token_policies = [
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'check_token',
- check_str=SYSTEM_USER_OR_TOKEN_SUBJECT,
+ check_str=ADMIN_OR_SYSTEM_USER_OR_TOKEN_SUBJECT,
scope_types=['system', 'domain', 'project'],
description='Check a token.',
operations=[{'path': '/v3/auth/tokens',
@@ -61,7 +63,7 @@
deprecated_rule=deprecated_check_token),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'validate_token',
- check_str=SYSTEM_USER_OR_SERVICE_OR_TOKEN_SUBJECT,
+ check_str=ADMIN_OR_SYSTEM_USER_OR_SERVICE_OR_TOKEN_SUBJECT,
scope_types=['system', 'domain', 'project'],
description='Validate a token.',
operations=[{'path': '/v3/auth/tokens',
@@ -69,7 +71,7 @@
deprecated_rule=deprecated_validate_token),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'revoke_token',
- check_str=SYSTEM_ADMIN_OR_TOKEN_SUBJECT,
+ check_str=ADMIN_OR_TOKEN_SUBJECT,
scope_types=['system', 'domain', 'project'],
description='Revoke a token.',
operations=[{'path': '/v3/auth/tokens',
diff --git a/keystone/tests/protection/v3/test_credentials.py b/keystone/tests/protection/v3/test_credentials.py
index 800452f..5a1960e 100644
--- a/keystone/tests/protection/v3/test_credentials.py
+++ b/keystone/tests/protection/v3/test_credentials.py
@@ -1131,11 +1131,13 @@
# broken behavior with better scope checking.
with open(self.policy_file_name, 'w') as f:
overridden_policies = {
- 'identity:get_credential': bp.SYSTEM_READER_OR_CRED_OWNER,
- 'identity:list_credentials': bp.SYSTEM_READER_OR_CRED_OWNER,
- 'identity:create_credential': bp.SYSTEM_ADMIN_OR_CRED_OWNER,
- 'identity:update_credential': bp.SYSTEM_ADMIN_OR_CRED_OWNER,
- 'identity:delete_credential': bp.SYSTEM_ADMIN_OR_CRED_OWNER
+ 'identity:get_credential':
+ bp.ADMIN_OR_SYSTEM_READER_OR_CRED_OWNER,
+ 'identity:list_credentials':
+ bp.ADMIN_OR_SYSTEM_READER_OR_CRED_OWNER,
+ 'identity:create_credential': bp.ADMIN_OR_CRED_OWNER,
+ 'identity:update_credential': bp.ADMIN_OR_CRED_OWNER,
+ 'identity:delete_credential': bp.ADMIN_OR_CRED_OWNER
}
f.write(jsonutils.dumps(overridden_policies))
diff --git a/keystone/tests/protection/v3/test_ec2_credential.py b/keystone/tests/protection/v3/test_ec2_credential.py
index 7614173..1f995d5 100644
--- a/keystone/tests/protection/v3/test_ec2_credential.py
+++ b/keystone/tests/protection/v3/test_ec2_credential.py
@@ -402,9 +402,9 @@
# update permissions or update policies without breaking users. This
# will cause these specific tests to fail since we're trying to correct
# this broken behavior with better scope checking.
- reader_or_cred_owner = bp.SYSTEM_READER_OR_CRED_OWNER
+ reader_or_cred_owner = bp.ADMIN_OR_SYSTEM_READER_OR_CRED_OWNER
reader_or_owner = bp.RULE_SYSTEM_READER_OR_OWNER
- admin_or_cred_owner = bp.SYSTEM_ADMIN_OR_CRED_OWNER
+ admin_or_cred_owner = bp.ADMIN_OR_CRED_OWNER
with open(self.policy_file_name, 'w') as f:
overridden_policies = {
'identity:ec2_get_credential': reader_or_cred_owner,
|
