ac382b5682
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.
395 lines
14 KiB
Ruby
395 lines
14 KiB
Ruby
require "spec_helper"
|
|
|
|
describe ProjectTeam, models: true do
|
|
let(:master) { create(:user) }
|
|
let(:reporter) { create(:user) }
|
|
let(:guest) { create(:user) }
|
|
let(:nonmember) { create(:user) }
|
|
|
|
context 'personal project' do
|
|
let(:project) { create(:empty_project) }
|
|
|
|
before do
|
|
project.add_master(master)
|
|
project.add_reporter(reporter)
|
|
project.add_guest(guest)
|
|
end
|
|
|
|
describe 'members collection' do
|
|
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) }
|
|
end
|
|
|
|
describe 'access methods' do
|
|
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 }
|
|
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 }
|
|
end
|
|
end
|
|
|
|
context 'group project' do
|
|
let(:group) { create(:group) }
|
|
let!(:project) { create(:empty_project, group: group) }
|
|
|
|
before do
|
|
group.add_master(master)
|
|
group.add_reporter(reporter)
|
|
group.add_guest(guest)
|
|
|
|
# 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
|
|
project.add_master(guest)
|
|
project.add_guest(master)
|
|
end
|
|
|
|
describe 'members collection' do
|
|
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) }
|
|
end
|
|
|
|
describe 'access methods' do
|
|
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 }
|
|
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 }
|
|
end
|
|
end
|
|
|
|
describe '#fetch_members' do
|
|
context 'personal project' do
|
|
let(:project) { create(:empty_project) }
|
|
|
|
it 'returns project members' do
|
|
user = create(:user)
|
|
project.add_guest(user)
|
|
|
|
expect(project.team.members).to contain_exactly(user, project.owner)
|
|
end
|
|
|
|
it 'returns project members of a specified level' do
|
|
user = create(:user)
|
|
project.add_reporter(user)
|
|
|
|
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
|
|
)
|
|
|
|
expect(project.team.members).
|
|
to contain_exactly(group_member.user, project.owner)
|
|
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
|
|
)
|
|
|
|
expect(project.team.guests).to be_empty
|
|
expect(project.team.reporters).to contain_exactly(group_member.user)
|
|
end
|
|
end
|
|
|
|
context 'group project' do
|
|
let(:group) { create(:group) }
|
|
let!(:project) { create(:empty_project, group: group) }
|
|
|
|
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
|
|
|
|
describe '#find_member' do
|
|
context 'personal project' do
|
|
let(:project) do
|
|
create(:empty_project, :public, :access_requestable)
|
|
end
|
|
|
|
let(:requester) { create(:user) }
|
|
|
|
before do
|
|
project.add_master(master)
|
|
project.add_reporter(reporter)
|
|
project.add_guest(guest)
|
|
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 }
|
|
end
|
|
|
|
context 'group project' do
|
|
let(:group) { create(:group, :access_requestable) }
|
|
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 }
|
|
end
|
|
end
|
|
|
|
describe "#human_max_access" do
|
|
it 'returns Master role' do
|
|
user = create(:user)
|
|
group = create(:group)
|
|
project = create(:empty_project, namespace: group)
|
|
|
|
group.add_master(user)
|
|
|
|
expect(project.team.human_max_access(user.id)).to eq 'Master'
|
|
end
|
|
|
|
it 'returns Owner role' do
|
|
user = create(:user)
|
|
group = create(:group)
|
|
project = create(:empty_project, namespace: group)
|
|
|
|
group.add_owner(user)
|
|
|
|
expect(project.team.human_max_access(user.id)).to eq 'Owner'
|
|
end
|
|
end
|
|
|
|
describe '#max_member_access' do
|
|
let(:requester) { create(:user) }
|
|
|
|
context 'personal project' do
|
|
let(:project) do
|
|
create(:empty_project, :public, :access_requestable)
|
|
end
|
|
|
|
context 'when project is not shared with group' do
|
|
before do
|
|
project.add_master(master)
|
|
project.add_reporter(reporter)
|
|
project.add_guest(guest)
|
|
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) }
|
|
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
|
|
|
|
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) }
|
|
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) }
|
|
|
|
context 'but share_with_group_lock is true' do
|
|
before { project.namespace.update(share_with_group_lock: true) }
|
|
|
|
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) }
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'group project' do
|
|
let(:group) { create(:group, :access_requestable) }
|
|
let!(:project) do
|
|
create(:empty_project, group: group)
|
|
end
|
|
|
|
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) }
|
|
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
|
|
|
|
describe '#member?' do
|
|
let(:group) { create(:group) }
|
|
let(:developer) { create(:user) }
|
|
let(:master) { create(:user) }
|
|
|
|
let(:personal_project) do
|
|
create(:empty_project, namespace: developer.namespace)
|
|
end
|
|
|
|
let(:group_project) do
|
|
create(:empty_project, namespace: group)
|
|
end
|
|
|
|
let(:members_project) { create(:empty_project) }
|
|
let(:shared_project) { create(:empty_project) }
|
|
|
|
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
|
|
|
|
shared_examples_for "#max_member_access_for_users" do |enable_request_store|
|
|
describe "#max_member_access_for_users" do
|
|
before do
|
|
RequestStore.begin! if enable_request_store
|
|
end
|
|
|
|
after do
|
|
if enable_request_store
|
|
RequestStore.end!
|
|
RequestStore.clear!
|
|
end
|
|
end
|
|
|
|
it 'returns correct roles for different users' do
|
|
master = create(:user)
|
|
reporter = create(:user)
|
|
promoted_guest = create(:user)
|
|
guest = create(:user)
|
|
project = create(:empty_project)
|
|
|
|
project.add_master(master)
|
|
project.add_reporter(reporter)
|
|
project.add_guest(promoted_guest)
|
|
project.add_guest(guest)
|
|
|
|
group = create(:group)
|
|
group_developer = create(:user)
|
|
second_developer = create(:user)
|
|
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)
|
|
|
|
second_group = create(:group)
|
|
project.project_group_links.create(
|
|
group: second_group,
|
|
group_access: Gitlab::Access::MASTER)
|
|
second_group.add_master(second_developer)
|
|
|
|
users = [master, reporter, promoted_guest, guest, group_developer, second_developer].map(&:id)
|
|
|
|
expected = {
|
|
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
|
|
}
|
|
|
|
expect(project.team.max_member_access_for_user_ids(users)).to eq(expected)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '#max_member_access_for_users with RequestStore' do
|
|
it_behaves_like "#max_member_access_for_users", true
|
|
end
|
|
|
|
describe '#max_member_access_for_users without RequestStore' do
|
|
it_behaves_like "#max_member_access_for_users", false
|
|
end
|
|
end
|