inspec 2.1.30 → 2.1.43

data/lib/resources/powershell.rb

@@ -5,6 +5,7 @@ module Inspec::Resources
   class PowershellScript < Cmd
     name 'powershell'
     supports platform: 'windows'
+    supports platform: 'unix'
     desc 'Use the powershell InSpec audit resource to test a Windows PowerShell script on the Microsoft Windows platform.'
     example "
       script = <<-EOH

data/lib/resources/shadow.rb

@@ -35,15 +35,11 @@ module Inspec::Resources
     include FileReader
 
     attr_reader :params
-    attr_reader :lines
 
-    def initialize(path = '/etc/shadow', opts = nil)
-      opts ||= {}
+    def initialize(path = '/etc/shadow', opts = {})
+      @opts = opts
       @path = path || '/etc/shadow'
-      @filters = opts[:filters] || ''
-      @raw_content = opts[:content] || read_file_content(@path, allow_empty: true)
-      @lines = @raw_content.to_s.split("\n")
-      @params = @lines.map { |l| parse_shadow_line(l) }
+      @filters = @opts[:filters] || ''
     end
 
     filtertable = FilterTable.create
@@ -70,11 +66,11 @@ module Inspec::Resources
       i.entries.length
     }
 
-    filtertable.connect(self, :params)
+    filtertable.connect(self, :set_params)
 
     def filter(query = {})
       return self if query.nil? || query.empty?
-      res = @params
+      res = set_params
       filters = ''
       query.each do |attr, condition|
         condition = condition.to_s if condition.is_a? Integer
@@ -116,6 +112,12 @@ module Inspec::Resources
       query.nil? ? expiry_date : expiry_date(query)
     end
 
+    def lines
+      warn '[DEPRECATION] The shadow `lines` property is deprecated and will be removed' \
+        ' in InSpec 3.0.'
+      shadow_content.to_s.split("\n")
+    end
+
     def to_s
       f = @filters.empty? ? '' : ' with'+@filters
       "/etc/shadow#{f}"
@@ -123,8 +125,16 @@ module Inspec::Resources
 
     private
 
+    def shadow_content
+      @opts[:content] || read_file_content(@path, allow_empty: true)
+    end
+
+    def set_params
+      @params ||= Array(shadow_content.to_s.split("\n")).map { |l| parse_shadow_line(l) }
+    end
+
     def map_data(id)
-      @params.map { |x| x[id] }
+      set_params.collect { |x| x[id] }
     end
 
     # Parse a line of /etc/shadow

data/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 2.1.30
+  version: 2.1.43
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2018-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -777,6 +777,7 @@ files:
 - lib/utils/nginx_parser.rb
 - lib/utils/object_traversal.rb
 - lib/utils/parser.rb
+- lib/utils/pkey_reader.rb
 - lib/utils/plugin_registry.rb
 - lib/utils/simpleconfig.rb
 - lib/utils/spdx.rb