Require a key attribute for the key_rsa resource (#2891)

Bug Fix #2865 * Defining an attribute without a default value generates a stacktrace * Fix string quotes * Moved logic out of the initilize method. * Refactoring for better clarity. * Fixing trailing white spaces Signed-off-by: Omar J Irizarry <[email protected]>
inspec · Apr 12, 2018 · a278ae9 · a278ae9
1 parent 0c3bec2
commit a278ae9
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/lib/resources/key_rsa.rb b/lib/resources/key_rsa.rb
@@ -3,6 +3,7 @@
 require 'openssl'
 require 'hashie/mash'
 require 'utils/file_reader'
+require 'utils/pkey_reader'
 
 module Inspec::Resources
   class RsaKey < Inspec.resource(1)
@@ -22,11 +23,12 @@ class RsaKey < Inspec.resource(1)
     "
 
     include FileReader
+    include PkeyReader
 
     def initialize(keypath, passphrase = nil)
       @key_path = keypath
       @passphrase = passphrase
-      @key = OpenSSL::PKey.read(read_file_content(@key_path, allow_empty: true), @passphrase)
+      @key = read_pkey(read_file_content(@key_path, allow_empty: true), @passphrase)
     end
 
     def public?

diff --git a/lib/utils/pkey_reader.rb b/lib/utils/pkey_reader.rb
@@ -0,0 +1,15 @@
+module PkeyReader
+  def read_pkey(filecontent, passphrase)
+    raise_if_default(passphrase)
+
+    OpenSSL::PKey.read(filecontent, passphrase)
+  rescue OpenSSL::PKey::PKeyError
+    raise Inspec::Exceptions::ResourceFailed, 'passphrase error'
+  end
+
+  def raise_if_default(passphrase)
+    if passphrase.is_a? Inspec::Attribute::DEFAULT_ATTRIBUTE
+      raise Inspec::Exceptions::ResourceFailed, 'Please provide default value for attribute'
+    end
+  end
+end