Browse Source

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

changes/54/743554/1
Zuul 1 week ago
committed by Gerrit Code Review
parent
commit
fbda0423d8
3 changed files with 11 additions and 3 deletions
  1. +2
    -1
      manila/api/v1/shares.py
  2. +1
    -2
      manila/db/sqlalchemy/api.py
  3. +8
    -0
      releasenotes/notes/bug-1885956-enforce-policy-check-getting-share-type-by-name-5eca17b02bea5261.yaml

+ 2
- 1
manila/api/v1/shares.py View File

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


+ 1
- 2
manila/db/sqlalchemy/api.py View File

@@ -3871,8 +3871,7 @@ def share_type_get(context, id, inactive=False, expected_fields=None):


def _share_type_get_by_name(context, name, session=None):
result = (model_query(context, models.ShareTypes, session=session).
options(joinedload('extra_specs')).
result = (_share_type_get_query(context, session=session).
filter_by(name=name).
first())



+ 8
- 0
releasenotes/notes/bug-1885956-enforce-policy-check-getting-share-type-by-name-5eca17b02bea5261.yaml 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.

Loading…
Cancel
Save