inspec 4.1.4.preview → 4.2.0.preview

data/lib/inspec/profile_context.rb

@@ -12,13 +12,11 @@ require 'inspec/objects/input'
 
 module Inspec
   class ProfileContext
-    def self.for_profile(profile, backend, inputs)
-      new(profile.name, backend, { 'profile' => profile,
-                                   'inputs' => inputs,
-                                   'check_mode' => profile.check_mode })
+    def self.for_profile(profile, backend)
+      new(profile.name, backend, { 'profile' => profile, 'check_mode' => profile.check_mode })
     end
 
-    attr_reader :inputs, :backend, :profile_name, :profile_id, :resource_registry
+    attr_reader :backend, :profile_name, :profile_id, :resource_registry
     attr_accessor :rules
     def initialize(profile_id, backend, conf)
       if backend.nil?
@@ -35,7 +33,8 @@ module Inspec
       @lib_subcontexts = []
       @require_loader = ::Inspec::RequireLoader.new
       Inspec::InputRegistry.register_profile_alias(@profile_id, @profile_name) if @profile_id != @profile_name
-      @inputs = Inspec::InputRegistry.list_inputs_for_profile(@profile_id)
+      # TODO: consider polling input source plugins; this is a bulk fetch opportunity
+
       # A local resource registry that only contains resources defined
       # in the transitive dependency tree of the loaded profile.
       @resource_registry = Inspec::Resource.new_registry
@@ -43,6 +42,10 @@ module Inspec
       @current_load = nil
     end
 
+    def attributes
+      Inspec::AttributeRegistry.list_attributes_for_profile(@profile_id)
+    end
+
     def dependencies
       if @conf['profile'].nil?
         {}
@@ -187,13 +190,6 @@ module Inspec
       end
     end
 
-    def register_input(name, options = {})
-      # we need to return an input object, to allow dermination of values
-      input = Inspec::InputRegistry.register_input(name, @profile_id, options)
-      input.value = @conf['inputs'][name] unless @conf['inputs'].nil? || @conf['inputs'][name].nil?
-      input.value
-    end
-
     def set_header(field, val)
       @current_load[field] = val
     end

data/lib/inspec/rspec_extensions.rb

@@ -66,9 +66,13 @@ end
 class RSpec::Core::ExampleGroup
   # This DSL method allows us to access the values of inputs within InSpec tests
   def attribute(name)
-    Inspec::InputRegistry.find_input(name, self.class.metadata[:profile_id]).value
+    Inspec::InputRegistry.find_or_register_input(name, self.class.metadata[:profile_id]).value
   end
   define_example_method :attribute
+  def input_obj(name)
+    Inspec::InputRegistry.find_or_register_input(name, self.class.metadata[:profile_id])
+  end
+  define_example_method :input_obj
 
   # Here, we have to ensure our method_missing gets called prior
   # to RSpec::Core::ExampleGroup.method_missing (the class method).

data/lib/inspec/runner.rb

@@ -9,7 +9,6 @@ require 'inspec/backend'
 require 'inspec/profile_context'
 require 'inspec/profile'
 require 'inspec/metadata'
-require 'inspec/secrets'
 require 'inspec/config'
 require 'inspec/dependencies/cache'
 # spec requirements
@@ -32,7 +31,7 @@ module Inspec
   class Runner
     extend Forwardable
 
-    attr_reader :backend, :rules, :inputs
+    attr_reader :backend, :rules
 
     def attributes
       Inspec.deprecate(:rename_attributes_to_inputs, "Don't call runner.attributes, call runner.inputs")
@@ -57,10 +56,17 @@ module Inspec
         RunnerRspec.new(@conf)
       end
 
-      # list of profile inputs
-      @inputs = {}
+      # About reading inputs:
+      #   @conf gets passed around a lot, eventually to
+      # Inspec::InputRegistry.register_external_inputs.
+      #
+      #   @conf may contain the key :attributes or :inputs, which is to be a Hash
+      # of values passed in from the Runner API.
+      # This is how kitchen-inspec and the audit_cookbook pass in inputs.
+      #
+      #   @conf may contain the key :attrs or :input_file, which is to be an Array
+      # of file paths, each a YAML file. This how --input-file works.
 
