inspec 4.18.39 → 4.18.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 398cfa1582305a817199e0bae6b3642d0c1aebcf5e1853f10d8e5213a467c7ad
-  data.tar.gz: 26be7c80d1a1065b44b479b221dcb3a1e17a136525fed65e7010961a469dda3c
+  metadata.gz: 7a86b0035c773f317e5a501e1b4dffb4390406dacf3de932232da5f2d8da9ad3
+  data.tar.gz: 01b2996b318a7726059588f7fc58575e47321e814e74632bf7ae9d02c6093bbd
 SHA512:
-  metadata.gz: af1cc64f102f9ea93526c163fac5f5e241a08cb18572fceee8bbe7f792f4e796fd9757a30e1815ba578bd8094f7c78fe3747d7f07e80a6743f967562a2465533
-  data.tar.gz: ebbbee6e19498cecebc033ed8531d1fc3ff5ea98f9f6e315b4c1c3fc48e85faee54ee434bb783941130729cc3053d16392f79db06597f278f599ef2cc3c336d6
+  metadata.gz: 8097d17a8ba6acd4e3a9a10f3cfa00ead7ca11ff63883150db7cd00a761b6ef750dd4c1ccbe25fd581092b5c4821b31ffb84094bf20c202508ea1fe93d39912e
+  data.tar.gz: ff1f33e691ba4334eea1cb4642a83e36795f984ba45fe13a4eddc6a8f363ed28a2fec5b374778619cdfe589e1dd862979d46c088deac5af7429313c28ee12bd2

data/Gemfile

@@ -20,7 +20,6 @@ end
 
 group :test do
   gem "chefstyle", "~> 0.13.0"
-  gem "coveralls", require: false
   gem "minitest", "~> 5.5"
   gem "minitest-sprint", "~> 1.0"
   gem "rake", ">= 10"

data/inspec.gemspec

@@ -23,19 +23,20 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.4"
 
-  spec.add_dependency "train", "~> 3.0" # Inspec 4 must have train 2+; 3+ if we include train-winrm
+  spec.add_dependency "train", "~> 3.0"
   # Train plugins we ship with InSpec
   spec.add_dependency "train-habitat", "~> 0.1"
   spec.add_dependency "train-aws", "~> 0.1"
-  spec.add_dependency "train-winrm", "~> 0.2" # Requires train 3+
+  spec.add_dependency "train-winrm", "~> 0.2"
 
   # Implementation dependencies
+  spec.add_dependency "chef-telemetry", "~> 1.0"
   spec.add_dependency "license-acceptance", ">= 0.2.13", "< 2.0"
   spec.add_dependency "thor", "~> 0.20"
   spec.add_dependency "json-schema", "~> 2.8"
   spec.add_dependency "method_source", "~> 0.8"
   spec.add_dependency "rubyzip", "~> 1.2", ">= 1.2.2"
-  spec.add_dependency "rspec", ["~> 3.0", "< 3.9"] # TODO: Loosen - See https://github.com/inspec/inspec/issues/4575
+  spec.add_dependency "rspec", "~> 3.9"
   spec.add_dependency "rspec-its", "~> 1.2"
   spec.add_dependency "pry", "~> 0"
   spec.add_dependency "hashie", "~> 3.4"
@@ -46,7 +47,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "tty-table", "~> 0.10"
   spec.add_dependency "tty-prompt", "~> 0.17"
   # Used for Azure profile until integrated into train
-  spec.add_dependency "faraday_middleware", "~> 0.12.2"
+  spec.add_dependency "faraday_middleware", "~> 0.12"
   spec.add_dependency "tomlrb", "~> 1.2"
   spec.add_dependency "addressable", "~> 2.4"
   spec.add_dependency "parslet", "~> 1.5"

data/lib/bundles/inspec-supermarket/target.rb

@@ -1,6 +1,6 @@
 require "uri"
 require "inspec/fetcher"
-require "fetchers/url"
+require "inspec/fetcher/url"
 
 # InSpec Target Helper for Supermarket
 module Supermarket

data/lib/inspec/base_cli.rb

@@ -8,6 +8,8 @@ require "inspec/utils/deprecation/global_method"
 # Allow end of options during array type parsing
 # https://github.com/erikhuda/thor/issues/631
 class Thor::Arguments
+  alias old_parse_array parse_array
+
   def parse_array(_name)
     return shift if peek.is_a?(Array)
 

data/lib/inspec/cached_fetcher.rb

