2012-11-22 14:41:16 -05:00
|
|
|
require 'spec_helper'
|
|
|
|
|
2017-07-10 10:24:02 -04:00
|
|
|
describe Namespace do
|
2017-10-03 11:06:09 -04:00
|
|
|
include ProjectForksHelper
|
|
|
|
|
2012-11-22 14:41:16 -05:00
|
|
|
let!(:namespace) { create(:namespace) }
|
2017-10-17 06:12:24 -04:00
|
|
|
let(:gitlab_shell) { Gitlab::Shell.new }
|
2012-11-22 14:41:16 -05:00
|
|
|
|
2017-02-06 10:16:50 -05:00
|
|
|
describe 'associations' do
|
|
|
|
it { is_expected.to have_many :projects }
|
|
|
|
it { is_expected.to have_many :project_statistics }
|
|
|
|
it { is_expected.to belong_to :parent }
|
|
|
|
it { is_expected.to have_many :children }
|
|
|
|
end
|
2016-12-02 07:54:57 -05:00
|
|
|
|
2017-02-06 10:16:50 -05:00
|
|
|
describe 'validations' do
|
|
|
|
it { is_expected.to validate_presence_of(:name) }
|
|
|
|
it { is_expected.to validate_uniqueness_of(:name).scoped_to(:parent_id) }
|
|
|
|
it { is_expected.to validate_length_of(:name).is_at_most(255) }
|
|
|
|
it { is_expected.to validate_length_of(:description).is_at_most(255) }
|
|
|
|
it { is_expected.to validate_presence_of(:path) }
|
|
|
|
it { is_expected.to validate_length_of(:path).is_at_most(255) }
|
|
|
|
it { is_expected.to validate_presence_of(:owner) }
|
2016-12-02 07:54:57 -05:00
|
|
|
|
2017-02-06 10:16:50 -05:00
|
|
|
it 'does not allow too deep nesting' do
|
|
|
|
ancestors = (1..21).to_a
|
|
|
|
nested = build(:namespace, parent: namespace)
|
2016-12-02 07:54:57 -05:00
|
|
|
|
2017-02-06 10:16:50 -05:00
|
|
|
allow(nested).to receive(:ancestors).and_return(ancestors)
|
2016-12-02 07:54:57 -05:00
|
|
|
|
2017-02-06 10:16:50 -05:00
|
|
|
expect(nested).not_to be_valid
|
|
|
|
expect(nested.errors[:parent_id].first).to eq('has too deep level of nesting')
|
|
|
|
end
|
2017-03-06 13:26:58 -05:00
|
|
|
|
|
|
|
describe 'reserved path validation' do
|
|
|
|
context 'nested group' do
|
|
|
|
let(:group) { build(:group, :nested, path: 'tree') }
|
|
|
|
|
|
|
|
it { expect(group).not_to be_valid }
|
2017-04-18 10:27:11 -04:00
|
|
|
|
|
|
|
it 'rejects nested paths' do
|
|
|
|
parent = create(:group, :nested, path: 'environments')
|
2017-05-19 20:46:40 -04:00
|
|
|
namespace = build(:group, path: 'folders', parent: parent)
|
2017-04-18 10:27:11 -04:00
|
|
|
|
|
|
|
expect(namespace).not_to be_valid
|
|
|
|
end
|
2017-03-06 13:26:58 -05:00
|
|
|
end
|
|
|
|
|
2017-06-07 23:32:38 -04:00
|
|
|
context "is case insensitive" do
|
2017-07-17 12:11:07 -04:00
|
|
|
let(:group) { build(:group, path: "Groups") }
|
2017-06-07 23:32:38 -04:00
|
|
|
|
|
|
|
it { expect(group).not_to be_valid }
|
|
|
|
end
|
|
|
|
|
2017-03-06 13:26:58 -05:00
|
|
|
context 'top-level group' do
|
|
|
|
let(:group) { build(:group, path: 'tree') }
|
|
|
|
|
|
|
|
it { expect(group).to be_valid }
|
|
|
|
end
|
|
|
|
end
|
2017-02-06 10:16:50 -05:00
|
|
|
end
|
2012-11-25 04:57:01 -05:00
|
|
|
|
|
|
|
describe "Respond to" do
|
2015-02-12 13:17:35 -05:00
|
|
|
it { is_expected.to respond_to(:human_name) }
|
|
|
|
it { is_expected.to respond_to(:to_param) }
|
2017-04-11 10:21:52 -04:00
|
|
|
it { is_expected.to respond_to(:has_parent?) }
|
2012-11-25 04:57:01 -05:00
|
|
|
end
|
2012-11-20 23:14:05 -05:00
|
|
|
|
2017-07-17 06:40:17 -04:00
|
|
|
describe 'inclusions' do
|
|
|
|
it { is_expected.to include_module(Gitlab::VisibilityLevel) }
|
|
|
|
end
|
|
|
|
|
|
|
|
describe '#visibility_level_field' do
|
|
|
|
it { expect(namespace.visibility_level_field).to eq(:visibility_level) }
|
|
|
|
end
|
|
|
|
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#to_param' do
|
2017-02-23 18:55:01 -05:00
|
|
|
it { expect(namespace.to_param).to eq(namespace.full_path) }
|
2012-11-20 23:14:05 -05:00
|
|
|
end
|
|
|
|
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '#human_name' do
|
2015-02-12 13:17:35 -05:00
|
|
|
it { expect(namespace.human_name).to eq(namespace.owner_name) }
|
2012-11-20 23:14:05 -05:00
|
|
|
end
|
|
|
|
|
2016-03-04 06:15:30 -05:00
|
|
|
describe '.search' do
|
2016-03-04 06:06:25 -05:00
|
|
|
let(:namespace) { create(:namespace) }
|
|
|
|
|
|
|
|
it 'returns namespaces with a matching name' do
|
|
|
|
expect(described_class.search(namespace.name)).to eq([namespace])
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns namespaces with a partially matching name' do
|
|
|
|
expect(described_class.search(namespace.name[0..2])).to eq([namespace])
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns namespaces with a matching name regardless of the casing' do
|
|
|
|
expect(described_class.search(namespace.name.upcase)).to eq([namespace])
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns namespaces with a matching path' do
|
|
|
|
expect(described_class.search(namespace.path)).to eq([namespace])
|
2012-11-20 23:14:05 -05:00
|
|
|
end
|
|
|
|
|
2016-03-04 06:06:25 -05:00
|
|
|
it 'returns namespaces with a partially matching path' do
|
|
|
|
expect(described_class.search(namespace.path[0..2])).to eq([namespace])
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'returns namespaces with a matching path regardless of the casing' do
|
|
|
|
expect(described_class.search(namespace.path.upcase)).to eq([namespace])
|
|
|
|
end
|
2012-11-20 23:14:05 -05:00
|
|
|
end
|
|
|
|
|
2016-11-22 11:58:10 -05:00
|
|
|
describe '.with_statistics' do
|
|
|
|
let(:namespace) { create :namespace }
|
|
|
|
|
|
|
|
let(:project1) do
|
2017-08-02 15:55:11 -04:00
|
|
|
create(:project,
|
2016-11-22 11:58:10 -05:00
|
|
|
namespace: namespace,
|
|
|
|
statistics: build(:project_statistics,
|
|
|
|
storage_size: 606,
|
|
|
|
repository_size: 101,
|
|
|
|
lfs_objects_size: 202,
|
|
|
|
build_artifacts_size: 303))
|
|
|
|
end
|
|
|
|
|
|
|
|
let(:project2) do
|
2017-08-02 15:55:11 -04:00
|
|
|
create(:project,
|
2016-11-22 11:58:10 -05:00
|
|
|
namespace: namespace,
|
|
|
|
statistics: build(:project_statistics,
|
|
|
|
storage_size: 60,
|
|
|
|
repository_size: 10,
|
|
|
|
lfs_objects_size: 20,
|
|
|
|
build_artifacts_size: 30))
|
|
|
|
end
|
|
|
|
|
|
|
|
it "sums all project storage counters in the namespace" do
|
|
|
|
project1
|
|
|
|
project2
|
2017-07-25 13:09:00 -04:00
|
|
|
statistics = described_class.with_statistics.find(namespace.id)
|
2016-11-22 11:58:10 -05:00
|
|
|
|
|
|
|
expect(statistics.storage_size).to eq 666
|
|
|
|
expect(statistics.repository_size).to eq 111
|
|
|
|
expect(statistics.lfs_objects_size).to eq 222
|
|
|
|
expect(statistics.build_artifacts_size).to eq 333
|
|
|
|
end
|
|
|
|
|
|
|
|
it "correctly handles namespaces without projects" do
|
2017-07-25 13:09:00 -04:00
|
|
|
statistics = described_class.with_statistics.find(namespace.id)
|
2016-11-22 11:58:10 -05:00
|
|
|
|
|
|
|
expect(statistics.storage_size).to eq 0
|
|
|
|
expect(statistics.repository_size).to eq 0
|
|
|
|
expect(statistics.lfs_objects_size).to eq 0
|
|
|
|
expect(statistics.build_artifacts_size).to eq 0
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-10-10 09:45:35 -04:00
|
|
|
describe '#ancestors_upto', :nested_groups do
|
|
|
|
let(:parent) { create(:group) }
|
|
|
|
let(:child) { create(:group, parent: parent) }
|
|
|
|
let(:child2) { create(:group, parent: child) }
|
|
|
|
|
|
|
|
it 'returns all ancestors when no namespace is given' do
|
|
|
|
expect(child2.ancestors_upto).to contain_exactly(child, parent)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'includes ancestors upto but excluding the given ancestor' do
|
|
|
|
expect(child2.ancestors_upto(parent)).to contain_exactly(child)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-10-17 06:12:24 -04:00
|
|
|
describe '#move_dir', :request_store do
|
2017-10-05 09:01:26 -04:00
|
|
|
let(:namespace) { create(:namespace) }
|
|
|
|
let!(:project) { create(:project_empty_repo, namespace: namespace) }
|
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "raises error when directory exists" do
|
2017-10-05 09:01:26 -04:00
|
|
|
expect { namespace.move_dir }.to raise_error("namespace directory cannot be moved")
|
2012-11-20 23:14:05 -05:00
|
|
|
end
|
|
|
|
|
2016-08-01 11:00:44 -04:00
|
|
|
it "moves dir if path changed" do
|
2017-10-17 06:12:24 -04:00
|
|
|
namespace.update_attributes(path: namespace.full_path + '_new')
|
2017-10-05 09:01:26 -04:00
|
|
|
|
2017-10-17 06:12:24 -04:00
|
|
|
expect(gitlab_shell.exists?(project.repository_storage_path, "#{namespace.path}/#{project.path}.git")).to be_truthy
|
2012-11-20 23:14:05 -05:00
|
|
|
end
|
2016-05-16 19:03:55 -04:00
|
|
|
|
2016-12-15 22:24:05 -05:00
|
|
|
context "when any project has container images" do
|
2017-03-23 10:54:59 -04:00
|
|
|
let(:container_repository) { create(:container_repository) }
|
2016-12-15 22:24:05 -05:00
|
|
|
|
2016-05-16 19:03:55 -04:00
|
|
|
before do
|
|
|
|
stub_container_registry_config(enabled: true)
|
2017-04-03 09:52:24 -04:00
|
|
|
stub_container_registry_tags(repository: :any, tags: ['tag'])
|
2016-05-16 19:03:55 -04:00
|
|
|
|
2017-10-05 09:01:26 -04:00
|
|
|
create(:project, namespace: namespace, container_repositories: [container_repository])
|
2016-05-16 19:03:55 -04:00
|
|
|
|
2017-10-05 09:01:26 -04:00
|
|
|
allow(namespace).to receive(:path_was).and_return(namespace.path)
|
|
|
|
allow(namespace).to receive(:path).and_return('new_path')
|
2016-05-16 19:03:55 -04:00
|
|
|
end
|
|
|
|
|
2017-04-03 15:25:52 -04:00
|
|
|
it 'raises an error about not movable project' do
|
2017-10-05 09:01:26 -04:00
|
|
|
expect { namespace.move_dir }.to raise_error(/Namespace cannot be moved/)
|
2017-04-03 15:25:52 -04:00
|
|
|
end
|
2016-05-16 19:03:55 -04:00
|
|
|
end
|
2017-03-28 13:27:44 -04:00
|
|
|
|
2017-04-03 11:48:17 -04:00
|
|
|
context 'with subgroups' do
|
2017-03-28 13:27:44 -04:00
|
|
|
let(:parent) { create(:group, name: 'parent', path: 'parent') }
|
|
|
|
let(:child) { create(:group, name: 'child', path: 'child', parent: parent) }
|
|
|
|
let!(:project) { create(:project_empty_repo, path: 'the-project', namespace: child) }
|
2017-06-07 23:32:38 -04:00
|
|
|
let(:uploads_dir) { File.join(CarrierWave.root, FileUploader.base_dir) }
|
|
|
|
let(:pages_dir) { File.join(TestEnv.pages_path) }
|
2017-03-28 13:27:44 -04:00
|
|
|
|
|
|
|
before do
|
2017-04-03 11:48:17 -04:00
|
|
|
FileUtils.mkdir_p(File.join(uploads_dir, 'parent', 'child', 'the-project'))
|
|
|
|
FileUtils.mkdir_p(File.join(pages_dir, 'parent', 'child', 'the-project'))
|
2017-03-28 13:27:44 -04:00
|
|
|
end
|
|
|
|
|
2017-04-03 11:48:17 -04:00
|
|
|
context 'renaming child' do
|
|
|
|
it 'correctly moves the repository, uploads and pages' do
|
|
|
|
expected_repository_path = File.join(TestEnv.repos_path, 'parent', 'renamed', 'the-project.git')
|
|
|
|
expected_upload_path = File.join(uploads_dir, 'parent', 'renamed', 'the-project')
|
|
|
|
expected_pages_path = File.join(pages_dir, 'parent', 'renamed', 'the-project')
|
2017-03-28 13:27:44 -04:00
|
|
|
|
2017-04-03 11:48:17 -04:00
|
|
|
child.update_attributes!(path: 'renamed')
|
2017-03-28 13:27:44 -04:00
|
|
|
|
2017-04-03 11:48:17 -04:00
|
|
|
expect(File.directory?(expected_repository_path)).to be(true)
|
|
|
|
expect(File.directory?(expected_upload_path)).to be(true)
|
|
|
|
expect(File.directory?(expected_pages_path)).to be(true)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'renaming parent' do
|
|
|
|
it 'correctly moves the repository, uploads and pages' do
|
|
|
|
expected_repository_path = File.join(TestEnv.repos_path, 'renamed', 'child', 'the-project.git')
|
|
|
|
expected_upload_path = File.join(uploads_dir, 'renamed', 'child', 'the-project')
|
|
|
|
expected_pages_path = File.join(pages_dir, 'renamed', 'child', 'the-project')
|
|
|
|
|
|
|
|
parent.update_attributes!(path: 'renamed')
|
|
|
|
|
|
|
|
expect(File.directory?(expected_repository_path)).to be(true)
|
|
|
|
expect(File.directory?(expected_upload_path)).to be(true)
|
|
|
|
expect(File.directory?(expected_pages_path)).to be(true)
|
|
|
|
end
|
2017-03-28 13:27:44 -04:00
|
|
|
end
|
|
|
|
end
|
2012-11-20 23:14:05 -05:00
|
|
|
end
|
|
|
|
|
2017-07-10 10:24:02 -04:00
|
|
|
describe '#rm_dir', 'callback' do
|
2017-03-28 13:27:44 -04:00
|
|
|
let!(:project) { create(:project_empty_repo, namespace: namespace) }
|
|
|
|
let(:repository_storage_path) { Gitlab.config.repositories.storages.default['path'] }
|
|
|
|
let(:path_in_dir) { File.join(repository_storage_path, namespace.full_path) }
|
|
|
|
let(:deleted_path) { namespace.full_path.gsub(namespace.path, "#{namespace.full_path}+#{namespace.id}+deleted") }
|
|
|
|
let(:deleted_path_in_dir) { File.join(repository_storage_path, deleted_path) }
|
|
|
|
|
|
|
|
it 'renames its dirs when deleted' do
|
|
|
|
allow(GitlabShellWorker).to receive(:perform_in)
|
2016-06-22 17:04:51 -04:00
|
|
|
|
2017-01-04 14:13:29 -05:00
|
|
|
namespace.destroy
|
|
|
|
|
2017-03-28 13:27:44 -04:00
|
|
|
expect(File.exist?(deleted_path_in_dir)).to be(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'schedules the namespace for deletion' do
|
|
|
|
expect(GitlabShellWorker).to receive(:perform_in).with(5.minutes, :rm_namespace, repository_storage_path, deleted_path)
|
|
|
|
|
|
|
|
namespace.destroy
|
|
|
|
end
|
|
|
|
|
|
|
|
context 'in sub-groups' do
|
2017-05-24 16:59:26 -04:00
|
|
|
let(:parent) { create(:group, path: 'parent') }
|
|
|
|
let(:child) { create(:group, parent: parent, path: 'child') }
|
2017-03-28 13:27:44 -04:00
|
|
|
let!(:project) { create(:project_empty_repo, namespace: child) }
|
|
|
|
let(:path_in_dir) { File.join(repository_storage_path, 'parent', 'child') }
|
|
|
|
let(:deleted_path) { File.join('parent', "child+#{child.id}+deleted") }
|
|
|
|
let(:deleted_path_in_dir) { File.join(repository_storage_path, deleted_path) }
|
|
|
|
|
|
|
|
it 'renames its dirs when deleted' do
|
|
|
|
allow(GitlabShellWorker).to receive(:perform_in)
|
|
|
|
|
|
|
|
child.destroy
|
|
|
|
|
|
|
|
expect(File.exist?(deleted_path_in_dir)).to be(true)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'schedules the namespace for deletion' do
|
|
|
|
expect(GitlabShellWorker).to receive(:perform_in).with(5.minutes, :rm_namespace, repository_storage_path, deleted_path)
|
|
|
|
|
|
|
|
child.destroy
|
|
|
|
end
|
2012-11-20 23:14:05 -05:00
|
|
|
end
|
2017-01-04 14:13:29 -05:00
|
|
|
|
|
|
|
it 'removes the exports folder' do
|
|
|
|
expect(namespace).to receive(:remove_exports!)
|
|
|
|
|
|
|
|
namespace.destroy
|
|
|
|
end
|
2012-11-20 23:14:05 -05:00
|
|
|
end
|
2015-03-03 02:06:59 -05:00
|
|
|
|
2016-07-11 18:12:31 -04:00
|
|
|
describe '.find_by_path_or_name' do
|
2015-03-03 02:06:59 -05:00
|
|
|
before do
|
|
|
|
@namespace = create(:namespace, name: 'WoW', path: 'woW')
|
|
|
|
end
|
|
|
|
|
2017-07-25 13:09:00 -04:00
|
|
|
it { expect(described_class.find_by_path_or_name('wow')).to eq(@namespace) }
|
|
|
|
it { expect(described_class.find_by_path_or_name('WOW')).to eq(@namespace) }
|
|
|
|
it { expect(described_class.find_by_path_or_name('unknown')).to eq(nil) }
|
2015-03-03 02:06:59 -05:00
|
|
|
end
|
2015-03-24 09:53:30 -04:00
|
|
|
|
|
|
|
describe ".clean_path" do
|
|
|
|
let!(:user) { create(:user, username: "johngitlab-etc") }
|
|
|
|
let!(:namespace) { create(:namespace, path: "JohnGitLab-etc1") }
|
|
|
|
|
|
|
|
it "cleans the path and makes sure it's available" do
|
2017-07-25 13:09:00 -04:00
|
|
|
expect(described_class.clean_path("-john+gitlab-ETC%.git@gmail.com")).to eq("johngitlab-ETC2")
|
|
|
|
expect(described_class.clean_path("--%+--valid_*&%name=.git.%.atom.atom.@email.com")).to eq("valid_name")
|
2015-03-24 09:53:30 -04:00
|
|
|
end
|
|
|
|
end
|
2016-10-31 07:00:53 -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
|
|
|
describe '#ancestors', :nested_groups do
|
2016-12-13 09:59:49 -05:00
|
|
|
let(:group) { create(:group) }
|
|
|
|
let(:nested_group) { create(:group, parent: group) }
|
|
|
|
let(:deep_nested_group) { create(:group, parent: nested_group) }
|
2016-12-13 13:49:25 -05:00
|
|
|
let(:very_deep_nested_group) { create(:group, parent: deep_nested_group) }
|
2016-12-13 09:59:49 -05:00
|
|
|
|
2017-01-05 07:43:50 -05:00
|
|
|
it 'returns the correct ancestors' 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
|
|
|
expect(very_deep_nested_group.ancestors).to include(group, nested_group, deep_nested_group)
|
|
|
|
expect(deep_nested_group.ancestors).to include(group, nested_group)
|
|
|
|
expect(nested_group.ancestors).to include(group)
|
2017-01-05 07:43:50 -05:00
|
|
|
expect(group.ancestors).to eq([])
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-08-11 10:19:11 -04:00
|
|
|
describe '#self_and_ancestors', :nested_groups do
|
|
|
|
let(:group) { create(:group) }
|
|
|
|
let(:nested_group) { create(:group, parent: group) }
|
|
|
|
let(:deep_nested_group) { create(:group, parent: nested_group) }
|
|
|
|
let(:very_deep_nested_group) { create(:group, parent: deep_nested_group) }
|
|
|
|
|
|
|
|
it 'returns the correct ancestors' do
|
|
|
|
expect(very_deep_nested_group.self_and_ancestors).to contain_exactly(group, nested_group, deep_nested_group, very_deep_nested_group)
|
|
|
|
expect(deep_nested_group.self_and_ancestors).to contain_exactly(group, nested_group, deep_nested_group)
|
|
|
|
expect(nested_group.self_and_ancestors).to contain_exactly(group, nested_group)
|
|
|
|
expect(group.self_and_ancestors).to contain_exactly(group)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
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
|
|
|
describe '#descendants', :nested_groups do
|
2017-03-22 07:17:01 -04:00
|
|
|
let!(:group) { create(:group, path: 'git_lab') }
|
2017-01-05 07:43:50 -05:00
|
|
|
let!(:nested_group) { create(:group, parent: group) }
|
|
|
|
let!(:deep_nested_group) { create(:group, parent: nested_group) }
|
|
|
|
let!(:very_deep_nested_group) { create(:group, parent: deep_nested_group) }
|
2017-03-22 07:17:01 -04:00
|
|
|
let!(:another_group) { create(:group, path: 'gitllab') }
|
|
|
|
let!(:another_group_nested) { create(:group, path: 'foo', parent: another_group) }
|
2017-01-05 07:43:50 -05:00
|
|
|
|
|
|
|
it 'returns the correct descendants' do
|
|
|
|
expect(very_deep_nested_group.descendants.to_a).to eq([])
|
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(deep_nested_group.descendants.to_a).to include(very_deep_nested_group)
|
|
|
|
expect(nested_group.descendants.to_a).to include(deep_nested_group, very_deep_nested_group)
|
|
|
|
expect(group.descendants.to_a).to include(nested_group, deep_nested_group, very_deep_nested_group)
|
2016-12-13 13:49:25 -05:00
|
|
|
end
|
2016-12-13 09:59:49 -05:00
|
|
|
end
|
2017-02-07 08:55:42 -05:00
|
|
|
|
2017-08-11 10:19:11 -04:00
|
|
|
describe '#self_and_descendants', :nested_groups do
|
|
|
|
let!(:group) { create(:group, path: 'git_lab') }
|
|
|
|
let!(:nested_group) { create(:group, parent: group) }
|
|
|
|
let!(:deep_nested_group) { create(:group, parent: nested_group) }
|
|
|
|
let!(:very_deep_nested_group) { create(:group, parent: deep_nested_group) }
|
|
|
|
let!(:another_group) { create(:group, path: 'gitllab') }
|
|
|
|
let!(:another_group_nested) { create(:group, path: 'foo', parent: another_group) }
|
|
|
|
|
|
|
|
it 'returns the correct descendants' do
|
|
|
|
expect(very_deep_nested_group.self_and_descendants).to contain_exactly(very_deep_nested_group)
|
|
|
|
expect(deep_nested_group.self_and_descendants).to contain_exactly(deep_nested_group, very_deep_nested_group)
|
|
|
|
expect(nested_group.self_and_descendants).to contain_exactly(nested_group, deep_nested_group, very_deep_nested_group)
|
|
|
|
expect(group.self_and_descendants).to contain_exactly(group, nested_group, deep_nested_group, very_deep_nested_group)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-06-27 16:35:35 -04:00
|
|
|
describe '#users_with_descendants', :nested_groups do
|
|
|
|
let(:user_a) { create(:user) }
|
|
|
|
let(:user_b) { create(:user) }
|
|
|
|
|
|
|
|
let(:group) { create(:group) }
|
|
|
|
let(:nested_group) { create(:group, parent: group) }
|
|
|
|
let(:deep_nested_group) { create(:group, parent: nested_group) }
|
|
|
|
|
|
|
|
it 'returns member users on every nest level without duplication' do
|
|
|
|
group.add_developer(user_a)
|
|
|
|
nested_group.add_developer(user_b)
|
|
|
|
deep_nested_group.add_developer(user_a)
|
|
|
|
|
|
|
|
expect(group.users_with_descendants).to contain_exactly(user_a, user_b)
|
|
|
|
expect(nested_group.users_with_descendants).to contain_exactly(user_a, user_b)
|
|
|
|
expect(deep_nested_group.users_with_descendants).to contain_exactly(user_a)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-06-23 20:02:33 -04:00
|
|
|
describe '#soft_delete_without_removing_associations' do
|
|
|
|
let(:project1) { create(:project_empty_repo, namespace: namespace) }
|
|
|
|
|
|
|
|
it 'updates the deleted_at timestamp but preserves projects' do
|
|
|
|
namespace.soft_delete_without_removing_associations
|
|
|
|
|
|
|
|
expect(Project.all).to include(project1)
|
|
|
|
expect(namespace.deleted_at).not_to be_nil
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-02-07 08:55:42 -05:00
|
|
|
describe '#user_ids_for_project_authorizations' do
|
|
|
|
it 'returns the user IDs for which to refresh authorizations' do
|
2017-06-21 09:48:12 -04:00
|
|
|
expect(namespace.user_ids_for_project_authorizations)
|
|
|
|
.to eq([namespace.owner_id])
|
2017-02-07 08:55:42 -05:00
|
|
|
end
|
|
|
|
end
|
2017-04-03 11:48:17 -04:00
|
|
|
|
|
|
|
describe '#all_projects' do
|
|
|
|
let(:group) { create(:group) }
|
|
|
|
let(:child) { create(:group, parent: group) }
|
|
|
|
let!(:project1) { create(:project_empty_repo, namespace: group) }
|
|
|
|
let!(:project2) { create(:project_empty_repo, namespace: child) }
|
|
|
|
|
2017-08-15 06:27:37 -04:00
|
|
|
it { expect(group.all_projects.to_a).to match_array([project2, project1]) }
|
2017-04-03 11:48:17 -04:00
|
|
|
end
|
2017-09-01 19:49:09 -04:00
|
|
|
|
2017-09-01 21:22:55 -04:00
|
|
|
describe '#share_with_group_lock with subgroups', :nested_groups do
|
2017-09-01 19:49:09 -04:00
|
|
|
context 'when creating a subgroup' do
|
|
|
|
let(:subgroup) { create(:group, parent: root_group )}
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'under a parent with "Share with group lock" enabled' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:root_group) { create(:group, share_with_group_lock: true) }
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
it 'enables "Share with group lock" on the subgroup' do
|
2017-09-01 19:49:09 -04:00
|
|
|
expect(subgroup.share_with_group_lock).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'under a parent with "Share with group lock" disabled' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:root_group) { create(:group) }
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
it 'does not enable "Share with group lock" on the subgroup' do
|
2017-09-01 19:49:09 -04:00
|
|
|
expect(subgroup.share_with_group_lock).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'when enabling the parent group "Share with group lock"' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:root_group) { create(:group) }
|
|
|
|
let!(:subgroup) { create(:group, parent: root_group )}
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
it 'the subgroup "Share with group lock" becomes enabled' do
|
2017-09-05 20:10:30 -04:00
|
|
|
root_group.update!(share_with_group_lock: true)
|
2017-09-01 19:49:09 -04:00
|
|
|
|
|
|
|
expect(subgroup.reload.share_with_group_lock).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'when disabling the parent group "Share with group lock" (which was already enabled)' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:root_group) { create(:group, share_with_group_lock: true) }
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'and the subgroup "Share with group lock" is enabled' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:subgroup) { create(:group, parent: root_group, share_with_group_lock: true )}
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
it 'the subgroup "Share with group lock" does not change' do
|
2017-09-05 20:10:30 -04:00
|
|
|
root_group.update!(share_with_group_lock: false)
|
2017-09-01 19:49:09 -04:00
|
|
|
|
|
|
|
expect(subgroup.reload.share_with_group_lock).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'but the subgroup "Share with group lock" is disabled' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:subgroup) { create(:group, parent: root_group )}
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
it 'the subgroup "Share with group lock" does not change' do
|
2017-09-05 20:10:30 -04:00
|
|
|
root_group.update!(share_with_group_lock: false)
|
2017-09-01 19:49:09 -04:00
|
|
|
|
|
|
|
expect(subgroup.reload.share_with_group_lock?).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
# Note: Group transfers are not yet implemented
|
|
|
|
context 'when a group is transferred into a root group' do
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'when the root group "Share with group lock" is enabled' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:root_group) { create(:group, share_with_group_lock: true) }
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'when the subgroup "Share with group lock" is enabled' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:subgroup) { create(:group, share_with_group_lock: true )}
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
it 'the subgroup "Share with group lock" does not change' do
|
2017-09-01 19:49:09 -04:00
|
|
|
subgroup.parent = root_group
|
|
|
|
subgroup.save!
|
|
|
|
|
|
|
|
expect(subgroup.share_with_group_lock).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'when the subgroup "Share with group lock" is disabled' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:subgroup) { create(:group)}
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
it 'the subgroup "Share with group lock" becomes enabled' do
|
2017-09-01 19:49:09 -04:00
|
|
|
subgroup.parent = root_group
|
|
|
|
subgroup.save!
|
|
|
|
|
|
|
|
expect(subgroup.share_with_group_lock).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'when the root group "Share with group lock" is disabled' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:root_group) { create(:group) }
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'when the subgroup "Share with group lock" is enabled' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:subgroup) { create(:group, share_with_group_lock: true )}
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
it 'the subgroup "Share with group lock" does not change' do
|
2017-09-01 19:49:09 -04:00
|
|
|
subgroup.parent = root_group
|
|
|
|
subgroup.save!
|
|
|
|
|
|
|
|
expect(subgroup.share_with_group_lock).to be_truthy
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
context 'when the subgroup "Share with group lock" is disabled' do
|
2017-09-01 19:49:09 -04:00
|
|
|
let(:subgroup) { create(:group)}
|
|
|
|
|
2017-09-06 14:31:45 -04:00
|
|
|
it 'the subgroup "Share with group lock" does not change' do
|
2017-09-01 19:49:09 -04:00
|
|
|
subgroup.parent = root_group
|
|
|
|
subgroup.save!
|
|
|
|
|
|
|
|
expect(subgroup.share_with_group_lock).to be_falsey
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
2017-10-03 11:06:09 -04:00
|
|
|
|
|
|
|
describe '#has_forks_of?' do
|
|
|
|
let(:project) { create(:project, :public) }
|
|
|
|
let!(:forked_project) { fork_project(project, namespace.owner, namespace: namespace) }
|
|
|
|
|
|
|
|
before do
|
|
|
|
# Reset the fork network relation
|
|
|
|
project.reload
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'knows if there is a direct fork in the namespace' do
|
|
|
|
expect(namespace.find_fork_of(project)).to eq(forked_project)
|
|
|
|
end
|
|
|
|
|
|
|
|
it 'knows when there is as fork-of-fork in the namespace' do
|
|
|
|
other_namespace = create(:namespace)
|
|
|
|
other_fork = fork_project(forked_project, other_namespace.owner, namespace: other_namespace)
|
|
|
|
|
|
|
|
expect(other_namespace.find_fork_of(project)).to eq(other_fork)
|
|
|
|
end
|
|
|
|
end
|
2012-11-22 14:41:16 -05:00
|
|
|
end
|