openstack
/
manila
Code Issues Proposed changes

Merge "Enforce policy checks getting share-type by name" into stable/rocky

This commit is contained in:
Zuul 2020-07-25 00:29:55 +00:00 committed by Gerrit Code Review
parent 764c2edb50 11971a94d3
commit 93df7fb072
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manila/api/v1/shares.py
View File

@ -347,7 +347,8 @@ class ShareMixin(object):
else: else:
share_type = share_types.get_share_type( share_type = share_types.get_share_type(
context, req_share_type) context, req_share_type)
except exception.ShareTypeNotFound: except (exception.ShareTypeNotFound,
exception.ShareTypeNotFoundByName):
msg = _("Share type not found.") msg = _("Share type not found.")
raise exc.HTTPNotFound(explanation=msg) raise exc.HTTPNotFound(explanation=msg)
elif not snapshot: elif not snapshot:

3
manila/db/sqlalchemy/api.py
View File

@ -3938,8 +3938,7 @@ def share_type_get(context, id, inactive=False, expected_fields=None):
def _share_type_get_by_name(context, name, session=None): def _share_type_get_by_name(context, name, session=None):
result = (model_query(context, models.ShareTypes, session=session). result = (_share_type_get_query(context, session=session).
options(joinedload('extra_specs')).
filter_by(name=name). filter_by(name=name).
first()) first())

8
releasenotes/notes/bug-1885956-enforce-policy-check-getting-share-type-by-name-5eca17b02bea5261.yaml Normal file
View File

@ -0,0 +1,8 @@
---
fixes:
- |
Fixed `launchpad bug #1885956 <https://bugs.launchpad.net/manila/+bug/1885956>`_
by ensuring that policy checks are enforced when looking up a share-type
by name. This prevents a problem where shares could be stuck in CREATING
status when a user attempts to create a share using the name of a private
share-type to which the user lacks access.