Merge branch '321611_remove_protected_tags' into 'master'

Do not mirror protected tags restricted for a creation

See merge request gitlab-org/gitlab!80388

config/feature_flags/development/verify_protected_tags_for_pull_mirror.yml

+---
+name: verify_protected_tags_for_pull_mirror
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/80388
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/352494
+milestone: '14.9'
+type: development
+group: group::source code
+default_enabled: false

ee/app/services/projects/update_mirror_service.rb

@@ -105,6 +105,8 @@ def update_tags(&block)
 
       tags = repository_tags_with_target
 
+      tags_to_remove = []
+
       tags.each do |tag|
         old_tag = old_tags[tag.name]
         tag_target = tag.dereferenced_target.sha
@@ -112,21 +114,40 @@ def update_tags(&block)
 
         next if old_tag_target == tag_target
 
-        Git::TagPushService.new(
-          project,
-          current_user,
-          change: {
-            oldrev: old_tag_target,
-            newrev: tag_target,
-            ref: "#{Gitlab::Git::TAG_REF_PREFIX}#{tag.name}"
-          },
-          mirror_update: true
-        ).execute
+        if Feature.enabled?(:verify_protected_tags_for_pull_mirror, project, default_enabled: :yaml) && !can_create_tag?(tag)
+          tags_to_remove << tag
+          next
+        end
+
+        change = { oldrev: old_tag_target, newrev: tag_target, ref: tag_reference(tag) }
+
+        Git::TagPushService.new(project, current_user, change: change, mirror_update: true).execute
+      end
+
+      if tags_to_remove.present?
+        refs = tags_to_remove.map { |tag| tag_reference(tag) }
+
+        project.repository.delete_refs(*refs)
+        project.repository.expire_tags_cache
+
+        # Only take 10 tags to keep the error message short
+        not_allowed_tags = tags_to_remove.first(10).map { |tag| "'#{tag.name}'" }
+        not_allowed_tags << 'and others' if tags_to_remove.count > 10
+
+        raise UpdateError, "You are not allowed to create tags: #{not_allowed_tags.join(', ')} as they are protected."
       end
 
       fetch_result
     end
 
+    def can_create_tag?(tag)
+      ::Gitlab::UserAccess.new(current_user, container: project).can_create_tag?(tag.name)
+    end
+
+    def tag_reference(tag)
+      "#{Gitlab::Git::TAG_REF_PREFIX}#{tag.name}"
+    end
+
     def update_lfs_objects
       result = Projects::LfsPointers::LfsImportService.new(project).execute
 

ee/spec/services/projects/update_mirror_service_spec.rb

@@ -98,13 +98,13 @@
       end
     end
 
-    context "updating tags" do
-      it "creates new tags, expiring cache if there are tag changes" do
+    context 'updating tags', :aggregate_failures do
+      it 'creates new tags, expiring cache if there are tag changes' do
         stub_fetch_mirror(project)
 
         expect(project.repository).to receive(:expire_tags_cache).and_call_original
 
-        service.execute
+        expect(service.execute).to eq(status: :success)
 
         expect(project.repository.tag_names).to include('new-tag')
       end
@@ -114,17 +114,69 @@
 
         expect(project.repository).not_to receive(:expire_tags_cache)
 
-        service.execute
+        expect(service.execute).to eq(status: :success)
       end
 
-      it "only invokes Git::TagPushService for tags pointing to commits" do
+      it 'only invokes Git::TagPushService for tags pointing to commits' do
         stub_fetch_mirror(project)
 
+        allow(Git::TagPushService).to receive(:new).and_call_original
         expect(Git::TagPushService).to receive(:new)
           .with(project, project.first_owner, change: hash_including(ref: 'refs/tags/new-tag'), mirror_update: true)
           .and_return(double(execute: true))
 
-        service.execute
+        expect(service.execute).to eq(status: :success)
+      end
+
+      describe 'Protected tags mirroring' do
+        context 'when user has permissions to create a protected tag' do
+          let!(:protected_tag) { create(:protected_tag, project: project, name: 'protected-tag') }
+
+          it 'creates the protected tag' do
+            stub_fetch_mirror(project)
+
+            expect(project.repository).to receive(:expire_tags_cache).and_call_original
+            expect(Git::TagPushService).to receive(:new).and_call_original.twice
+
+            expect(service.execute).to eq(status: :success)
+
+            expect(project.repository.tag_names).to include('new-tag', 'protected-tag')
+          end
+        end
+
+        context 'when user cannot create a protected tag' do
+          let!(:protected_tag) { create(:protected_tag, :no_one_can_create, project: project, name: 'protected-tag') }
+
+          it 'creates only tags that user can create' do
+            stub_fetch_mirror(project)
+
+            expect(Git::TagPushService).to receive(:new).and_call_original.once
+
+            expect(service.execute).to eq(
+              message: "You are not allowed to create tags: 'protected-tag' as they are protected.",
+              status: :error
+            )
+            expect(project.repository.tag_names).not_to include('protected-tag')
+            expect(project.repository.tag_names).to include('new-tag')
+          end
+
+          context 'when feature flag is disabled' do
+            before do
+              stub_feature_flags(verify_protected_tags_for_pull_mirror: false)
+            end
+
+            it 'creates the protected tag' do
+              stub_fetch_mirror(project)
+
+              expect(project.repository).to receive(:expire_tags_cache).and_call_original
+              expect(Git::TagPushService).to receive(:new).and_call_original.twice
+
+              expect(service.execute).to eq(status: :success)
+
+              expect(project.repository.tag_names).to include('new-tag', 'protected-tag')
+            end
+          end
+        end
       end
     end
 
@@ -464,6 +516,9 @@ def fetch_mirror(repository, tags_changed: true)
     # New tag
     rugged.references.create('refs/tags/new-tag', masterrev)
 
+    # Protected tag
+    rugged.references.create('refs/tags/protected-tag', masterrev)
+
     # New tag that point to a blob
     rugged.references.create('refs/tags/new-tag-on-blob', 'c74175afd117781cbc983664339a0f599b5bb34e')