@@ -8,7 +8,7 @@ module Inspec
     attr_reader :cache, :target, :fetcher
     def initialize(target, cache)
       @target = target
-      @fetcher = Inspec::Fetcher.resolve(target)
+      @fetcher = Inspec::Fetcher::Registry.resolve(target)
 
       if @fetcher.nil?
         raise("Could not fetch inspec profile in #{target.inspect}.")

data/lib/inspec/cli.rb

@@ -298,7 +298,11 @@ class Inspec::InspecCLI < Inspec::BaseCLI
   def detect
     o = config
     o[:command] = "platform.params"
+
+    configure_logger(o)
+
     (_, res) = run_command(o)
+
     if o["format"] == "json"
       puts res.to_json
     else

data/lib/inspec/config.rb

@@ -6,7 +6,6 @@ require "stringio"
 require "forwardable"
 require "thor"
 require "base64"
-require "inspec/base_cli"
 require "inspec/plugin/v2/filter"
 
 module Inspec
@@ -422,6 +421,7 @@ module Inspec
 
     def finalize_set_top_level_command(options)
       options[:type] = @command_name
+      require "inspec/base_cli"
       Inspec::BaseCLI.inspec_cli_command = @command_name # TODO: move to a more relevant location
     end
 

data/lib/inspec/fetcher.rb

@@ -26,7 +26,9 @@ module Inspec
     end
   end
 
-  Fetcher = FetcherRegistry.new
+  module Fetcher
+    Registry = FetcherRegistry.new
+  end
 
   def self.fetcher(version)
     if version != 1
@@ -38,9 +40,9 @@ module Inspec
 end
 
 # TODO: remove. require up, not down.
-require "fetchers/local"
-require "fetchers/url"
-require "fetchers/git"
+require "inspec/fetcher/local"
+require "inspec/fetcher/url"
+require "inspec/fetcher/git"
 
 # TODO: Remove in 4.0 when Compliance fetcher plugin is created
 require "plugins/inspec-compliance/lib/inspec-compliance/api"

data/lib/{fetchers → inspec/fetcher}/git.rb

@@ -3,7 +3,7 @@ require "fileutils"
 require "mixlib/shellout"
 require "inspec/log"
 
-module Fetchers
+module Inspec::Fetcher
   #
   # The git fetcher uses the git binary to fetch remote git sources.
   # Git-based sources should be specified with the `git:` key in the
@@ -90,8 +90,8 @@ module Fetchers
         # vendoring to something more complex, don't bother.
         FileUtils.rmdir(destination_path) if Dir.empty?(destination_path)
 
-        raise ArgumentError, "Cannot find relative path '#{@relative_path}' " \
-                             "within profile in git repo specified by '#{@remote_url}'"
+        raise Inspec::FetcherFailure, "Cannot find relative path '#{@relative_path}' " \
+                                      "within profile in git repo specified by '#{@remote_url}'"
       end
       FileUtils.cp_r("#{working_dir}/#{@relative_path}", destination_path)
     end
@@ -129,11 +129,11 @@ module Fetchers
     def resolve_ref(ref_name)
       command_string = "git ls-remote \"#{@remote_url}\" \"#{ref_name}*\""
       cmd = shellout(command_string)
-      raise "Error running '#{command_string}': #{cmd.stderr}" unless cmd.exitstatus == 0
+      raise(Inspec::FetcherFailure, "Profile git dependency failed for #{@remote_url} - error running '#{command_string}': #{cmd.stderr}") unless cmd.exitstatus == 0
 
       ref = parse_ls_remote(cmd.stdout, ref_name)
       unless ref
-        raise "Unable to resolve #{ref_name} to a specific git commit for #{@remote_url}"
+        raise Inspec::FetcherFailure, "Profile git dependency failed - unable to resolve #{ref_name} to a specific git commit for #{@remote_url}"
       end
 
       ref
@@ -191,7 +191,7 @@ module Fetchers
       cmd.error!
       cmd.status
     rescue Errno::ENOENT
-      raise "To use git sources, you must have git installed."
+      raise Inspec::FetcherFailure, "Profile git dependency failed for #{@remote_url} - to use git sources, you must have git installed."
     end
 
     def shellout(cmd, opts = {})

data/lib/{fetchers → inspec/fetcher}/local.rb

@@ -1,6 +1,6 @@
 require "openssl"
 
-module Fetchers
+module Inspec::Fetcher
   class Local < Inspec.fetcher(1)
     name "local"
     priority 0