-      load_inputs(@conf)
       configure_transport
     end
 
@@ -101,7 +107,6 @@ module Inspec
           @test_collector.add_profile(requirement.profile)
         end
 
-        @inputs = profile.runner_context.inputs if @inputs.empty?
         tests = profile.collect_tests
         all_controls += tests unless tests.nil?
       end
@@ -149,35 +154,6 @@ module Inspec
       @test_collector.exit_code
     end
 
-    # determine all inputs before the execution, fetch data from secrets backend
-    def load_inputs(options)
-      # TODO: - rename :attributes - it is user-visible
-      options[:attributes] ||= {}
-
-      if options.key?(:attrs)
-        Inspec.deprecate(:rename_attributes_to_inputs, 'Use --input-file on the command line instead of --attrs.')
-        options[:input_file] = options.delete(:attrs)
-      end
-      secrets_targets = options[:input_file]
-      return options[:attributes] if secrets_targets.nil?
-
-      secrets_targets.each do |target|
-        validate_inputs_file_readability!(target)
-
-        secrets = Inspec::SecretsBackend.resolve(target)
-        if secrets.nil?
-          raise Inspec::Exceptions::SecretsBackendNotFound,
-                "Cannot find parser for inputs file '#{target}'. " \
-                'Check to make sure file has the appropriate extension.'
-        end
-
-        next if secrets.inputs.nil?
-        options[:attributes].merge!(secrets.inputs)
-      end
-
-      options[:attributes]
-    end
-
     #
     # add_target allows the user to add a target whose tests will be
     # run when the user calls the run method.
@@ -209,7 +185,7 @@ module Inspec
                                            vendor_cache: @cache,
                                            backend: @backend,
                                            controls: @controls,
-                                           inputs: @conf[:attributes]) # TODO: read form :inputs here (user visible)
+                                           runner_conf: @conf)
       raise "Could not resolve #{target} to valid input." if profile.nil?
       @target_profiles << profile if supports_profile?(profile)
     end
@@ -300,22 +276,6 @@ module Inspec
       examples.each { |e| @test_collector.add_test(e, rule) }
     end
 
-    def validate_inputs_file_readability!(target)
-      unless File.exist?(target)
-        raise Inspec::Exceptions::InputsFileDoesNotExist,
-              "Cannot find input file '#{target}'. " \
-              'Check to make sure file exists.'
-      end
-
-      unless File.readable?(target)
-        raise Inspec::Exceptions::InputsFileNotReadable,
-              "Cannot read input file '#{target}'. " \
-              'Check to make sure file is readable.'
-      end
-
-      true
-    end
-
     def rspec_skipped_block(arg, opts, message)
       @test_collector.example_group(*arg, opts) do
         # Send custom `it` block to RSpec

data/lib/inspec/version.rb

@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = '4.1.4.preview'.freeze
+  VERSION = '4.2.0.preview'.freeze
 end

data/lib/resources/mssql_session.rb

@@ -108,7 +108,7 @@ module Inspec::Resources
       results = table.map { |row|
         res = {}
         headers.each { |header|
-          res[header.downcase] = row[header]
+          res[header.downcase] = row[header] if header
         }
         Hashie::Mash.new(res)
       }

data/lib/resources/port.rb

@@ -569,6 +569,10 @@ module Inspec::Resources
       # example: ::ffff:10.0.2.15:9200
       host.delete!('::ffff:') if host.start_with?('::ffff:')
 
+      # To remove brackets that might surround the IPv6 address
+      # example: [::] and [fe80::dc11:b9b6:514b:134]%eth0:123
+      host = host.tr('[]', '')
+
       # if there's an interface name in the local address, which is common for
       # IPv6 listeners, strip that out too.
       # example: fe80::a00:27ff:fe32:ed09%enp0s3

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 4.1.4.preview
+  version: 4.2.0.preview
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-22 00:00:00.000000000 Z
+date: 2019-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -56,16 +56,22 @@ dependencies:
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.13
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: 0.2.13
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement