Merge branch 'pks-ff-drop-get-signed-tag' into 'master'

tags: Always enable fix for verification of long tag messages

See merge request gitlab-org/gitlab!70051

config/feature_flags/development/get_tag_signatures.yml

----
-name: get_tag_signatures
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67000
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337842
-milestone: '14.2'
-type: development
-group: group::gitaly
-default_enabled: false

lib/gitlab/signed_tag.rb

@@ -7,12 +7,7 @@ module Gitlab
     def initialize(repository, tag)
       @repository = repository
       @tag = tag
-
-      if Feature.enabled?(:get_tag_signatures)
       @signature_data = Gitlab::Git::Tag.extract_signature_lazily(repository, tag.id) if repository
-      else
-        @signature_data = [signature_text_of_message.b, signed_text_of_message.b]
-      end
     end
 
     def signature
@@ -26,22 +21,5 @@ module Gitlab
     def signed_text
       @signature_data&.fetch(1)
     end
-
-    private
-
-    def signature_text_of_message
-      @tag.message.slice(@tag.message.index("-----BEGIN SIGNED MESSAGE-----")..-1)
-    rescue StandardError
-      nil
-    end
-
-    def signed_text_of_message
-      %{object #{@tag.target_commit.id}
-type commit
-tag #{@tag.name}
-tagger #{@tag.tagger.name} <#{@tag.tagger.email}> #{@tag.tagger.date.seconds} #{@tag.tagger.timezone}
-
-#{@tag.message.gsub(/-----BEGIN SIGNED MESSAGE-----(.*)-----END SIGNED MESSAGE-----/m, "")}}
-    end
   end
 end

spec/lib/gitlab/git/tag_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe Gitlab::Git::Tag, :seed_helper do
       it { expect(tag.tagger.timezone).to eq("+0200") }
     end
 
-    shared_examples 'signed tag' do
+    describe 'signed tag' do
       let(:project) { create(:project, :repository) }
       let(:tag) { project.repository.find_tag('v1.1.1') }
 
@@ -54,18 +54,6 @@ RSpec.describe Gitlab::Git::Tag, :seed_helper do
       it { expect(tag.tagger.timezone).to eq("+0100") }
     end
 
-    context 'with :get_tag_signatures enabled' do
-      it_behaves_like 'signed tag'
-    end
-
-    context 'with :get_tag_signatures disabled' do
-      before do
-        stub_feature_flags(get_tag_signatures: false)
-      end
-
-      it_behaves_like 'signed tag'
-    end
-
     it { expect(repository.tags.size).to eq(SeedRepo::Repo::TAGS.size) }
   end
 

spec/lib/gitlab/x509/tag_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Gitlab::X509::Tag do
     let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH, '', 'group/project') }
     let(:project) { create(:project, :repository) }
 
-    shared_examples 'signed tag' do
+    describe 'signed tag' do
       let(:tag) { project.repository.find_tag('v1.1.1') }
       let(:certificate_attributes) do
         {
@@ -33,24 +33,10 @@ RSpec.describe Gitlab::X509::Tag do
       it { expect(signature.x509_certificate.x509_issuer).to have_attributes(issuer_attributes) }
     end
 
-    shared_examples 'unsigned tag' do
+    describe 'unsigned tag' do
       let(:tag) { project.repository.find_tag('v1.0.0') }
 
       it { expect(signature).to be_nil }
     end
-
-    context 'with :get_tag_signatures enabled' do
-      it_behaves_like 'signed tag'
-      it_behaves_like 'unsigned tag'
-    end
-
-    context 'with :get_tag_signatures disabled' do
-      before do
-        stub_feature_flags(get_tag_signatures: false)
-      end
-
-      it_behaves_like 'signed tag'
-      it_behaves_like 'unsigned tag'
-    end
   end
 end