@@ -101,7 +101,10 @@ module Fetchers
     end
 
     def perform_shasum(target)
-      @archive_shasum ||= OpenSSL::Digest::SHA256.digest(File.read(target)).unpack("H*")[0]
+      return @archive_shasum if @archive_shasum
+      raise(Inspec::FetcherFailure, "Profile dependency local path '#{target}' does not exist") unless File.exist?(target)
+
+      @archive_shasum = OpenSSL::Digest::SHA256.digest(File.read(target)).unpack("H*")[0]
     end
 
     def resolved_source

data/lib/{fetchers → inspec/fetcher}/mock.rb

@@ -1,6 +1,6 @@
 require "inspec/fetcher"
 
-module Fetchers
+module Inspec::Fetcher
   class Mock < Inspec.fetcher(1)
     name "mock"
     priority 0

data/lib/{fetchers → inspec/fetcher}/url.rb

@@ -3,7 +3,7 @@ require "openssl"
 require "tempfile"
 require "open-uri"
 
-module Fetchers
+module Inspec::Fetcher
   class Url < Inspec.fetcher(1)
     MIME_TYPES = {
       "application/x-zip-compressed" => ".zip",
@@ -205,15 +205,24 @@ module Fetchers
       @temp_archive_path = archive.path
     end
 
+    def open(target, opts) # overridden so we can control who we're talking to
+      URI.open(target, opts)
+    rescue NoMethodError   # TODO: remove when we drop ruby 2.4
+      super(target, opts)  # Kernel#open
+    end
+
     def open_via_uri(target)
       opts = http_opts
 
-      if opts[:http_basic_authentication]
-        # OpenURI does not support userinfo so we need to remove it
-        open(target.sub("#{@target_uri.userinfo}@", ""), opts)
-      else
-        open(target, opts)
-      end
+      # OpenURI does not support userinfo so we need to remove it
+      # https://ruby-doc.org/stdlib-2.5.0/libdoc/open-uri/rdoc/OpenURI/OpenRead.html#method-i-open
+      target = target.sub("#{@target_uri.userinfo}@", "") if
+        opts[:http_basic_authentication]
+
+      open(target, opts)
+
+    rescue SocketError, Errno::ECONNREFUSED, OpenURI::HTTPError => e
+      raise Inspec::FetcherFailure, "Profile URL dependency #{target} could not be fetched: #{e.message}"
     end
 
     def download_archive(path)
@@ -264,7 +273,7 @@ module Fetchers
         end
       end
       unless keys_missing_values.empty?
-        raise "Unable to fetch profile - the following HTTP headers have no value: " \
+        raise Inspec::FetcherFailure, "Unable to fetch profile - the following HTTP headers have no value: " \
           "#{keys_missing_values.join(", ")}"
       end
     end

data/lib/inspec/plugin/v1/plugin_types/fetcher.rb

@@ -17,7 +17,7 @@ module Inspec
     #
     class Fetcher < PluginRegistry::Plugin
       def self.plugin_registry
-        Inspec::Fetcher
+        Inspec::Fetcher::Registry
       end
 
       attr_accessor :target

data/lib/inspec/plugin/v2/installer.rb

@@ -431,7 +431,13 @@ module Inspec::Plugin::V2
         end
 
         # find all gem specification directories
-        directories = [Gem::Specification.default_specifications_dir]
+
+        spec_dir = if Gem.respond_to? :default_specifications_dir
+                     Gem.default_specifications_dir
+                   else
+                     Gem::Specification.default_specifications_dir
+                   end
+        directories = [spec_dir]
         unless defined?(::Bundler)
           # add in any others that do not start with the user directory
           directories += Gem::Specification.dirs.find_all do |path|

data/lib/inspec/resources/gem.rb

@@ -1,4 +1,5 @@
-require "inspec/resources/command"
+# circular: require "inspec/resource"
+# but... already being included by inspec/resource.rb
 
 module Inspec::Resources
   class GemPackage < Inspec.resource(1)
@@ -38,6 +39,8 @@ module Inspec::Resources
     def info
       return @info if defined?(@info)
 
+      require "inspec/resources/command"
+
       cmd = inspec.command("#{@gem_binary} list --local -a -q \^#{@package_name}\$")
       return {} unless cmd.exit_status == 0
 

data/lib/inspec/resources/mssql_session.rb

@@ -96,7 +96,7 @@ module Inspec::Resources
 
     def parse_csv_result(cmd)
       require "csv"
-      table = CSV.parse(cmd.stdout, { headers: true })
+      table = CSV.parse(cmd.stdout, headers: true)
 
       # remove first row, since it will be a seperator line
       table.delete(0)

data/lib/inspec/resources/shadow.rb

@@ -52,12 +52,6 @@ module Inspec::Resources
       .register_column(:inactive_days, field: "inactive_days")
       .register_column(:expiry_dates, field: "expiry_date")
       .register_column(:reserved, field: "reserved")
-    # These are deprecated, but we need to "alias" them
-    filtertable
-      .register_custom_property(:user) { |table, value| table.resource.user(value) }
-      .register_custom_property(:password) { |table, value| table.resource.password(value) }
-      .register_custom_property(:last_change) { |table, value| table.resource.last_change(value) }
-      .register_custom_property(:expiry_date) { |table, value| table.resource.expiry_date(value) }
 
     filtertable.register_custom_property(:content) do |t, _|
       t.entries.map do |e|

data/lib/inspec/resources/users.rb

@@ -223,6 +223,10 @@ module Inspec::Resources
       meta_info[:userflags] unless meta_info.nil?
     end
 
+    def lastlogin
+      meta_info[:lastlogin] unless meta_info.nil?
+    end
+
     # returns the minimum days between password changes
     def mindays
       credentials[:mindays] unless credentials.nil?
@@ -632,6 +636,7 @@ module Inspec::Resources
         shell: res[:shell],
         domain: res[:domain],
         userflags: res[:userflags],
+        lastlogin: res[:lastlogin],
       }
     end
 
