inspec-core 4.24.8 → 4.24.26

data/lib/inspec/resources/auditd.rb

@@ -1,4 +1,4 @@
-require "forwardable"
+require "forwardable" unless defined?(Forwardable)
 require "inspec/utils/filter_array"
 require "inspec/utils/filter"
 require "inspec/utils/parser"

data/lib/inspec/resources/csv.rb

@@ -20,7 +20,7 @@ module Inspec::Resources
     #      { 'name' => 'row2', 'col1' => 'value3', 'col2' => 'value4' }
     #    ]
     def parse(content)
-      require "csv"
+      require "csv" unless defined?(CSV)
 
       # convert empty field to nil
       CSV::Converters[:blank_to_nil] = lambda do |field|

data/lib/inspec/resources/dh_params.rb

@@ -1,4 +1,4 @@
-require "openssl"
+require "openssl" unless defined?(OpenSSL)
 require "inspec/utils/file_reader"
 
 module Inspec::Resources

data/lib/inspec/resources/file.rb

@@ -1,6 +1,6 @@
 # copyright: 2015, Vulcano Security GmbH
 
-require "shellwords"
+require "shellwords" unless defined?(Shellwords)
 require "inspec/utils/parser"
 
 module Inspec::Resources

data/lib/inspec/resources/http.rb

@@ -3,7 +3,7 @@
 # license: Apache v2
 
 require "inspec/resources/command"
-require "faraday"
+require "faraday" unless defined?(Faraday)
 require "faraday_middleware"
 require "hashie"
 

data/lib/inspec/resources/iis_website.rb

@@ -1,2 +1,2 @@
 # This is just here to make the dynamic loader happy.
-require "inspec/resources/iis_website.rb"
+require "inspec/resources/iis_website"

data/lib/inspec/resources/interfaces.rb

@@ -24,7 +24,7 @@ module Inspec::Resources
       .install_filter_methods_on_resource(self, :scan_interfaces)
 
     def ipv4_address
-      require "ipaddr"
+      require "ipaddr" unless defined?(IPAddr)
 
       # Loop over interface names
       # Select those that are up and have an ipv4 address

data/lib/inspec/resources/json.rb

@@ -48,7 +48,7 @@ module Inspec::Resources
     # @return [Object] the value stored at this position
     def method_missing(*keys)
       # catch bahavior of rspec its implementation
-      # @see https://github.com/rspec/rspec-its/blob/master/lib/rspec/its.rb#L110
+      # @see https://github.com/rspec/rspec-its/blob/v1.2.0/lib/rspec/its.rb#L110
       keys.shift if keys.is_a?(Array) && keys[0] == :[]
       value(keys)
     end
@@ -66,7 +66,7 @@ module Inspec::Resources
     private
 
     def parse(content)
-      require "json"
+      require "json" unless defined?(JSON)
       JSON.parse(content)
     rescue => e
       raise Inspec::Exceptions::ResourceFailed, "Unable to parse JSON: #{e.message}"

data/lib/inspec/resources/key_rsa.rb

@@ -1,4 +1,4 @@
-require "openssl"
+require "openssl" unless defined?(OpenSSL)
 require "hashie/mash"
 require "inspec/utils/file_reader"
 require "inspec/utils/pkey_reader"

data/lib/inspec/resources/mssql_session.rb

@@ -12,6 +12,10 @@ module Inspec::Resources
   class MssqlSession < Inspec.resource(1)
     name "mssql_session"
     supports platform: "windows"
+    supports platform: "darwin"
+    supports platform: "debian"
+    supports platform: "redhat"
+    supports platform: "suse"
     desc "Use the mssql_session InSpec audit resource to test SQL commands run against a MS Sql Server database."
     example <<~EXAMPLE
       # Using SQL authentication
@@ -95,7 +99,7 @@ module Inspec::Resources
     end
 
     def parse_csv_result(cmd)
-      require "csv"
+      require "csv" unless defined?(CSV)
       table = CSV.parse(cmd.stdout, headers: true)
 
       # remove first row, since it will be a seperator line

data/lib/inspec/resources/mysql_session.rb

