AAP-51957 Move to new DAB RBAC queryset patterns #16118
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AlanCoding
commented
Oct 7, 2025
| filter_args.append( | ||
| Q(Q(**{'%s__pk__in' % res_path: parent_model.accessible_pk_qs(user, '%s_role' % role_type)}) | Q(**{'%s__isnull' % res_path: True})) | ||
| Q( | ||
| Q(**{'%s__pk__in' % res_path: parent_model.access_ids_qs(user, to_permissions['%s_role' % role_type])}) |
Member
Author
There was a problem hiding this comment.
test failure
File "/awx_devel/awx/api/serializers.py", line 509, in _obj_capability_dict
self.context['capability_map'] = prefetch_page_capabilities(model, qs, prefetch_list, view.request.user)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
File "/awx_devel/awx/main/utils/common.py", line 641, in prefetch_page_capabilities
Q(**{'%s__pk__in' % res_path: parent_model.access_ids_qs(user, to_permissions['%s_role' % role_type])})
~~~~~~~~~~~~~~^^^^^^^^^^^^^^^^^^^^^^^
KeyError: 'project_admin_role'
this seems to come from the serializer, from
Line 1347 in 0d18308
This is a coherent "old" role name, but it isn't fully baked in the new system. We just want to check "add_project" permission to the organization. We might want to completely change this contract to the new names to make this make sense.
AlanCoding
commented
Oct 7, 2025
| return cls.objects.filter(pk__in=cls.access_ids_qs(accessor, action)) | ||
|
|
||
| @classmethod | ||
| def accessible_pk_qs(cls, accessor, role_field): |
Member
Author
There was a problem hiding this comment.
will want to delete this
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
SUMMARY
This is outright duplication with DAB, and this patch brings AWX into the same patterns as everything else.
ISSUE TYPE
COMPONENT NAME