@@ -715,6 +720,7 @@ module Inspec::Resources
             home = $_.HomeDirectory[0]
             shell = $null
             domain = $Computername
+            lastlogin = if($_.lastlogin.getType().Tostring() -eq "System.Management.Automation.PSMethod" ){ $null }else{[String]$_.lastlogin}
           }
         } | ConvertTo-Json
       EOH

data/lib/inspec/rspec_extensions.rb

@@ -11,14 +11,13 @@ module Inspec
   module DescribeDslLazyLoader
     # Support for Describe DSL plugins
     def method_missing(method_name, *arguments, &block)
-      # TODO: need a backend available at the describe level... class method somewhere?
-      # # see if it is a resource first
-      # begin
-      #   resource = Inspec::DSL.method_missing_resource(:where_is_backend?, method_name, *arguments)
-      #   return resource if resource
-      # rescue LoadError
-      #   # pass through
-      # end
+      begin
+        backend = metadata[:backend] # populated via Inspec::Runner#add_resource
+        resource = Inspec::DSL.method_missing_resource(backend, method_name, *arguments)
+        return resource if resource
+      rescue LoadError
+        # pass through
+      end
 
       # Check to see if there is a describe_dsl plugin activator hook with the method name
       registry = Inspec::Plugin::V2::Registry.instance

data/lib/inspec/runner.rb

@@ -228,7 +228,7 @@ module Inspec
     end
 
     def eval_with_virtual_profile(command)
-      require "fetchers/mock"
+      require "inspec/fetcher/mock"
       add_target({ "inspec.yml" => "name: inspec-shell" })
       our_profile = @target_profiles.first
       ctx = our_profile.runner_context
@@ -307,6 +307,8 @@ module Inspec
     def add_resource(method_name, arg, opts, block)
       case method_name
       when "describe"
+        opts = { backend: @test_collector.backend }.merge opts
+
         @test_collector.example_group(*arg, opts, &block)
       when "expect"
         block.example_group

data/lib/inspec/runner_rspec.rb

@@ -10,6 +10,8 @@ require "inspec/rspec_extensions"
 
 module Inspec
   class RunnerRspec
+    attr_accessor :formatter
+
     def initialize(conf)
       @conf = conf
       @formatter = nil
@@ -22,19 +24,26 @@ module Inspec
     # @param [Type] &block the block associated with this example group
     # @return [RSpecExampleGroup]
     def example_group(*args, &block)
+      # NOTE: this RUNS immediately
       RSpec::Core::ExampleGroup.describe(*args, &block)
     end
 
+    def formatters
+      RSpec.configuration.formatters.grep(Inspec::Formatters::Base)
+    end
+
     # Add a full profile to the runner. Only pulls in metadata
     #
     # @param [Inspec::Profile] profile
     # @return [nil]
     def add_profile(profile)
