serverspec 2.39.2 → 2.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10920ffce34b834bb124b16179b982676b4ef4f8
-  data.tar.gz: 06c46faa9982034b45fa79214a72086a887f66d6
+  metadata.gz: 21b7e3d65fcdbc7880ab5f80e7c2dff85aa63af6
+  data.tar.gz: aa5ab7c63211633fecadc9e7743fdcc7e45a85aa
 SHA512:
-  metadata.gz: 469c05ececc117cf1a6eb0bd69808618831da194dce32ced0d02d0667c8faad1407faa030f716f1add6b537ed6eca1a497babd5f8d1b4d70924b6ae2626b0eca
-  data.tar.gz: 4ba911d145e22ad268d8922d79416574c331fb72c4340ab90800524e2fd316e84df7c72edd5a7fe2a08cbe53e226e71ad9d3cbb753b530882a096ad4d85e59ca
+  metadata.gz: 398ed88422cfed45ab3b500efc58bfac8d97ae2224ad4d76d6f8bc3198c4cda379e22e1bbf567d31d54b99092bb513577d5b2249f790b2b028ce9d87e3df73bc
+  data.tar.gz: 6404eb7895642dee7ffc928f8c81c963afc72e74033a8dfec3343e3c98b759dc8ece751c05dfc2b832e68eb5143062abafaedc847601ebe5c86b07315044fca6

data/lib/serverspec/type/x509_private_key.rb

@@ -3,8 +3,8 @@ require 'time'
 module Serverspec::Type
   class X509PrivateKey < Base
     def valid?
-      runner_res = @runner.run_command("openssl rsa -in #{name} -check -noout")
-      ( runner_res.exit_status == 0 && runner_res.stdout.chomp == 'RSA key ok' )
+      runner_res = @runner.run_command("echo | openssl rsa -in #{name} -check -noout -passin #{@options[:passin] || "stdin"}")
+      ( runner_res.exit_status == 0 && runner_res.stdout.chomp == 'RSA key ok' ) && (!@options.has_key?(:passin) || encrypted?)
     end
 
     def encrypted?
@@ -13,7 +13,7 @@ module Serverspec::Type
 
     def has_matching_certificate?(cert_file)
       h1 = @runner.run_command("openssl x509 -noout -modulus -in #{cert_file}")
-      h2 = @runner.run_command("openssl rsa -noout -modulus -in #{name}")
+      h2 = @runner.run_command("echo | openssl rsa -noout -modulus -in #{name} -passin #{@options[:passin] || "stdin"}")
       (h1.stdout == h2.stdout) && (h1.exit_status == 0) && (h2.exit_status == 0)
     end
   end

data/lib/serverspec/version.rb

@@ -1,3 +1,3 @@
 module Serverspec
-  VERSION = "2.39.2"
+  VERSION = "2.40.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: serverspec
 version: !ruby/object:Gem::Version
-  version: 2.39.2
+  version: 2.40.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-04 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec