serverspec 2.41.6 → 2.41.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c055c97caf2f1a49b8a9636f73ecfe4b9b63ee7c03fbee33e61bc4a3bf3c03b3
-  data.tar.gz: aabdb043508a030010e43e5da1a6d575a75de901c3c1e830e3afb2bf96aa6fdd
+  metadata.gz: 6e4825adcbf2c79093752621578ea9a307a0a58330742d0a1b8843016ac1b0fb
+  data.tar.gz: c1fbaa08a9df4cc5b6c76a69d7a2b06b37442af4a49319d30e81f791f68e1c31
 SHA512:
-  metadata.gz: 2aca68fe8c54039f3a5187c20d69700dcbbf6fba3a57555c89cd13203bb8f2bc7c42fdb990252bf178b6402e894fa3fde552f9c7c5cb20f2e58c2f32be45ff7f
-  data.tar.gz: 2d2f0baa539f472927d5287d5b26f6d22395f183718305dd1a123b77538c815a94362e794b363d8413c28f9d9e13de0f9cbdcc03c223959ecf9220767d3b39c4
+  metadata.gz: 87475efc90b46f44b6ecf14ad44deb16ba64818b9b45abd45b36d089f87f6f4cefa8e0f4674a6035c3b6ca9b07cd8422902f861d85bf6ed6a235d10d0b824d56
+  data.tar.gz: 6772e53f96bd63d7eec0ea4c876e00273bf3169604d25684ae9396361c55e2f92f30e797b2f2bfd11c54508f6bc3651928896703f32aa9302a707f14c30989d9

data/lib/serverspec/type/x509_certificate.rb

@@ -84,9 +84,9 @@ module Serverspec::Type
 
     # Normalize output between openssl versions.
     def normalize_dn(dn)
-      return subject unless subject.start_with?('/')
-      # normalize openssl >= 1.1 to < 1.1 output
-      subject[1..-1].split('/').join(', ').gsub('=', ' = ')
+      return dn unless dn.start_with?('/')
+      # normalize openssl < 1.1 to >= 1.1 output
+      dn[1..-1].split('/').join(', ').gsub('=', ' = ')
     end
   end
 end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.41.6"
+  VERSION = "2.41.7"
 end

data/spec/type/linux/x509_certificate_spec.rb

@@ -12,14 +12,24 @@ describe x509_certificate('test.pem') do
   it { should_not be_certificate }
 end
 
-describe x509_certificate('test.pem') do
-  let(:stdout) { sample_subj }
-  its(:subject) { should eq '/O=some/OU=thing' }
+describe x509_certificate('test-openssl-1.0.pem') do
+  let(:stdout) { sample_subj_openssl_1_0 }
+  its(:subject) { should eq 'O = some, OU = thing' }
 end
 
-describe x509_certificate('test.pem') do
-  let(:stdout) { sample_issuer }
-  its(:issuer) { should eq '/O=some/OU=issuer' }
+describe x509_certificate('test-openssl-1.1.pem') do
+  let(:stdout) { sample_subj_openssl_1_1 }
+  its(:subject) { should eq 'O = some, OU = thing' }
+end
+
+describe x509_certificate('test-openssl-1.0.pem') do
+  let(:stdout) { sample_issuer_openssl_1_0 }
+  its(:issuer) { should eq 'O = some, OU = issuer' }
+end
+
+describe x509_certificate('test-openssl-1.1.pem') do
+  let(:stdout) { sample_issuer_openssl_1_1 }
+  its(:issuer) { should eq 'O = some, OU = issuer' }
 end
 
 describe x509_certificate('test.pem') do
@@ -38,18 +48,30 @@ describe x509_certificate('test.pem') do
   its(:subject_alt_names) { should eq %w[DNS:*.example.com DNS:www.example.net IP:192.0.2.10] }
 end
 
-def sample_subj
+def sample_subj_openssl_1_0
   <<'EOS'
 subject= /O=some/OU=thing
 EOS
 end
 
-def sample_issuer
+def sample_subj_openssl_1_1
+  <<'EOS'
+subject=O = some, OU = thing
+EOS
+end
+
+def sample_issuer_openssl_1_0
   <<'EOS'
 issuer= /O=some/OU=issuer
 EOS
 end
 
+def sample_issuer_openssl_1_1
+  <<'EOS'
+issuer=O = some, OU = issuer
+EOS
+end
+
 def sample_validity
   <<'EOS'
 notBefore=Jul  1 11:11:00 2000 GMT

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.41.6
+  version: 2.41.7
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-18 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec