Merge "Implement secure RBAC for share snapshot locations"
This commit is contained in:
commit
81ce53ca28
@ -10,6 +10,7 @@
|
|||||||
# 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 manila.policies import base
|
from manila.policies import base
|
||||||
@ -17,21 +18,40 @@ from manila.policies import base
|
|||||||
|
|
||||||
BASE_POLICY_NAME = 'share_snapshot_export_location:%s'
|
BASE_POLICY_NAME = 'share_snapshot_export_location:%s'
|
||||||
|
|
||||||
|
DEPRECATED_REASON = """
|
||||||
|
The share snapshot location API now supports system scope and default roles.
|
||||||
|
"""
|
||||||
|
|
||||||
|
deprecated_snapshot_location_index = policy.DeprecatedRule(
|
||||||
|
name=BASE_POLICY_NAME % 'index',
|
||||||
|
check_str=base.RULE_DEFAULT
|
||||||
|
)
|
||||||
|
deprecated_snapshot_location_show = policy.DeprecatedRule(
|
||||||
|
name=BASE_POLICY_NAME % 'show',
|
||||||
|
check_str=base.RULE_DEFAULT
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
share_snapshot_export_location_policies = [
|
share_snapshot_export_location_policies = [
|
||||||
policy.DocumentedRuleDefault(
|
policy.DocumentedRuleDefault(
|
||||||
name=BASE_POLICY_NAME % 'index',
|
name=BASE_POLICY_NAME % 'index',
|
||||||
check_str=base.RULE_DEFAULT,
|
check_str=base.SYSTEM_OR_PROJECT_READER,
|
||||||
|
scope_types=['system', 'project'],
|
||||||
description="List export locations of a share snapshot.",
|
description="List export locations of a share snapshot.",
|
||||||
operations=[
|
operations=[
|
||||||
{
|
{
|
||||||
'method': 'GET',
|
'method': 'GET',
|
||||||
'path': '/snapshots/{snapshot_id}/export-locations/',
|
'path': '/snapshots/{snapshot_id}/export-locations/',
|
||||||
}
|
}
|
||||||
]),
|
],
|
||||||
|
deprecated_rule=deprecated_snapshot_location_index,
|
||||||
|
deprecated_reason=DEPRECATED_REASON,
|
||||||
|
deprecated_since=versionutils.deprecated.WALLABY
|
||||||
|
),
|
||||||
policy.DocumentedRuleDefault(
|
policy.DocumentedRuleDefault(
|
||||||
name=BASE_POLICY_NAME % 'show',
|
name=BASE_POLICY_NAME % 'show',
|
||||||
check_str=base.RULE_DEFAULT,
|
check_str=base.SYSTEM_OR_PROJECT_READER,
|
||||||
|
scope_types=['system', 'project'],
|
||||||
description="Get details of a specified export location of a "
|
description="Get details of a specified export location of a "
|
||||||
"share snapshot.",
|
"share snapshot.",
|
||||||
operations=[
|
operations=[
|
||||||
@ -40,7 +60,11 @@ share_snapshot_export_location_policies = [
|
|||||||
'path': ('/snapshots/{snapshot_id}/'
|
'path': ('/snapshots/{snapshot_id}/'
|
||||||
'export-locations/{export_location_id}'),
|
'export-locations/{export_location_id}'),
|
||||||
}
|
}
|
||||||
]),
|
],
|
||||||
|
deprecated_rule=deprecated_snapshot_location_show,
|
||||||
|
deprecated_reason=DEPRECATED_REASON,
|
||||||
|
deprecated_since=versionutils.deprecated.WALLABY
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user