Merge "Implement secure RBAC for trunk API"

This commit is contained in:
Zuul 2021-01-27 05:01:51 +00:00 committed by Gerrit Code Review
commit efeb5bb997
1 changed files with 81 additions and 35 deletions

View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import versionutils
from oslo_policy import policy
from neutron.conf.policies import base
@ -18,24 +19,34 @@ from neutron.conf.policies import base
COLLECTION_PATH = '/trunks'
RESOURCE_PATH = '/trunks/{id}'
DEPRECATED_REASON = (
"The trunks API now supports system scope and default roles.")
rules = [
policy.DocumentedRuleDefault(
'create_trunk',
base.RULE_ANY,
'Create a trunk',
[
name='create_trunk',
check_str=base.PROJECT_MEMBER,
scope_types=['project', 'system'],
description='Create a trunk',
operations=[
{
'method': 'POST',
'path': COLLECTION_PATH,
},
]
],
deprecated_rule=policy.DeprecatedRule(
name='create_trunk',
check_str=base.RULE_ANY),
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.WALLABY
),
policy.DocumentedRuleDefault(
'get_trunk',
base.RULE_ADMIN_OR_OWNER,
'Get a trunk',
[
name='get_trunk',
check_str=base.SYSTEM_OR_PROJECT_READER,
scope_types=['project', 'system'],
description='Get a trunk',
operations=[
{
'method': 'GET',
'path': COLLECTION_PATH,
@ -44,62 +55,97 @@ rules = [
'method': 'GET',
'path': RESOURCE_PATH,
},
]
],
deprecated_rule=policy.DeprecatedRule(
name='get_trunk',
check_str=base.RULE_ADMIN_OR_OWNER),
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.WALLABY
),
policy.DocumentedRuleDefault(
'update_trunk',
base.RULE_ADMIN_OR_OWNER,
'Update a trunk',
[
name='update_trunk',
check_str=base.SYSTEM_ADMIN_OR_PROJECT_MEMBER,
scope_types=['project', 'system'],
description='Update a trunk',
operations=[
{
'method': 'PUT',
'path': RESOURCE_PATH,
},
]
],
deprecated_rule=policy.DeprecatedRule(
name='update_trunk',
check_str=base.RULE_ADMIN_OR_OWNER),
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.WALLABY
),
policy.DocumentedRuleDefault(
'delete_trunk',
base.RULE_ADMIN_OR_OWNER,
'Delete a trunk',
[
name='delete_trunk',
check_str=base.SYSTEM_ADMIN_OR_PROJECT_MEMBER,
scope_types=['project', 'system'],
description='Delete a trunk',
operations=[
{
'method': 'DELETE',
'path': RESOURCE_PATH,
},
]
],
deprecated_rule=policy.DeprecatedRule(
name='delete_trunk',
check_str=base.RULE_ADMIN_OR_OWNER),
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.WALLABY
),
policy.DocumentedRuleDefault(
'get_subports',
base.RULE_ANY,
'List subports attached to a trunk',
[
name='get_subports',
check_str=base.SYSTEM_OR_PROJECT_READER,
scope_types=['project', 'system'],
description='List subports attached to a trunk',
operations=[
{
'method': 'GET',
'path': '/trunks/{id}/get_subports',
},
]
],
deprecated_rule=policy.DeprecatedRule(
name='get_subports',
check_str=base.RULE_ANY),
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.WALLABY
),
policy.DocumentedRuleDefault(
'add_subports',
base.RULE_ADMIN_OR_OWNER,
'Add subports to a trunk',
[
name='add_subports',
check_str=base.SYSTEM_ADMIN_OR_PROJECT_MEMBER,
scope_types=['project', 'system'],
description='Add subports to a trunk',
operations=[
{
'method': 'PUT',
'path': '/trunks/{id}/add_subports',
},
]
],
deprecated_rule=policy.DeprecatedRule(
name='add_subports',
check_str=base.RULE_ADMIN_OR_OWNER),
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.WALLABY
),
policy.DocumentedRuleDefault(
'remove_subports',
base.RULE_ADMIN_OR_OWNER,
'Delete subports from a trunk',
[
name='remove_subports',
check_str=base.SYSTEM_ADMIN_OR_PROJECT_MEMBER,
scope_types=['project', 'system'],
description='Delete subports from a trunk',
operations=[
{
'method': 'PUT',
'path': '/trunks/{id}/remove_subports',
},
]
],
deprecated_rule=policy.DeprecatedRule(
name='remove_subports',
check_str=base.RULE_ADMIN_OR_OWNER),
deprecated_reason=DEPRECATED_REASON,
deprecated_since=versionutils.deprecated.WALLABY
),
]