Add latest changes from gitlab-org/gitlab@master

3 files changed, 101 insertions, 0 deletions

diff --git a/spec/lib/gitlab/ci/secure_files/cer_spec.rb b/spec/lib/gitlab/ci/secure_files/cer_spec.rb
new file mode 100644
index 00000000000..50c8494524a
--- /dev/null
+++ b/spec/lib/gitlab/ci/secure_files/cer_spec.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Ci::SecureFiles::Cer do
+  context 'when the supplied certificate cannot be parsed' do
+    let(:invalid_certificate) { described_class.new('xyzabc') }
+    let(:subject) { described_class.new('xyzabc') }
+
+    describe '#certificate_data' do
+      it 'assigns the error message and returns nil' do
+        expect(invalid_certificate.certificate_data).to be nil
+        expect(invalid_certificate.error).to eq('not enough data')
+      end
+    end
+
+    describe '#metadata' do
+      it 'returns an empty hash' do
+        expect(invalid_certificate.metadata).to eq({})
+      end
+    end
+
+    describe '#expires_at' do
+      it 'returns nil' do
+        expect(invalid_certificate.expires_at).to be_nil
+      end
+    end
+  end
+
+  context 'when the supplied certificate can be parsed' do
+    let(:sample_file) { fixture_file('ci_secure_files/sample.cer') }
+    let(:subject) { described_class.new(sample_file) }
+
+    describe '#certificate_data' do
+      it 'returns an OpenSSL::X509::Certificate object' do
+        expect(subject.certificate_data.class).to be(OpenSSL::X509::Certificate)
+      end
+    end
+
+    describe '#metadata' do
+      it 'returns a hash with the expected keys' do
+        expect(subject.metadata.keys).to match_array([:issuer, :subject, :id, :expires_at])
+      end
+    end
+
+    describe '#id' do
+      it 'returns the certificate serial number' do
+        expect(subject.metadata[:id]).to eq('33669367788748363528491290218354043267')
+      end
+    end
+
+    describe '#expires_at' do
+      it 'returns the certificate expiration timestamp' do
+        expect(subject.expires_at).to eq('2022-04-26 19:20:40 UTC')
+      end
+    end
+
+    describe '#issuer' do
+      it 'calls parse on X509Name' do
+        expect(subject.metadata[:issuer]["O"]).to eq('Apple Inc.')
+      end
+    end
+
+    describe '#subject' do
+      it 'calls parse on X509Name' do
+        expect(subject.metadata[:subject]["OU"]).to eq('N7SYAN8PX8')
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/secure_files/x509_name_spec.rb b/spec/lib/gitlab/ci/secure_files/x509_name_spec.rb
new file mode 100644
index 00000000000..3a523924c5b
--- /dev/null
+++ b/spec/lib/gitlab/ci/secure_files/x509_name_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Ci::SecureFiles::X509Name do
+  describe '.parse' do
+    it 'parses an X509Name object into a hash format' do
+      sample = OpenSSL::X509::Name.new([
+                                         ['C', 'Test Country'],
+                                         ['O', 'Test Org Name'],
+                                         ['OU', 'Test Org Unit'],
+                                         ['CN', 'Test Common Name'],
+                                         ['UID', 'Test UID']
+                                       ])
+
+      parsed_sample = described_class.parse(sample)
+
+      expect(parsed_sample["C"]).to eq('Test Country')
+      expect(parsed_sample["O"]).to eq('Test Org Name')
+      expect(parsed_sample["OU"]).to eq('Test Org Unit')
+      expect(parsed_sample["CN"]).to eq('Test Common Name')
+      expect(parsed_sample["UID"]).to eq('Test UID')
+    end
+
+    it 'returns an empty hash when an error occurs' do
+      parsed_sample = described_class.parse('unexpectedinput')
+      expect(parsed_sample).to eq({})
+    end
+  end
+end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 34c062d3096..b3d5a0d57c1 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -95,6 +95,7 @@ label_links:
 label:
 - subscriptions
 - project
+- parent_container
 - lists
 - label_links
 - issues