openstack
/
keystone
Code Issues Proposed changes

Remove v2.0 policies 

In queens the v2.0 APIs were removed. This commit removes the
leftover v2.0 policies documented in the sample policy file.

Change-Id: Ibb841bcbc12d0be365ddb2681310a0eee6724782
This commit is contained in:
Lance Bragstad 2018-02-20 22:21:20 +00:00
parent baedf62836
commit 8948050c03
2 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
doc/source/getting-started/policy_mapping.rst
View File

@ -131,11 +131,8 @@ identity:update_policy PATCH /v3/policy/{pol
identity:delete_policy DELETE /v3/policy/{policy_id}
identity:check_token HEAD /v3/auth/tokens
identity:validate_token GET /v2.0/tokens/{token_id}
GET /v3/auth/tokens
identity:validate_token_head HEAD /v2.0/tokens/{token_id}
identity:revocation_list GET /v2.0/tokens/revoked
GET /v3/auth/tokens/OS-PKI/revoked
identity:validate_token GET /v3/auth/tokens
identity:revocation_list GET /v3/auth/tokens/OS-PKI/revoked
identity:revoke_token DELETE /v3/auth/tokens
identity:create_trust POST /v3/OS-TRUST/trusts
identity:list_trusts GET /v3/OS-TRUST/trusts

11
keystone/common/policies/token.py
View File

@ -44,18 +44,7 @@ token_policies = [
# scope_types=['system', 'project'],
description='Validate a token.',
operations=[{'path': '/v3/auth/tokens',
'method': 'GET'},
{'path': '/v2.0/tokens/{token_id}',
'method': 'GET'}]),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'validate_token_head',
check_str=base.RULE_SERVICE_OR_ADMIN,
# FIXME(lbragstad): See the comment above about why this is commented
# out.
# scope_types=['system', 'project'],
description='Validate a token.',
operations=[{'path': '/v2.0/tokens/{token_id}',
'method': 'HEAD'}]),
policy.DocumentedRuleDefault(
name=base.IDENTITY % 'revoke_token',
check_str=base.RULE_ADMIN_OR_TOKEN_SUBJECT,