diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-24 12:01:48 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-24 12:01:48 +0200 |
| commit | aec3475df94bc9681a723c344f3df05972ebe68c (patch) | |
| tree | 3ed0b3d284fc4c0657f06489a5403f1c30126b30 /app/models/group.rb | |
| parent | 4477dc249e563e60e126d4f5ad2692297a9584c1 (diff) | |
| download | gitlab-ce-aec3475df94bc9681a723c344f3df05972ebe68c.tar.gz | |
Fix an information disclosure when requesting access to a group containing private projects
The issue was with the `User#groups` and `User#projects` associations
which goes through the `User#group_members` and `User#project_members`.
Initially I chose to use a secure approach by storing the requester's
user ID in `Member#created_by_id` instead of `Member#user_id` because I
was aware that there was a security risk since I didn't know the
codebase well enough.
Then during the review, we decided to change that and directly store the
requester's user ID into `Member#user_id` (for the sake of simplifying
the code I believe), meaning that every `group_members` / `project_members`
association would include the requesters by default...
My bad for not checking that all the `group_members` / `project_members`
associations and the ones that go through them (e.g. `Group#users` and
`Project#users`) were made safe with the `where(requested_at: nil)` /
`where(members: { requested_at: nil })` scopes.
Now they are all secure.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/models/group.rb')
| -rw-r--r-- | app/models/group.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index e66e04371b2..c70c719e338 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -11,7 +11,7 @@ class Group < Namespace has_many :users, -> { where(members: { requested_at: nil }) }, through: :group_members has_many :owners, - -> { where(members: { access_level: Gitlab::Access::OWNER }) }, + -> { where(members: { requested_at: nil, access_level: Gitlab::Access::OWNER }) }, through: :group_members, source: :user |