serverspec 2.35.0 → 2.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 609cc80dcfdad218ce5f7d2956aa32ba29c8980a
-  data.tar.gz: 05f826f398abb44f97607c418f793073278fcbe6
+  metadata.gz: e3689402c5d03f438cdb273aa1300f49604319e6
+  data.tar.gz: 8cc6ee4a4bb5fda653cfeccfed3e53c4f5459470
 SHA512:
-  metadata.gz: 1e934fe845e12bfa2595bc9cb0fbc398c4447048db1d0191c5faec12c09db5d8b4f1a5a1763047e6fda40891bd9d4596ba1534ff89373a6de882a0ae9d94570b
-  data.tar.gz: 2223c7bc8076116961b5ac8a143d2affe31db54818a2397ae7b181a96a91ae3eba8a51befef7ba424d6c0ff2220d563ce2ea6ce0cb32991f30b70fbd72550561
+  metadata.gz: 63b56de0b976a48f57563fca617bc74e5ec0176458ee36cb4c7d02f26f0382b404965e0bfcd8935e3efc26907b89a0ef65782971599f6530e30e4d270b21a006
+  data.tar.gz: b7aaafc17b9ea01c96907cc0cc3a0e0015bdf096822e8ddf170d8af7b94e828546445a3d6e60f5568efeb2a9f013742b2fdaad4bd5bfea1ccfc65a29efd5965f

data/lib/serverspec/setup.rb

@@ -298,7 +298,7 @@ set :ssh_options, options
 
 
 # Set environment variables
-# set :env, :LANG => 'C', :LC_MESSAGES => 'C' 
+# set :env, :LANG => 'C', :LC_MESSAGES => 'C'
 
 # Set PATH
 # set :path, '/sbin:/usr/local/sbin:$PATH'

data/lib/serverspec/type/x509_certificate.rb

@@ -60,6 +60,15 @@ module Serverspec::Type
       ( diff/(60*60*24) )
     end
 
+    def subject_alt_names
+      text = run_openssl_command_with('-text -noout').stdout
+      # X509v3 Subject Alternative Name:
+      #     DNS:*.example.com, DNS:www.example.net, IP:192.0.2.10
+      if text =~ /^ *X509v3 Subject Alternative Name: *\n *(.*)$/
+        $1.split(/, +/)
+      end
+    end
+
     private
     def run_openssl_command_with(param_str)
       @runner.run_command("openssl x509 -in #{name} #{param_str}")

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.35.0"
+  VERSION = "2.36.0"
 end

data/spec/type/linux/x509_certificate_spec.rb

@@ -33,6 +33,10 @@ describe x509_certificate('test.pem') do
   it { should_not be_valid }
 end
 
+describe x509_certificate('test.pem') do
+  let(:stdout) { sample_san }
+  its(:subject_alt_names) { should eq %w[DNS:*.example.com DNS:www.example.net IP:192.0.2.10] }
+end
 
 def sample_subj
   <<'EOS'
@@ -60,3 +64,15 @@ notAfter=Jul  1 11:11:00 2010 GMT
 EOS
 end
 
+def sample_san
+  <<'EOS'
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        X509v3 extensions:
+            X509v3 Extended Key Usage:
+                TLS Web Server Authentication, TLS Web Client Authentication
+            X509v3 Subject Alternative Name:
+                DNS:*.example.com, DNS:www.example.net, IP:192.0.2.10
+EOS
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.35.0
+  version: 2.36.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-15 00:00:00.000000000 Z
+date: 2016-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec