-
- Downloads
There was a problem fetching the pipeline summary.
Merge branch 'explicit-requesters-scope' into 'master'
Exclude requesters from Project#members, Group#members and User#members ## What does this MR do? It excludes requesters from the `Project#members`, `Group#members` and `User#members` associations, and adds new `Project#requesters` and `Group#requesters` associations. ## Are there points in the code the reviewer needs to double check? No. ## Why was this MR needed? Without this, if you call `project.members`, requesters are included in the results! This is at best misleading, and at worst can lead to security issues. By excluding requesters from the `#members` associations, we avoid introducing security inadvertently since you have to call the `#requesters` association explicitly to get requesters. ## What are the relevant issue numbers? This is something I realized while fixing the security issue #19102. ## Does this MR meet the acceptance criteria? - [x] I don't think this needs a CHANGELOG since this is an internal change - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !4946
Branches
Tags
Pipeline #
Showing
- app/controllers/admin/groups_controller.rb 1 addition, 0 deletionsapp/controllers/admin/groups_controller.rb
- app/controllers/admin/projects_controller.rb 2 additions, 1 deletionapp/controllers/admin/projects_controller.rb
- app/controllers/concerns/membership_actions.rb 3 additions, 2 deletionsapp/controllers/concerns/membership_actions.rb
- app/controllers/groups/group_members_controller.rb 4 additions, 2 deletionsapp/controllers/groups/group_members_controller.rb
- app/controllers/projects/project_members_controller.rb 6 additions, 3 deletionsapp/controllers/projects/project_members_controller.rb
- app/helpers/members_helper.rb 11 additions, 0 deletionsapp/helpers/members_helper.rb
- app/models/group.rb 5 additions, 4 deletionsapp/models/group.rb
- app/models/member.rb 0 additions, 2 deletionsapp/models/member.rb
- app/models/project.rb 6 additions, 2 deletionsapp/models/project.rb
- app/models/project_team.rb 7 additions, 7 deletionsapp/models/project_team.rb
- app/views/admin/groups/show.html.haml 4 additions, 4 deletionsapp/views/admin/groups/show.html.haml
- app/views/admin/projects/show.html.haml 6 additions, 6 deletionsapp/views/admin/projects/show.html.haml
- app/views/groups/group_members/index.html.haml 5 additions, 5 deletionsapp/views/groups/group_members/index.html.haml
- app/views/layouts/nav/_group_settings.html.haml 1 addition, 1 deletionapp/views/layouts/nav/_group_settings.html.haml
- app/views/layouts/nav/_project.html.haml 1 addition, 1 deletionapp/views/layouts/nav/_project.html.haml
- app/views/projects/project_members/_shared_group_members.html.haml 1 addition, 1 deletion.../projects/project_members/_shared_group_members.html.haml
- app/views/projects/project_members/index.html.haml 3 additions, 3 deletionsapp/views/projects/project_members/index.html.haml
- app/views/shared/members/_access_request_buttons.html.haml 6 additions, 10 deletionsapp/views/shared/members/_access_request_buttons.html.haml
- app/views/shared/members/_requests.html.haml 3 additions, 3 deletionsapp/views/shared/members/_requests.html.haml
- spec/controllers/groups/group_members_controller_spec.rb 3 additions, 3 deletionsspec/controllers/groups/group_members_controller_spec.rb
Loading
Please register or sign in to comment