@@ -1,7 +1,7 @@
 # copyright: 2015, Vulcano Security GmbH
 
 require "inspec/resources/command"
-require "shellwords"
+require "shellwords" unless defined?(Shellwords)
 
 module Inspec::Resources
   class Lines

data/lib/inspec/resources/nginx.rb

@@ -1,4 +1,4 @@
-require "pathname"
+require "pathname" unless defined?(Pathname)
 require "hashie/mash"
 require "inspec/resources/command"
 

data/lib/inspec/resources/nginx_conf.rb

@@ -1,7 +1,7 @@
 require "inspec/utils/nginx_parser"
 require "inspec/utils/find_files"
 require "inspec/utils/file_reader"
-require "forwardable"
+require "forwardable" unless defined?(Forwardable)
 
 # STABILITY: Experimental
 # This resouce needs a proper interace to the underlying data, which is currently missing.

data/lib/inspec/resources/npm.rb

@@ -1,5 +1,5 @@
 require "inspec/resources/command"
-require "shellwords"
+require "shellwords" unless defined?(Shellwords)
 
 module Inspec::Resources
   class NpmPackage < Inspec.resource(1)

data/lib/inspec/resources/oracledb_session.rb

@@ -1,7 +1,7 @@
 require "inspec/resources/command"
 require "inspec/utils/database_helpers"
 require "hashie/mash"
-require "csv"
+require "csv" unless defined?(CSV)
 
 module Inspec::Resources
   # STABILITY: Experimental

data/lib/inspec/resources/parse_config.rb

@@ -55,8 +55,11 @@ module Inspec::Resources
       read_params unless @content.nil?
     end
 
-    def method_missing(name)
-      read_params[name.to_s]
+    def method_missing(*name)
+      # catch bahavior of rspec its implementation
+      # @see https://github.com/rspec/rspec-its/blob/v1.2.0/lib/rspec/its.rb#L110
+      name.shift if name.is_a?(Array) && name[0] == :[]
+      read_params[name[0].to_s]
     end
 
     def params(*opts)

data/lib/inspec/resources/port.rb

@@ -1,6 +1,6 @@
 require "inspec/utils/parser"
 require "inspec/utils/filter"
-require "ipaddr"
+require "ipaddr" unless defined?(IPAddr)
 
 # TODO: currently we return local ip only
 # TODO: improve handling of same port on multiple interfaces

data/lib/inspec/resources/postgres_session.rb

@@ -1,6 +1,6 @@
 # copyright: 2015, Vulcano Security GmbH
 
-require "shellwords"
+require "shellwords" unless defined?(Shellwords)
 
 module Inspec::Resources
   class Lines

data/lib/inspec/resources/ppa.rb

@@ -1,2 +1,2 @@
 # This is just here to make the dynamic loader happy.
-require "inspec/resources/apt.rb"
+require "inspec/resources/apt"

data/lib/inspec/resources/processes.rb

@@ -1,7 +1,7 @@
 # copyright: 2015, Vulcano Security GmbH
 
 require "inspec/utils/filter"
-require "ostruct"
+require "ostruct" unless defined?(OpenStruct)
 require "inspec/resources/command"
 
 module Inspec::Resources

data/lib/inspec/resources/rabbitmq_conf.rb

@@ -1,2 +1,2 @@
 # This is just here to make the dynamic loader happy.
-require "inspec/resources/rabbitmq_config.rb"
+require "inspec/resources/rabbitmq_config"

data/lib/inspec/resources/registry_key.rb

@@ -1,6 +1,6 @@
 # copyright: 2015, Vulcano Security GmbH
 
-require "json"
+require "json" unless defined?(JSON)
 require "inspec/resources/powershell"
 
 # Three constructor methods are available:

data/lib/inspec/resources/sshd_config.rb

@@ -1,2 +1,2 @@
 # This is just here to make the dynamic loader happy.
-require "inspec/resources/ssh_config.rb"
+require "inspec/resources/ssh_config"

data/lib/inspec/resources/ssl.rb

@@ -1,8 +1,8 @@
 # copyright: 2015, Chef Software Inc.
 
-require "sslshake"
+require "sslshake" unless defined?(SSLShake)
 require "inspec/utils/filter"