-      RSpec.configuration.formatters
-        .find_all { |c| c.is_a?(Inspec::Formatters::Base) }
-        .each do |fmt|
-          fmt.add_profile(profile)
-        end
+      formatters.each do |fmt|
+        fmt.add_profile(profile)
+      end
+    end
+
+    def backend
+      formatters.first.backend
     end
 
     # Configure the backend of the runner.
@@ -42,11 +51,9 @@ module Inspec
     # @param [Inspec::Backend] backend
     # @return [nil]
     def backend=(backend)
-      RSpec.configuration.formatters
-        .find_all { |c| c.is_a?(Inspec::Formatters::Base) }
-        .each do |fmt|
-          fmt.backend = backend
-        end
+      formatters.each do |fmt|
+        fmt.backend = backend
+      end
     end
 
     # Add an example group to the list of registered tests.

data/lib/inspec/utils/parser.rb

@@ -227,6 +227,8 @@ module XinetdParser
   def parse_xinetd(raw) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
     return {} if raw.nil?
 
+    require "inspec/utils/simpleconfig"
+
     res = {}
     cur_group = nil
     simple_conf = []
@@ -273,5 +275,3 @@ module XinetdParser
     res
   end
 end
-
-require "inspec/utils/simpleconfig"

data/lib/inspec/version.rb

@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = "4.18.39".freeze
+  VERSION = "4.18.51".freeze
 end

data/lib/matchers/matchers.rb

@@ -254,7 +254,7 @@ RSpec::Matchers.define :cmp do |first_expected| # rubocop:disable Metrics/BlockL
       return actual.send(op, expected.to_i)
     elsif expected.is_a?(String) && boolean?(expected) && [true, false].include?(actual)
       return actual.send(op, to_boolean(expected))
-    elsif expected.is_a?(Integer) && integer?(actual)
+    elsif expected.is_a?(Integer) && actual.is_a?(String) && integer?(actual)
       return actual.to_i.send(op, expected)
     elsif expected.is_a?(Float) && float?(actual)
       return actual.to_f.send(op, expected)

data/lib/plugins/inspec-compliance/lib/inspec-compliance/target.rb

@@ -8,7 +8,7 @@ require "inspec/dist"
 # similar to `inspec exec http://localhost:2134/owners/%base%/compliance/%ssh%/tar --user %token%`
 module InspecPlugins
   module Compliance
-    class Fetcher < Fetchers::Url
+    class Fetcher < Inspec::Fetcher::Url
       include Inspec::Dist
 
       name "compliance"

data/lib/plugins/inspec-habitat/templates/habitat/plan.sh.erb

@@ -1,8 +1,6 @@
 pkg_name=<%= "inspec-profile-#{profile.name}" %>
 pkg_version=<%= profile.version %>
 pkg_origin=<%= habitat_origin %>
-pkg_deps=(chef/inspec)
-pkg_build_deps=(chef/inspec core/jq-static)
 pkg_svc_user=root
 <%= "pkg_license='#{profile.metadata.params[:license]}'" if profile.metadata.params[:license]%>
 pkg_scaffolding="chef/scaffolding-chef-inspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 4.18.39
+  version: 4.18.51
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: chef-telemetry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: license-acceptance
   requirement: !ruby/object:Gem::Requirement
@@ -153,9 +167,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '3.9'
   type: :runtime
@@ -163,9 +174,6 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
       - !ruby/object:Gem::Version
         version: '3.9'
 - !ruby/object:Gem::Dependency
@@ -300,14 +308,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: tomlrb
   requirement: !ruby/object:Gem::Requirement
@@ -433,10 +441,6 @@ files:
 - lib/bundles/inspec-supermarket/api.rb
 - lib/bundles/inspec-supermarket/cli.rb
 - lib/bundles/inspec-supermarket/target.rb
-- lib/fetchers/git.rb
-- lib/fetchers/local.rb
-- lib/fetchers/mock.rb
-- lib/fetchers/url.rb
 - lib/inspec.rb
 - lib/inspec/archive/tar.rb
 - lib/inspec/archive/zip.rb
@@ -463,6 +467,10 @@ files:
 - lib/inspec/exceptions.rb
 - lib/inspec/expect.rb
 - lib/inspec/fetcher.rb
+- lib/inspec/fetcher/git.rb
+- lib/inspec/fetcher/local.rb
+- lib/inspec/fetcher/mock.rb
+- lib/inspec/fetcher/url.rb
 - lib/inspec/file_provider.rb
 - lib/inspec/formatters.rb
 - lib/inspec/formatters/base.rb