openstack/neutron-lib
Code Issues Proposed changes

Merge "Add a "GROUP BY" clause on queries with RBAC entries"

Browse Source
This commit is contained in:
Zuul
2023-06-01 16:54:18 +00:00
committed by Gerrit Code Review
parent 9f72a4722f 829e97024c
commit d6ca110d1a
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
neutron_lib/db/model_query.py
View File

@@ -108,6 +108,7 @@ def query_with_hooks(context, model, field=None, lazy_fields=None):
:param lazy_fields: list of fields for lazy loading :param lazy_fields: list of fields for lazy loading
:returns: The query with hooks applied to it. :returns: The query with hooks applied to it.
""" """
group_by = None
if field: if field:
if hasattr(model, field): if hasattr(model, field):
field = getattr(model, field) field = getattr(model, field)
@@ -129,6 +130,11 @@ def query_with_hooks(context, model, field=None, lazy_fields=None):
[constants.ACCESS_SHARED, constants.ACCESS_READONLY]) & [constants.ACCESS_SHARED, constants.ACCESS_READONLY]) &
((rbac_model.target_project == context.tenant_id) | ((rbac_model.target_project == context.tenant_id) |
(rbac_model.target_project == '*')))) (rbac_model.target_project == '*'))))
# This "group_by" clause will limit the number of registers
# returned by the query, avoiding the problem of the low SQL
# query cardinality when the RBAC registers are in the requested
# project ID.
group_by = model.id
elif hasattr(model, 'shared'): elif hasattr(model, 'shared'):
query_filter = ((model.tenant_id == context.tenant_id) | query_filter = ((model.tenant_id == context.tenant_id) |
(model.shared == sql.true())) (model.shared == sql.true()))
@@ -149,6 +155,9 @@ def query_with_hooks(context, model, field=None, lazy_fields=None):
if query_filter is not None: if query_filter is not None:
query = query.filter(query_filter) query = query.filter(query_filter)
if group_by:
query = query.group_by(group_by)
if lazy_fields: if lazy_fields:
for field in lazy_fields: for field in lazy_fields:
query = query.options(lazyload(field)) query = query.options(lazyload(field))