-require "uri"
+require "uri" unless defined?(URI)
 require "parallel"
 
 # Custom resource based on the InSpec resource DSL

data/lib/inspec/resources/toml.rb

@@ -1,4 +1,4 @@
-require "tomlrb"
+require "tomlrb" unless defined?(Tomlrb)
 require "inspec/resources/json"
 
 module Inspec::Resources

data/lib/inspec/resources/vbscript.rb

@@ -1,5 +1,5 @@
 require "inspec/resources/powershell"
-require "securerandom"
+require "securerandom" unless defined?(SecureRandom)
 
 module Inspec::Resources
   # This resource allows users to run vbscript on windows machines. We decided

data/lib/inspec/resources/windows_registry_key.rb

@@ -1,2 +1,2 @@
 # This is just here to make the dynamic loader happy.
-require "inspec/resources/registry_key.rb"
+require "inspec/resources/registry_key"

data/lib/inspec/resources/wmi.rb

@@ -39,7 +39,7 @@ module Inspec::Resources
     # returns nil, if not existant or value
     def method_missing(*keys)
       # catch behavior of rspec its implementation
-      # @see https://github.com/rspec/rspec-its/blob/master/lib/rspec/its.rb#L110
+      # @see https://github.com/rspec/rspec-its/blob/v1.2.0/lib/rspec/its.rb#L110
       keys.shift if keys.is_a?(Array) && keys[0] == :[]
 
       # map all symbols to strings

data/lib/inspec/resources/x509_certificate.rb

@@ -1,4 +1,4 @@
-require "openssl"
+require "openssl" unless defined?(OpenSSL)
 require "hashie/mash"
 require "inspec/utils/file_reader"
 

data/lib/inspec/resources/xml.rb

@@ -13,7 +13,7 @@ module Inspec::Resources
     EXAMPLE
 
     def parse(content)
-      require "rexml/document"
+      require "rexml/document" unless defined?(REXML::Document)
       REXML::Document.new(content)
     rescue => e
       raise Inspec::Exceptions::ResourceFailed, "Unable to parse XML: #{e.message}"

data/lib/inspec/runner.rb

@@ -1,7 +1,7 @@
 # copyright: 2015, Dominik Richter
 
-require "forwardable"
-require "uri"
+require "forwardable" unless defined?(Forwardable)
+require "uri" unless defined?(URI)
 require "inspec/backend"
 require "inspec/profile_context"
 require "inspec/profile"

data/lib/inspec/schema.rb

@@ -1,4 +1,4 @@
-require "json"
+require "json" unless defined?(JSON)
 
 module Inspec
   class Schema

data/lib/inspec/schema/output_schema.rb

@@ -1,4 +1,4 @@
-require "json"
+require "json" unless defined?(JSON)
 require "inspec/schema/primitives"
 require "inspec/schema/exec_json"
 require "inspec/schema/exec_json_min"

data/lib/inspec/schema/primitives.rb

@@ -1,4 +1,4 @@
-require "set"
+require "set" unless defined?(Set)
 
 # These elements are shared between more than one output type
 

data/lib/inspec/shell_detector.rb

@@ -1,5 +1,5 @@
-require "etc"
-require "rbconfig"
+require "etc" unless defined?(Etc)
+require "rbconfig" unless defined?(RbConfig)
 
 module Inspec
   #

data/lib/inspec/utils/command_wrapper.rb

@@ -1,4 +1,4 @@
-require "shellwords"
+require "shellwords" unless defined?(Shellwords)
 
 class CommandWrapper
   UNIX_SHELLS = %w{sh bash zsh ksh}.freeze

data/lib/inspec/utils/deprecation/config_file.rb

@@ -1,5 +1,5 @@
-require "stringio"
-require "json"
+require "stringio" unless defined?(StringIO)
+require "json" unless defined?(JSON)
 require "inspec/globals"
 require "inspec/config"
 

data/lib/inspec/utils/json_log.rb

@@ -1,4 +1,4 @@
-require "json"
+require "json" unless defined?(JSON)
 
 # a simple streaming json logger
 class Logger::JSONFormatter < Logger::Formatter

