2013-01-04 16:35:31 -05:00
|
|
|
require "spec_helper"
|
|
|
|
|
2015-12-09 04:50:51 -05:00
|
|
|
describe ProjectTeam, models: true do
|
2014-06-04 04:52:17 -04:00
|
|
|
let(:master) { create(:user) }
|
|
|
|
let(:reporter) { create(:user) }
|
|
|
|
let(:guest) { create(:user) }
|
|
|
|
let(:nonmember) { create(:user) }
|
2013-01-04 16:35:31 -05:00
|
|
|
|
2014-06-20 05:54:03 -04:00
|
|
|
context 'personal project' do
|
|
|
|
let(:project) { create(:empty_project) }
|
2014-06-04 04:52:17 -04:00
|
|
|
|
2014-06-20 05:54:03 -04:00
|
|
|
before do
|
2016-11-18 07:52:39 -05:00
|
|
|
project.add_master(master)
|
|
|
|
project.add_reporter(reporter)
|
|
|
|
project.add_guest(guest)
|
2014-06-20 05:54:03 -04:00
|
|
|
end
|
2014-06-04 04:52:17 -04:00
|
|
|
|
2014-06-20 05:54:03 -04:00
|
|
|
describe 'members collection' do
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(project.team.masters).to include(master) }
|
|
|
|
it { expect(project.team.masters).not_to include(guest) }
|
|
|
|
it { expect(project.team.masters).not_to include(reporter) }
|
|
|
|
it { expect(project.team.masters).not_to include(nonmember) }
|
2014-06-20 05:54:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe 'access methods' do
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(project.team.master?(master)).to be_truthy }
|
|
|
|
it { expect(project.team.master?(guest)).to be_falsey }
|
|
|
|
it { expect(project.team.master?(reporter)).to be_falsey }
|
|
|
|
it { expect(project.team.master?(nonmember)).to be_falsey }
|
|
|
|
it { expect(project.team.member?(nonmember)).to be_falsey }
|
|
|
|
it { expect(project.team.member?(guest)).to be_truthy }
|
2016-06-06 15:13:31 -04:00
|
|
|
it { expect(project.team.member?(reporter, Gitlab::Access::REPORTER)).to be_truthy }
|
|
|
|
it { expect(project.team.member?(guest, Gitlab::Access::REPORTER)).to be_falsey }
|
|
|
|
it { expect(project.team.member?(nonmember, Gitlab::Access::GUEST)).to be_falsey }
|
2014-06-20 05:54:03 -04:00
|
|
|
end
|
2014-06-04 04:52:17 -04:00
|
|
|
end
|
|
|
|
|
2014-06-20 05:54:03 -04:00
|
|
|
context 'group project' do
|
|
|
|
let(:group) { create(:group) }
|
2016-11-21 08:36:40 -05:00
|
|
|
let!(:project) { create(:empty_project, group: group) }
|
2014-06-20 05:54:03 -04:00
|
|
|
|
|
|
|
before do
|
2015-08-07 00:20:02 -04:00
|
|
|
group.add_master(master)
|
|
|
|
group.add_reporter(reporter)
|
|
|
|
group.add_guest(guest)
|
2014-06-20 05:54:03 -04:00
|
|
|
|
|
|
|
# If user is a group and a project member - GitLab uses highest permission
|
|
|
|
# So we add group guest as master and add group master as guest
|
|
|
|
# to this project to test highest access
|
2016-11-18 07:52:39 -05:00
|
|
|
project.add_master(guest)
|
|
|
|
project.add_guest(master)
|
2014-06-20 05:54:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe 'members collection' do
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(project.team.reporters).to include(reporter) }
|
|
|
|
it { expect(project.team.masters).to include(master) }
|
|
|
|
it { expect(project.team.masters).to include(guest) }
|
|
|
|
it { expect(project.team.masters).not_to include(reporter) }
|
|
|
|
it { expect(project.team.masters).not_to include(nonmember) }
|
2014-06-20 05:54:03 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
describe 'access methods' do
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(project.team.reporter?(reporter)).to be_truthy }
|
|
|
|
it { expect(project.team.master?(master)).to be_truthy }
|
|
|
|
it { expect(project.team.master?(guest)).to be_truthy }
|
|
|
|
it { expect(project.team.master?(reporter)).to be_falsey }
|
|
|
|
it { expect(project.team.master?(nonmember)).to be_falsey }
|
|
|
|
it { expect(project.team.member?(nonmember)).to be_falsey }
|
|
|
|
it { expect(project.team.member?(guest)).to be_truthy }
|
2016-06-06 15:13:31 -04:00
|
|
|
it { expect(project.team.member?(guest, Gitlab::Access::MASTER)).to be_truthy }
|
|
|
|
it { expect(project.team.member?(reporter, Gitlab::Access::MASTER)).to be_falsey }
|
|
|
|
it { expect(project.team.member?(nonmember, Gitlab::Access::GUEST)).to be_falsey }
|
2014-06-20 05:54:03 -04:00
|
|
|
end
|
2013-01-04 01:43:25 -05:00
|
|
|
end
|
2015-10-02 08:10:33 -04:00
|
|
|
|
2016-09-20 08:18:11 -04:00
|
|
|
describe '#fetch_members' do
|
|
|
|
context 'personal project' do
|
|
|
|
let(:project) { create(:empty_project) }
|
|
|
|
|
|
|
|
it 'returns project members' do
|
|
|
|
user = create(:user)
|
2016-11-18 07:52:39 -05:00
|
|
|
project.add_guest(user)
|
2016-09-20 08:18:11 -04:00
|
|
|
|
Use CTEs for nested groups and authorizations
This commit introduces the usage of Common Table Expressions (CTEs) to
efficiently retrieve nested group hierarchies, without having to rely on
the "routes" table (which is an _incredibly_ inefficient way of getting
the data). This requires a patch to ActiveRecord (found in the added
initializer) to work properly as ActiveRecord doesn't support WITH
statements properly out of the box.
Unfortunately MySQL provides no efficient way of getting nested groups.
For example, the old routes setup could easily take 5-10 seconds
depending on the amount of "routes" in a database. Providing vastly
different logic for both MySQL and PostgreSQL will negatively impact the
development process. Because of this the various nested groups related
methods return empty relations when used in combination with MySQL.
For project authorizations the logic is split up into two classes:
* Gitlab::ProjectAuthorizations::WithNestedGroups
* Gitlab::ProjectAuthorizations::WithoutNestedGroups
Both classes get the fresh project authorizations (= as they should be
in the "project_authorizations" table), including nested groups if
PostgreSQL is used. The logic of these two classes is quite different
apart from their public interface. This complicates development a bit,
but unfortunately there is no way around this.
This commit also introduces Gitlab::GroupHierarchy. This class can be
used to get the ancestors and descendants of a base relation, or both by
using a UNION. This in turn is used by methods such as:
* Namespace#ancestors
* Namespace#descendants
* User#all_expanded_groups
Again this class relies on CTEs and thus only works on PostgreSQL. The
Namespace methods will return an empty relation when MySQL is used,
while User#all_expanded_groups will return only the groups a user is a
direct member of.
Performance wise the impact is quite large. For example, on GitLab.com
Namespace#descendants used to take around 580 ms to retrieve data for a
particular user. Using CTEs we are able to reduce this down to roughly 1
millisecond, returning the exact same data.
== On The Fly Refreshing
Refreshing of authorizations on the fly (= when
users.authorized_projects_populated was not set) is removed with this
commit. This simplifies the code, and ensures any queries used for
authorizations are not mutated because they are executed in a Rails
scope (e.g. Project.visible_to_user).
This commit includes a migration to schedule refreshing authorizations
for all users, ensuring all of them have their authorizations in place.
Said migration schedules users in batches of 5000, with 5 minutes
between every batch to smear the load around a bit.
== Spec Changes
This commit also introduces some changes to various specs. For example,
some specs for ProjectTeam assumed that creating a personal project
would _not_ lead to the owner having access, which is incorrect. Because
we also no longer refresh authorizations on the fly for new users some
code had to be added to the "empty_project" factory. This chunk of code
ensures that the owner's permissions are refreshed after creating the
project, something that is normally done in Projects::CreateService.
2017-04-24 11:19:22 -04:00
|
|
|
expect(project.team.members).to contain_exactly(user, project.owner)
|
2016-09-20 08:18:11 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns project members of a specified level' do
|
|
|
|
user = create(:user)
|
2016-11-18 07:52:39 -05:00
|
|
|
project.add_reporter(user)
|
2016-09-20 08:18:11 -04:00
|
|
|
|
|
|
|
expect(project.team.guests).to be_empty
|
|
|
|
expect(project.team.reporters).to contain_exactly(user)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns invited members of a group' do
|
|
|
|
group_member = create(:group_member)
|
|
|
|
|
|
|
|
project.project_group_links.create!(
|
|
|
|
group: group_member.group,
|
|
|
|
group_access: Gitlab::Access::GUEST
|
|
|
|
)
|
|
|
|
|
2017-06-21 09:48:12 -04:00
|
|
|
expect(project.team.members)
|
|
|
|
.to contain_exactly(group_member.user, project.owner)
|
2016-09-20 08:18:11 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns invited members of a group of a specified level' do
|
|
|
|
group_member = create(:group_member)
|
|
|
|
|
|
|
|
project.project_group_links.create!(
|
|
|
|
group: group_member.group,
|
|
|
|
group_access: Gitlab::Access::REPORTER
|
|
|
|
)
|
|
|
|
|
2016-09-20 14:48:58 -04:00
|
|
|
expect(project.team.guests).to be_empty
|
2016-09-20 08:18:11 -04:00
|
|
|
expect(project.team.reporters).to contain_exactly(group_member.user)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'group project' do
|
|
|
|
let(:group) { create(:group) }
|
2016-11-21 09:26:12 -05:00
|
|
|
let!(:project) { create(:empty_project, group: group) }
|
2016-09-20 08:18:11 -04:00
|
|
|
|
|
|
|
it 'returns project members' do
|
|
|
|
group_member = create(:group_member, group: group)
|
|
|
|
|
|
|
|
expect(project.team.members).to contain_exactly(group_member.user)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns project members of a specified level' do
|
|
|
|
group_member = create(:group_member, :reporter, group: group)
|
|
|
|
|
|
|
|
expect(project.team.guests).to be_empty
|
|
|
|
expect(project.team.reporters).to contain_exactly(group_member.user)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-04-18 12:53:32 -04:00
|
|
|
describe '#find_member' do
|
|
|
|
context 'personal project' do
|
Use CTEs for nested groups and authorizations
This commit introduces the usage of Common Table Expressions (CTEs) to
efficiently retrieve nested group hierarchies, without having to rely on
the "routes" table (which is an _incredibly_ inefficient way of getting
the data). This requires a patch to ActiveRecord (found in the added
initializer) to work properly as ActiveRecord doesn't support WITH
statements properly out of the box.
Unfortunately MySQL provides no efficient way of getting nested groups.
For example, the old routes setup could easily take 5-10 seconds
depending on the amount of "routes" in a database. Providing vastly
different logic for both MySQL and PostgreSQL will negatively impact the
development process. Because of this the various nested groups related
methods return empty relations when used in combination with MySQL.
For project authorizations the logic is split up into two classes:
* Gitlab::ProjectAuthorizations::WithNestedGroups
* Gitlab::ProjectAuthorizations::WithoutNestedGroups
Both classes get the fresh project authorizations (= as they should be
in the "project_authorizations" table), including nested groups if
PostgreSQL is used. The logic of these two classes is quite different
apart from their public interface. This complicates development a bit,
but unfortunately there is no way around this.
This commit also introduces Gitlab::GroupHierarchy. This class can be
used to get the ancestors and descendants of a base relation, or both by
using a UNION. This in turn is used by methods such as:
* Namespace#ancestors
* Namespace#descendants
* User#all_expanded_groups
Again this class relies on CTEs and thus only works on PostgreSQL. The
Namespace methods will return an empty relation when MySQL is used,
while User#all_expanded_groups will return only the groups a user is a
direct member of.
Performance wise the impact is quite large. For example, on GitLab.com
Namespace#descendants used to take around 580 ms to retrieve data for a
particular user. Using CTEs we are able to reduce this down to roughly 1
millisecond, returning the exact same data.
== On The Fly Refreshing
Refreshing of authorizations on the fly (= when
users.authorized_projects_populated was not set) is removed with this
commit. This simplifies the code, and ensures any queries used for
authorizations are not mutated because they are executed in a Rails
scope (e.g. Project.visible_to_user).
This commit includes a migration to schedule refreshing authorizations
for all users, ensuring all of them have their authorizations in place.
Said migration schedules users in batches of 5000, with 5 minutes
between every batch to smear the load around a bit.
== Spec Changes
This commit also introduces some changes to various specs. For example,
some specs for ProjectTeam assumed that creating a personal project
would _not_ lead to the owner having access, which is incorrect. Because
we also no longer refresh authorizations on the fly for new users some
code had to be added to the "empty_project" factory. This chunk of code
ensures that the owner's permissions are refreshed after creating the
project, something that is normally done in Projects::CreateService.
2017-04-24 11:19:22 -04:00
|
|
|
let(:project) do
|
|
|
|
create(:empty_project, :public, :access_requestable)
|
|
|
|
end
|
|
|
|
|
2016-04-18 12:53:32 -04:00
|
|
|
let(:requester) { create(:user) }
|
|
|
|
|
|
|
|
before do
|
2016-11-18 07:52:39 -05:00
|
|
|
project.add_master(master)
|
|
|
|
project.add_reporter(reporter)
|
|
|
|
project.add_guest(guest)
|
2016-04-18 12:53:32 -04:00
|
|
|
project.request_access(requester)
|
|
|
|
end
|
|
|
|
|
|
|
|
it { expect(project.team.find_member(master.id)).to be_a(ProjectMember) }
|
|
|
|
it { expect(project.team.find_member(reporter.id)).to be_a(ProjectMember) }
|
|
|
|
it { expect(project.team.find_member(guest.id)).to be_a(ProjectMember) }
|
|
|
|
it { expect(project.team.find_member(nonmember.id)).to be_nil }
|
|
|
|
it { expect(project.team.find_member(requester.id)).to be_nil }
|
2016-03-12 08:45:14 -05:00
|
|
|
end
|
|
|
|
|
2016-04-18 12:53:32 -04:00
|
|
|
context 'group project' do
|
2016-11-11 07:51:50 -05:00
|
|
|
let(:group) { create(:group, :access_requestable) }
|
2016-04-18 12:53:32 -04:00
|
|
|
let(:project) { create(:empty_project, group: group) }
|
|
|
|
let(:requester) { create(:user) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
group.add_master(master)
|
|
|
|
group.add_reporter(reporter)
|
|
|
|
group.add_guest(guest)
|
|
|
|
group.request_access(requester)
|
|
|
|
end
|
|
|
|
|
|
|
|
it { expect(project.team.find_member(master.id)).to be_a(GroupMember) }
|
|
|
|
it { expect(project.team.find_member(reporter.id)).to be_a(GroupMember) }
|
|
|
|
it { expect(project.team.find_member(guest.id)).to be_a(GroupMember) }
|
|
|
|
it { expect(project.team.find_member(nonmember.id)).to be_nil }
|
|
|
|
it { expect(project.team.find_member(requester.id)).to be_nil }
|
2016-03-12 08:45:14 -05:00
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-06-02 12:05:06 -04:00
|
|
|
describe "#human_max_access" do
|
|
|
|
it 'returns Master role' do
|
|
|
|
user = create(:user)
|
|
|
|
group = create(:group)
|
2016-11-21 08:36:40 -05:00
|
|
|
project = create(:empty_project, namespace: group)
|
2016-06-02 12:05:06 -04:00
|
|
|
|
2016-11-21 08:36:40 -05:00
|
|
|
group.add_master(user)
|
2016-06-02 12:05:06 -04:00
|
|
|
|
|
|
|
expect(project.team.human_max_access(user.id)).to eq 'Master'
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns Owner role' do
|
|
|
|
user = create(:user)
|
|
|
|
group = create(:group)
|
2016-11-21 08:36:40 -05:00
|
|
|
project = create(:empty_project, namespace: group)
|
2016-06-02 12:05:06 -04:00
|
|
|
|
2016-11-21 08:36:40 -05:00
|
|
|
group.add_owner(user)
|
2016-06-02 12:05:06 -04:00
|
|
|
|
|
|
|
expect(project.team.human_max_access(user.id)).to eq 'Owner'
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-04-18 12:53:32 -04:00
|
|
|
describe '#max_member_access' do
|
|
|
|
let(:requester) { create(:user) }
|
|
|
|
|
|
|
|
context 'personal project' do
|
Use CTEs for nested groups and authorizations
This commit introduces the usage of Common Table Expressions (CTEs) to
efficiently retrieve nested group hierarchies, without having to rely on
the "routes" table (which is an _incredibly_ inefficient way of getting
the data). This requires a patch to ActiveRecord (found in the added
initializer) to work properly as ActiveRecord doesn't support WITH
statements properly out of the box.
Unfortunately MySQL provides no efficient way of getting nested groups.
For example, the old routes setup could easily take 5-10 seconds
depending on the amount of "routes" in a database. Providing vastly
different logic for both MySQL and PostgreSQL will negatively impact the
development process. Because of this the various nested groups related
methods return empty relations when used in combination with MySQL.
For project authorizations the logic is split up into two classes:
* Gitlab::ProjectAuthorizations::WithNestedGroups
* Gitlab::ProjectAuthorizations::WithoutNestedGroups
Both classes get the fresh project authorizations (= as they should be
in the "project_authorizations" table), including nested groups if
PostgreSQL is used. The logic of these two classes is quite different
apart from their public interface. This complicates development a bit,
but unfortunately there is no way around this.
This commit also introduces Gitlab::GroupHierarchy. This class can be
used to get the ancestors and descendants of a base relation, or both by
using a UNION. This in turn is used by methods such as:
* Namespace#ancestors
* Namespace#descendants
* User#all_expanded_groups
Again this class relies on CTEs and thus only works on PostgreSQL. The
Namespace methods will return an empty relation when MySQL is used,
while User#all_expanded_groups will return only the groups a user is a
direct member of.
Performance wise the impact is quite large. For example, on GitLab.com
Namespace#descendants used to take around 580 ms to retrieve data for a
particular user. Using CTEs we are able to reduce this down to roughly 1
millisecond, returning the exact same data.
== On The Fly Refreshing
Refreshing of authorizations on the fly (= when
users.authorized_projects_populated was not set) is removed with this
commit. This simplifies the code, and ensures any queries used for
authorizations are not mutated because they are executed in a Rails
scope (e.g. Project.visible_to_user).
This commit includes a migration to schedule refreshing authorizations
for all users, ensuring all of them have their authorizations in place.
Said migration schedules users in batches of 5000, with 5 minutes
between every batch to smear the load around a bit.
== Spec Changes
This commit also introduces some changes to various specs. For example,
some specs for ProjectTeam assumed that creating a personal project
would _not_ lead to the owner having access, which is incorrect. Because
we also no longer refresh authorizations on the fly for new users some
code had to be added to the "empty_project" factory. This chunk of code
ensures that the owner's permissions are refreshed after creating the
project, something that is normally done in Projects::CreateService.
2017-04-24 11:19:22 -04:00
|
|
|
let(:project) do
|
|
|
|
create(:empty_project, :public, :access_requestable)
|
|
|
|
end
|
2016-04-18 12:53:32 -04:00
|
|
|
|
|
|
|
context 'when project is not shared with group' do
|
|
|
|
before do
|
2016-11-18 07:52:39 -05:00
|
|
|
project.add_master(master)
|
|
|
|
project.add_reporter(reporter)
|
|
|
|
project.add_guest(guest)
|
2016-04-18 12:53:32 -04:00
|
|
|
project.request_access(requester)
|
|
|
|
end
|
|
|
|
|
|
|
|
it { expect(project.team.max_member_access(master.id)).to eq(Gitlab::Access::MASTER) }
|
|
|
|
it { expect(project.team.max_member_access(reporter.id)).to eq(Gitlab::Access::REPORTER) }
|
|
|
|
it { expect(project.team.max_member_access(guest.id)).to eq(Gitlab::Access::GUEST) }
|
2016-07-20 00:52:31 -04:00
|
|
|
it { expect(project.team.max_member_access(nonmember.id)).to eq(Gitlab::Access::NO_ACCESS) }
|
|
|
|
it { expect(project.team.max_member_access(requester.id)).to eq(Gitlab::Access::NO_ACCESS) }
|
2016-04-18 12:53:32 -04:00
|
|
|
end
|
|
|
|
|
|
|
|
context 'when project is shared with group' do
|
|
|
|
before do
|
|
|
|
group = create(:group)
|
|
|
|
project.project_group_links.create(
|
|
|
|
group: group,
|
|
|
|
group_access: Gitlab::Access::DEVELOPER)
|
|
|
|
|
|
|
|
group.add_master(master)
|
|
|
|
group.add_reporter(reporter)
|
|
|
|
end
|
|
|
|
|
|
|
|
it { expect(project.team.max_member_access(master.id)).to eq(Gitlab::Access::DEVELOPER) }
|
|
|
|
it { expect(project.team.max_member_access(reporter.id)).to eq(Gitlab::Access::REPORTER) }
|
2016-07-20 00:52:31 -04:00
|
|
|
it { expect(project.team.max_member_access(nonmember.id)).to eq(Gitlab::Access::NO_ACCESS) }
|
|
|
|
it { expect(project.team.max_member_access(requester.id)).to eq(Gitlab::Access::NO_ACCESS) }
|
2016-04-18 12:53:32 -04:00
|
|
|
|
|
|
|
context 'but share_with_group_lock is true' do
|
2017-06-14 14:18:56 -04:00
|
|
|
before do
|
|
|
|
project.namespace.update(share_with_group_lock: true)
|
|
|
|
end
|
2016-04-18 12:53:32 -04:00
|
|
|
|
2016-07-20 00:52:31 -04:00
|
|
|
it { expect(project.team.max_member_access(master.id)).to eq(Gitlab::Access::NO_ACCESS) }
|
|
|
|
it { expect(project.team.max_member_access(reporter.id)).to eq(Gitlab::Access::NO_ACCESS) }
|
2016-04-18 12:53:32 -04:00
|
|
|
end
|
|
|
|
end
|
2016-02-18 16:39:59 -05:00
|
|
|
end
|
|
|
|
|
2016-04-18 12:53:32 -04:00
|
|
|
context 'group project' do
|
2016-11-11 07:51:50 -05:00
|
|
|
let(:group) { create(:group, :access_requestable) }
|
Use CTEs for nested groups and authorizations
This commit introduces the usage of Common Table Expressions (CTEs) to
efficiently retrieve nested group hierarchies, without having to rely on
the "routes" table (which is an _incredibly_ inefficient way of getting
the data). This requires a patch to ActiveRecord (found in the added
initializer) to work properly as ActiveRecord doesn't support WITH
statements properly out of the box.
Unfortunately MySQL provides no efficient way of getting nested groups.
For example, the old routes setup could easily take 5-10 seconds
depending on the amount of "routes" in a database. Providing vastly
different logic for both MySQL and PostgreSQL will negatively impact the
development process. Because of this the various nested groups related
methods return empty relations when used in combination with MySQL.
For project authorizations the logic is split up into two classes:
* Gitlab::ProjectAuthorizations::WithNestedGroups
* Gitlab::ProjectAuthorizations::WithoutNestedGroups
Both classes get the fresh project authorizations (= as they should be
in the "project_authorizations" table), including nested groups if
PostgreSQL is used. The logic of these two classes is quite different
apart from their public interface. This complicates development a bit,
but unfortunately there is no way around this.
This commit also introduces Gitlab::GroupHierarchy. This class can be
used to get the ancestors and descendants of a base relation, or both by
using a UNION. This in turn is used by methods such as:
* Namespace#ancestors
* Namespace#descendants
* User#all_expanded_groups
Again this class relies on CTEs and thus only works on PostgreSQL. The
Namespace methods will return an empty relation when MySQL is used,
while User#all_expanded_groups will return only the groups a user is a
direct member of.
Performance wise the impact is quite large. For example, on GitLab.com
Namespace#descendants used to take around 580 ms to retrieve data for a
particular user. Using CTEs we are able to reduce this down to roughly 1
millisecond, returning the exact same data.
== On The Fly Refreshing
Refreshing of authorizations on the fly (= when
users.authorized_projects_populated was not set) is removed with this
commit. This simplifies the code, and ensures any queries used for
authorizations are not mutated because they are executed in a Rails
scope (e.g. Project.visible_to_user).
This commit includes a migration to schedule refreshing authorizations
for all users, ensuring all of them have their authorizations in place.
Said migration schedules users in batches of 5000, with 5 minutes
between every batch to smear the load around a bit.
== Spec Changes
This commit also introduces some changes to various specs. For example,
some specs for ProjectTeam assumed that creating a personal project
would _not_ lead to the owner having access, which is incorrect. Because
we also no longer refresh authorizations on the fly for new users some
code had to be added to the "empty_project" factory. This chunk of code
ensures that the owner's permissions are refreshed after creating the
project, something that is normally done in Projects::CreateService.
2017-04-24 11:19:22 -04:00
|
|
|
let!(:project) do
|
|
|
|
create(:empty_project, group: group)
|
|
|
|
end
|
2016-04-18 12:53:32 -04:00
|
|
|
|
|
|
|
before do
|
|
|
|
group.add_master(master)
|
|
|
|
group.add_reporter(reporter)
|
|
|
|
group.add_guest(guest)
|
|
|
|
group.request_access(requester)
|
|
|
|
end
|
|
|
|
|
|
|
|
it { expect(project.team.max_member_access(master.id)).to eq(Gitlab::Access::MASTER) }
|
|
|
|
it { expect(project.team.max_member_access(reporter.id)).to eq(Gitlab::Access::REPORTER) }
|
|
|
|
it { expect(project.team.max_member_access(guest.id)).to eq(Gitlab::Access::GUEST) }
|
2016-07-20 00:52:31 -04:00
|
|
|
it { expect(project.team.max_member_access(nonmember.id)).to eq(Gitlab::Access::NO_ACCESS) }
|
|
|
|
it { expect(project.team.max_member_access(requester.id)).to eq(Gitlab::Access::NO_ACCESS) }
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2016-11-18 12:15:47 -05:00
|
|
|
describe '#member?' do
|
|
|
|
let(:group) { create(:group) }
|
|
|
|
let(:developer) { create(:user) }
|
|
|
|
let(:master) { create(:user) }
|
Use CTEs for nested groups and authorizations
This commit introduces the usage of Common Table Expressions (CTEs) to
efficiently retrieve nested group hierarchies, without having to rely on
the "routes" table (which is an _incredibly_ inefficient way of getting
the data). This requires a patch to ActiveRecord (found in the added
initializer) to work properly as ActiveRecord doesn't support WITH
statements properly out of the box.
Unfortunately MySQL provides no efficient way of getting nested groups.
For example, the old routes setup could easily take 5-10 seconds
depending on the amount of "routes" in a database. Providing vastly
different logic for both MySQL and PostgreSQL will negatively impact the
development process. Because of this the various nested groups related
methods return empty relations when used in combination with MySQL.
For project authorizations the logic is split up into two classes:
* Gitlab::ProjectAuthorizations::WithNestedGroups
* Gitlab::ProjectAuthorizations::WithoutNestedGroups
Both classes get the fresh project authorizations (= as they should be
in the "project_authorizations" table), including nested groups if
PostgreSQL is used. The logic of these two classes is quite different
apart from their public interface. This complicates development a bit,
but unfortunately there is no way around this.
This commit also introduces Gitlab::GroupHierarchy. This class can be
used to get the ancestors and descendants of a base relation, or both by
using a UNION. This in turn is used by methods such as:
* Namespace#ancestors
* Namespace#descendants
* User#all_expanded_groups
Again this class relies on CTEs and thus only works on PostgreSQL. The
Namespace methods will return an empty relation when MySQL is used,
while User#all_expanded_groups will return only the groups a user is a
direct member of.
Performance wise the impact is quite large. For example, on GitLab.com
Namespace#descendants used to take around 580 ms to retrieve data for a
particular user. Using CTEs we are able to reduce this down to roughly 1
millisecond, returning the exact same data.
== On The Fly Refreshing
Refreshing of authorizations on the fly (= when
users.authorized_projects_populated was not set) is removed with this
commit. This simplifies the code, and ensures any queries used for
authorizations are not mutated because they are executed in a Rails
scope (e.g. Project.visible_to_user).
This commit includes a migration to schedule refreshing authorizations
for all users, ensuring all of them have their authorizations in place.
Said migration schedules users in batches of 5000, with 5 minutes
between every batch to smear the load around a bit.
== Spec Changes
This commit also introduces some changes to various specs. For example,
some specs for ProjectTeam assumed that creating a personal project
would _not_ lead to the owner having access, which is incorrect. Because
we also no longer refresh authorizations on the fly for new users some
code had to be added to the "empty_project" factory. This chunk of code
ensures that the owner's permissions are refreshed after creating the
project, something that is normally done in Projects::CreateService.
2017-04-24 11:19:22 -04:00
|
|
|
|
|
|
|
let(:personal_project) do
|
|
|
|
create(:empty_project, namespace: developer.namespace)
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:group_project) do
|
|
|
|
create(:empty_project, namespace: group)
|
|
|
|
end
|
|
|
|
|
2017-01-26 17:44:58 -05:00
|
|
|
let(:members_project) { create(:empty_project) }
|
|
|
|
let(:shared_project) { create(:empty_project) }
|
2016-11-18 12:15:47 -05:00
|
|
|
|
|
|
|
before do
|
|
|
|
group.add_master(master)
|
|
|
|
group.add_developer(developer)
|
|
|
|
|
|
|
|
members_project.team << [developer, :developer]
|
|
|
|
members_project.team << [master, :master]
|
|
|
|
|
|
|
|
create(:project_group_link, project: shared_project, group: group)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns false for no user' do
|
|
|
|
expect(personal_project.team.member?(nil)).to be(false)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true for personal projects of the user' do
|
|
|
|
expect(personal_project.team.member?(developer)).to be(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true for projects of groups the user is a member of' do
|
|
|
|
expect(group_project.team.member?(developer)).to be(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true for projects for which the user is a member of' do
|
|
|
|
expect(members_project.team.member?(developer)).to be(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns true for projects shared on a group the user is a member of' do
|
|
|
|
expect(shared_project.team.member?(developer)).to be(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'checks for the correct minimum level access' do
|
|
|
|
expect(group_project.team.member?(developer, Gitlab::Access::MASTER)).to be(false)
|
|
|
|
expect(group_project.team.member?(master, Gitlab::Access::MASTER)).to be(true)
|
|
|
|
expect(members_project.team.member?(developer, Gitlab::Access::MASTER)).to be(false)
|
|
|
|
expect(members_project.team.member?(master, Gitlab::Access::MASTER)).to be(true)
|
|
|
|
expect(shared_project.team.member?(developer, Gitlab::Access::MASTER)).to be(false)
|
|
|
|
expect(shared_project.team.member?(master, Gitlab::Access::MASTER)).to be(false)
|
|
|
|
expect(shared_project.team.member?(developer, Gitlab::Access::DEVELOPER)).to be(true)
|
|
|
|
expect(shared_project.team.member?(master, Gitlab::Access::DEVELOPER)).to be(true)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-05-31 11:45:14 -04:00
|
|
|
shared_examples 'max member access for users' do
|
|
|
|
let(:project) { create(:project) }
|
|
|
|
let(:group) { create(:group) }
|
|
|
|
let(:second_group) { create(:group) }
|
|
|
|
|
|
|
|
let(:master) { create(:user) }
|
|
|
|
let(:reporter) { create(:user) }
|
|
|
|
let(:guest) { create(:user) }
|
|
|
|
|
|
|
|
let(:promoted_guest) { create(:user) }
|
|
|
|
|
|
|
|
let(:group_developer) { create(:user) }
|
|
|
|
let(:second_developer) { create(:user) }
|
|
|
|
|
|
|
|
let(:user_without_access) { create(:user) }
|
|
|
|
let(:second_user_without_access) { create(:user) }
|
|
|
|
|
|
|
|
let(:users) do
|
|
|
|
[master, reporter, promoted_guest, guest, group_developer, second_developer, user_without_access].map(&:id)
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:expected) do
|
|
|
|
{
|
|
|
|
master.id => Gitlab::Access::MASTER,
|
|
|
|
reporter.id => Gitlab::Access::REPORTER,
|
|
|
|
promoted_guest.id => Gitlab::Access::DEVELOPER,
|
|
|
|
guest.id => Gitlab::Access::GUEST,
|
|
|
|
group_developer.id => Gitlab::Access::DEVELOPER,
|
|
|
|
second_developer.id => Gitlab::Access::MASTER,
|
|
|
|
user_without_access.id => Gitlab::Access::NO_ACCESS
|
|
|
|
}
|
|
|
|
end
|
|
|
|
|
|
|
|
before do
|
|
|
|
project.add_master(master)
|
|
|
|
project.add_reporter(reporter)
|
|
|
|
project.add_guest(promoted_guest)
|
|
|
|
project.add_guest(guest)
|
|
|
|
|
|
|
|
project.project_group_links.create(
|
|
|
|
group: group,
|
|
|
|
group_access: Gitlab::Access::DEVELOPER
|
|
|
|
)
|
|
|
|
|
|
|
|
group.add_master(promoted_guest)
|
|
|
|
group.add_developer(group_developer)
|
|
|
|
group.add_developer(second_developer)
|
|
|
|
|
|
|
|
project.project_group_links.create(
|
|
|
|
group: second_group,
|
|
|
|
group_access: Gitlab::Access::MASTER
|
|
|
|
)
|
|
|
|
|
|
|
|
second_group.add_master(second_developer)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns correct roles for different users' do
|
|
|
|
expect(project.team.max_member_access_for_user_ids(users)).to eq(expected)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#max_member_access_for_user_ids' do
|
2017-06-09 13:12:51 -04:00
|
|
|
context 'with RequestStore enabled', :request_store do
|
2017-05-31 11:45:14 -04:00
|
|
|
include_examples 'max member access for users'
|
2016-08-01 16:11:45 -04:00
|
|
|
|
2017-05-31 11:45:14 -04:00
|
|
|
def access_levels(users)
|
|
|
|
project.team.max_member_access_for_user_ids(users)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'does not perform extra queries when asked for users who have already been found' do
|
|
|
|
access_levels(users)
|
|
|
|
|
|
|
|
expect { access_levels(users) }.not_to exceed_query_limit(0)
|
2016-08-01 16:11:45 -04:00
|
|
|
|
2017-05-31 11:45:14 -04:00
|
|
|
expect(access_levels(users)).to eq(expected)
|
2016-08-01 16:11:45 -04:00
|
|
|
end
|
|
|
|
|
2017-05-31 11:45:14 -04:00
|
|
|
it 'only requests the extra users when uncached users are passed' do
|
|
|
|
new_user = create(:user)
|
|
|
|
second_new_user = create(:user)
|
|
|
|
all_users = users + [new_user.id, second_new_user.id]
|
|
|
|
|
|
|
|
expected_all = expected.merge(new_user.id => Gitlab::Access::NO_ACCESS,
|
|
|
|
second_new_user.id => Gitlab::Access::NO_ACCESS)
|
|
|
|
|
|
|
|
access_levels(users)
|
2016-08-01 16:11:45 -04:00
|
|
|
|
2017-05-31 11:45:14 -04:00
|
|
|
queries = ActiveRecord::QueryRecorder.new { access_levels(all_users) }
|
|
|
|
|
|
|
|
expect(queries.count).to eq(1)
|
|
|
|
expect(queries.log_message).to match(/\W#{new_user.id}\W/)
|
|
|
|
expect(queries.log_message).to match(/\W#{second_new_user.id}\W/)
|
|
|
|
expect(queries.log_message).not_to match(/\W#{promoted_guest.id}\W/)
|
|
|
|
expect(access_levels(all_users)).to eq(expected_all)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'with RequestStore disabled' do
|
|
|
|
include_examples 'max member access for users'
|
|
|
|
end
|
2016-08-01 16:11:45 -04:00
|
|
|
end
|
2013-01-04 01:43:25 -05:00
|
|
|
end
|