openstack/neutron
Code Issues Proposed changes

Merge "Implement secure RBAC for the l3 conntrack helper API"

Browse Source
This commit is contained in:
Zuul
2021-03-13 22:53:03 +00:00
committed by Gerrit Code Review
parent 79d61176af d7c98a01a4
commit 5f6fbcb155
1 changed files with 57 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
neutron/conf/policies/l3_conntrack_helper.py
View File

@@ -11,11 +11,16 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from oslo_log import versionutils
from oslo_policy import policy from oslo_policy import policy
from neutron.conf.policies import base from neutron.conf.policies import base
DEPRECATED_REASON = """
The router conntrack API now supports system scope and default roles.
"""
COLLECTION_PATH = '/routers/{router_id}/conntrack_helpers' COLLECTION_PATH = '/routers/{router_id}/conntrack_helpers'
RESOURCE_PATH = ('/routers/{router_id}' RESOURCE_PATH = ('/routers/{router_id}'
'/conntrack_helpers/{conntrack_helper_id}') '/conntrack_helpers/{conntrack_helper_id}')
@@ -23,21 +28,32 @@ RESOURCE_PATH = ('/routers/{router_id}'
rules = [ rules = [
policy.DocumentedRuleDefault( policy.DocumentedRuleDefault(
'create_router_conntrack_helper', name='create_router_conntrack_helper',
base.RULE_ADMIN_OR_PARENT_OWNER, check_str=base.policy_or(
'Create a router conntrack helper', base.SYSTEM_ADMIN_OR_PROJECT_MEMBER,
[ base.RULE_PARENT_OWNER),
scope_types=['system', 'project'],
description='Create a router conntrack helper',
operations=[
{ {
'method': 'POST', 'method': 'POST',
'path': COLLECTION_PATH, 'path': COLLECTION_PATH,
}, },
] ],
deprecated_rule=policy.DeprecatedRule(
name='create_router_conntrack_helper',
check_str=base.RULE_ADMIN_OR_PARENT_OWNER),
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.WALLABY
), ),
policy.DocumentedRuleDefault( policy.DocumentedRuleDefault(
'get_router_conntrack_helper', name='get_router_conntrack_helper',
base.RULE_ADMIN_OR_PARENT_OWNER, check_str=base.policy_or(
'Get a router conntrack helper', base.SYSTEM_OR_PROJECT_READER,
[ base.RULE_PARENT_OWNER),
scope_types=['system', 'project'],
description='Get a router conntrack helper',
operations=[
{ {
'method': 'GET', 'method': 'GET',
'path': COLLECTION_PATH, 'path': COLLECTION_PATH,
@@ -46,29 +62,50 @@ rules = [
'method': 'GET', 'method': 'GET',
'path': RESOURCE_PATH, 'path': RESOURCE_PATH,
}, },
] ],
deprecated_rule=policy.DeprecatedRule(
name='get_router_conntrack_helper',
check_str=base.RULE_ADMIN_OR_PARENT_OWNER),
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.WALLABY
), ),
policy.DocumentedRuleDefault( policy.DocumentedRuleDefault(
'update_router_conntrack_helper', name='update_router_conntrack_helper',
base.RULE_ADMIN_OR_PARENT_OWNER, check_str=base.policy_or(
'Update a router conntrack helper', base.SYSTEM_ADMIN_OR_PROJECT_MEMBER,
[ base.RULE_PARENT_OWNER),
scope_types=['system', 'project'],
description='Update a router conntrack helper',
operations=[
{ {
'method': 'PUT', 'method': 'PUT',
'path': RESOURCE_PATH, 'path': RESOURCE_PATH,
}, },
] ],
deprecated_rule=policy.DeprecatedRule(
name='update_router_conntrack_helper',
check_str=base.RULE_ADMIN_OR_PARENT_OWNER),
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.WALLABY
), ),
policy.DocumentedRuleDefault( policy.DocumentedRuleDefault(
'delete_router_conntrack_helper', name='delete_router_conntrack_helper',
base.RULE_ADMIN_OR_PARENT_OWNER, check_str=base.policy_or(
'Delete a router conntrack helper', base.SYSTEM_ADMIN_OR_PROJECT_MEMBER,
[ base.RULE_PARENT_OWNER),
scope_types=['system', 'project'],
description='Delete a router conntrack helper',
operations=[
{ {
'method': 'DELETE', 'method': 'DELETE',
'path': RESOURCE_PATH, 'path': RESOURCE_PATH,
}, },
] ],
deprecated_rule=policy.DeprecatedRule(
name='delete_router_conntrack_helper',
check_str=base.RULE_ADMIN_OR_PARENT_OWNER),
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.WALLABY
), ),
] ]