cb8a425ba4
There is a race condition in DestroyGroupService now that projects are deleted asynchronously: 1. User attempts to delete group 2. DestroyGroupService iterates through all projects and schedules a Sidekiq job to delete each Project 3. DestroyGroupService destroys the Group, leaving all its projects without a namespace 4. Projects::DestroyService runs later but the can?(current_user, :remove_project) is `false` because the user no longer has permission to destroy projects with no namespace. 5. This leaves the project in pending_delete state with no namespace/group. Projects without a namespace or group also adds another problem: it's not possible to destroy the container registry tags, since container_registry_path_with_namespace is the wrong value. The fix is to destroy the group asynchronously and to run execute directly on Projects::DestroyService. Closes #17893
58 lines
1.8 KiB
Ruby
58 lines
1.8 KiB
Ruby
require 'spec_helper'
|
|
|
|
describe DestroyGroupService, services: true do
|
|
let!(:user) { create(:user) }
|
|
let!(:group) { create(:group) }
|
|
let!(:project) { create(:project, namespace: group) }
|
|
let!(:gitlab_shell) { Gitlab::Shell.new }
|
|
let!(:remove_path) { group.path + "+#{group.id}+deleted" }
|
|
|
|
shared_examples 'group destruction' do |async|
|
|
context 'database records' do
|
|
before do
|
|
destroy_group(group, user, async)
|
|
end
|
|
|
|
it { expect(Group.all).not_to include(group) }
|
|
it { expect(Project.all).not_to include(project) }
|
|
end
|
|
|
|
context 'file system' do
|
|
context 'Sidekiq inline' do
|
|
before do
|
|
# Run sidekiq immediatly to check that renamed dir will be removed
|
|
Sidekiq::Testing.inline! { destroy_group(group, user, async) }
|
|
end
|
|
|
|
it { expect(gitlab_shell.exists?(project.repository_storage_path, group.path)).to be_falsey }
|
|
it { expect(gitlab_shell.exists?(project.repository_storage_path, remove_path)).to be_falsey }
|
|
end
|
|
|
|
context 'Sidekiq fake' do
|
|
before do
|
|
# Dont run sidekiq to check if renamed repository exists
|
|
Sidekiq::Testing.fake! { destroy_group(group, user, async) }
|
|
end
|
|
|
|
it { expect(gitlab_shell.exists?(project.repository_storage_path, group.path)).to be_falsey }
|
|
it { expect(gitlab_shell.exists?(project.repository_storage_path, remove_path)).to be_truthy }
|
|
end
|
|
end
|
|
|
|
def destroy_group(group, user, async)
|
|
if async
|
|
DestroyGroupService.new(group, user).async_execute
|
|
else
|
|
DestroyGroupService.new(group, user).execute
|
|
end
|
|
end
|
|
end
|
|
|
|
describe 'asynchronous delete' do
|
|
it_behaves_like 'group destruction', true
|
|
end
|
|
|
|
describe 'synchronous delete' do
|
|
it_behaves_like 'group destruction', false
|
|
end
|
|
end
|