fix: prevent unauthorised access from group permissions - #5865
Closed
matthewelwell wants to merge 15 commits into
Closed
fix: prevent unauthorised access from group permissions#5865matthewelwell wants to merge 15 commits into
matthewelwell wants to merge 15 commits into
Conversation
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
1 Skipped Deployment
|
Contributor
Docker builds report
|
matthewelwell
commented
Jul 30, 2025
Contributor
Author
There was a problem hiding this comment.
I'm not entirely convinced that the extra checks that I've added here are the most optimal way of adding this logic, but I couldn't find a single entrypoint to the permissions service which would allow me to add it.
Keen to get @gagantrivedi 's opinion on this topic.
Member
There was a problem hiding this comment.
Yeah, doesn't look like there is a better way
| queryset = user_permission_group_membership_model.objects.exclude( | ||
| ffadminuser__organisations=F("userpermissiongroup__organisation") | ||
| ) | ||
| logger.info("Removing orphan group memberships.", num_orphan_memberships=queryset.count()) |
Contributor
Author
There was a problem hiding this comment.
I've purposefully added one such record to the staging database. We should verify in the logs on staging that this migration behaves as we expect before running the migration in production.
gagantrivedi
previously approved these changes
Jul 31, 2025
matthewelwell
force-pushed
the
fix/prevent-unauthorised-access-from-group-permissions
branch
from
August 4, 2025 16:19
c77fb26 to
46eeb6f
Compare
matthewelwell
changed the base branch from
main
to
test/combine-staff-and-test-user-fixtures
August 4, 2025 16:21
…nto fix/prevent-unauthorised-access-from-group-permissions
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## test/combine-staff-and-test-user-fixtures #5865 +/- ##
==========================================================================
Coverage 97.82% 97.83%
==========================================================================
Files 1258 1260 +2
Lines 44846 44920 +74
==========================================================================
+ Hits 43872 43946 +74
Misses 974 974 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Base automatically changed from
test/combine-staff-and-test-user-fixtures
to
main
August 5, 2025 12:45
Contributor
Author
|
Superseded by #5893 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Changes
This PR prevents users that were part of groups in organisations that they no longer belong to from accessing the resources in that organisation.
From testing, the only way that this was possible in the first place was if the user was removed from the organisation in one of the following non-standard ways:
Note that this PR also includes a (tested) migration to remove any users from groups in organisations they do not belong to.
How did you test this code?
Added a lot of new unit tests.