data/lib/inspec/utils/telemetry/collector.rb

@@ -1,6 +1,6 @@
 require "inspec/config"
 require "inspec/utils/telemetry/data_series"
-require "singleton"
+require "singleton" unless defined?(Singleton)
 
 module Inspec::Telemetry
   # A Singleton collection of data series objects.

data/lib/inspec/utils/telemetry/data_series.rb

@@ -1,4 +1,4 @@
-require "json"
+require "json" unless defined?(JSON)
 
 module Inspec; end
 

data/lib/inspec/version.rb

@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = "4.24.8".freeze
+  VERSION = "4.24.26".freeze
 end

data/lib/plugins/inspec-artifact/lib/inspec-artifact/base.rb

@@ -1,8 +1,8 @@
-require "base64"
-require "openssl"
-require "pathname"
-require "set"
-require "tempfile"
+require "base64" unless defined?(Base64)
+require "openssl" unless defined?(OpenSSL)
+require "pathname" unless defined?(Pathname)
+require "set" unless defined?(Set)
+require "tempfile" unless defined?(Tempfile)
 require "yaml"
 require "inspec/dist"
 require "inspec/utils/json_profile_summary"

data/lib/plugins/inspec-compliance/README.md

@@ -71,7 +71,7 @@ $ inspec compliance login https://automate.compliance.test --insecure --user 'ad
 
 You will need an access token for authentication. You can retrieve one via:
 
-![Chef Compliance Token](images/cc-token.png)
+![Chef Compliance Token](lib/inspec-compliance/images/cc-token.png)
 
 You can choose the access token (`--token`) or the refresh token (`--refresh_token`)
 

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

@@ -1,6 +1,6 @@
-require "net/http"
-require "uri"
-require "json"
+require "net/http" unless defined?(Net::HTTP)
+require "uri" unless defined?(URI)
+require "json" unless defined?(JSON)
 require "inspec/dist"
 
 require_relative "api/login"

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

@@ -1,6 +1,6 @@
-require "net/http"
+require "net/http" unless defined?(Net::HTTP)
 require "net/http/post/multipart"
-require "uri"
+require "uri" unless defined?(URI)
 
 module InspecPlugins
   module Compliance

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

@@ -1,4 +1,4 @@
-require "uri"
+require "uri" unless defined?(URI)
 require "inspec/fetcher"
 require "inspec/errors"
 require "inspec/dist"
@@ -85,7 +85,7 @@ module InspecPlugins
             # If version was specified, it will be the first and only result.
             # Note we are calling the sha256 as a string, not a symbol since
             # it was returned as json from the Compliance API.
-            profile_info = profile_result.sort_by { |x| Gem::Version.new(x["version"]) }[0]
+            profile_info = profile_result.min_by { |x| Gem::Version.new(x["version"]) }
             profile_checksum = profile_info.key?("sha256") ? profile_info["sha256"] : ""
           end
         end

data/lib/plugins/inspec-habitat/lib/inspec-habitat/profile.rb

@@ -1,7 +1,7 @@
 require "inspec/profile_vendor"
-require "mixlib/shellout"
-require "tomlrb"
-require "ostruct"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
+require "tomlrb" unless defined?(Tomlrb)
+require "ostruct" unless defined?(OpenStruct)
 require "inspec/dist"
 
 module InspecPlugins

data/lib/plugins/inspec-init/lib/inspec-init/cli.rb

@@ -1,4 +1,4 @@
-require "pathname"
+require "pathname" unless defined?(Pathname)
 require_relative "renderer"
 
 module InspecPlugins

data/lib/plugins/inspec-init/lib/inspec-init/cli_profile.rb

@@ -1,4 +1,4 @@
-require "pathname"
+require "pathname" unless defined?(Pathname)
 require_relative "renderer"
 
 module InspecPlugins

data/lib/plugins/inspec-init/lib/inspec-init/renderer.rb

@@ -1,5 +1,5 @@
-require "fileutils"
-require "erb"
+require "fileutils" unless defined?(FileUtils)
+require "erb" unless defined?(Erb)
 
 module InspecPlugins
   module Init