Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Request Review does not apply RBAC in an expected way #11545

Open
wants to merge 2 commits into
base: bugfix
Choose a base branch
from
+10 −2
Open

Request Review does not apply RBAC in an expected way #11545

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a05c8a8
check for global role permissions as well
hblankenship Jan 10, 2025
c2d69be
fix too many lines, redundant backslash
hblankenship Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions dojo/user/queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
from dojo.models import (
Dojo_Group_Member,
Dojo_User,
Global_Role,
Product_Group,
Product_Member,
Product_Type_Group,
Expand All @@ -22,9 +23,12 @@ def get_authorized_users_for_product_type(users, product_type, permission):
.select_related("user")
product_type_groups = Product_Type_Group.objects \
.filter(product_type=product_type, role__in=roles)
global_roles = Global_Role.objects.filter(role__in=roles)
group_members = Dojo_Group_Member.objects \
.filter(group__in=[ptg.group for ptg in product_type_groups]) \
.filter(Q(group__in=[ptg.group for ptg in product_type_groups])
| Q(group__in=[gr.group for gr in global_roles])) \
.select_related("user")

return users.filter(Q(id__in=[ptm.user.id for ptm in product_type_members])
| Q(id__in=[gm.user.id for gm in group_members])
| Q(global_role__role__in=roles)
Expand All @@ -36,6 +40,7 @@ def get_authorized_users_for_product_and_product_type(users, product, permission
users = Dojo_User.objects.filter(is_active=True)

roles = get_roles_for_permission(permission)

product_members = Product_Member.objects \
.filter(product=product, role__in=roles) \
.select_related("user")
Expand All @@ -46,11 +51,14 @@ def get_authorized_users_for_product_and_product_type(users, product, permission
.filter(product=product, role__in=roles)
product_type_groups = Product_Type_Group.objects \
.filter(product_type=product.prod_type, role__in=roles)
global_roles = Global_Role.objects.filter(role__in=roles)
group_members = Dojo_Group_Member.objects \
.filter(
Q(group__in=[pg.group for pg in product_groups])
| Q(group__in=[ptg.group for ptg in product_type_groups])) \
| Q(group__in=[ptg.group for ptg in product_type_groups])
| Q(group__in=[gr.group for gr in global_roles])) \
.select_related("user")

return users.filter(Q(id__in=[pm.user.id for pm in product_members])
| Q(id__in=[ptm.user.id for ptm in product_type_members])
| Q(id__in=[gm.user.id for gm in group_members])
Expand Down
Loading