inspec-core 4.37.0 → 4.37.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65d5a9d62e8e76b31b944e42f4ae6fc1784e3823fa578ce8ee439a2270a80816
-  data.tar.gz: 1aa950d1012bd41e061cc58e5693003d9197749c3798d3fb7d50b434c33c13de
+  metadata.gz: d915bf11e35804382285502f46a3a37b35017a10ab34c4e2f78d7420b0e3f589
+  data.tar.gz: b85a4f9cda0e1da7461b6d23248e935ceb6fbb2d9028f5bd9eec0683426c1ec3
 SHA512:
-  metadata.gz: 69e11bec35bfef9ccd66679c4c04a65afe7b8e2acb4f20ab1f2643ee594961148b269a21e4e84996053a5d18ae96120063f1cbfe634831488b8b830cb22b9942
-  data.tar.gz: 0476cf2df46ae81d3dd0a797d39190425ef28eeb7d8c36c3157d68d7ae658b1922f02251948fce8e5f2a48305f5c9e6ff520bc39a532e655b7f32284c7c67b46
+  metadata.gz: e1925d3c20bcd18a711dfa9d2df7ff98bd522b4afd3fbc8f4c5bc16648e60101fd6984a5a3d4bebf568b2993ec29ecae1ca58380e8d1a5bb55498f335dd144ff
+  data.tar.gz: da6f422af63ddfa51d96b945cc8d34d0bc67d26557114367406108ff43bada35a2c9dd83e4c0c29081cb3a29fe6c545fcd7cf1e8a8d8a4618da1058b6e562883

data/Gemfile

@@ -28,7 +28,7 @@ group :omnibus do
 end
 
 group :test do
-  gem "chefstyle", "~> 1.7.1"
+  gem "chefstyle", "~> 2.0.3"
   gem "concurrent-ruby", "~> 1.0"
   gem "html-proofer", platforms: :ruby # do not attempt to run proofer on windows
   gem "json_schemer", ">= 0.2.1", "< 0.2.19"

data/lib/inspec/fetcher/local.rb

@@ -31,7 +31,7 @@ module Inspec::Fetcher
         target = target.gsub(%r{^file://}, "")
       else
         # support for windows paths
-        target = target.tr('\\', "/")
+        target = target.tr("\\", "/")
       end
 
       target if File.exist?(File.expand_path(target))

data/lib/inspec/resources/http.rb

@@ -56,7 +56,7 @@ module Inspec::Resources
     end
 
     def body
-      @worker.body
+      @worker.body&.force_encoding(Encoding::UTF_8)
     end
 
     def http_method

data/lib/inspec/resources/mssql_session.rb

@@ -58,7 +58,7 @@ module Inspec::Resources
     end
 
     def query(q) # rubocop:disable Metrics/PerceivedComplexity
-      escaped_query = q.gsub(/\\/, '\\\\').gsub(/"/, '""').gsub(/\$/, '\\$')
+      escaped_query = q.gsub(/\\/, "\\\\").gsub(/"/, '""').gsub(/\$/, '\\$')
       # surpress 'x rows affected' in SQLCMD with 'set nocount on;'
       cmd_string = "sqlcmd -Q \"set nocount on; #{escaped_query}\" -W -w 1024 -s ','"
       cmd_string += " -U '#{@user}' -P '#{@password}'" unless @user.nil? || @password.nil?

data/lib/inspec/resources/mysql_session.rb

@@ -75,7 +75,7 @@ module Inspec::Resources
     def create_mysql_cmd(q, db = "")
       # TODO: simple escape, must be handled by a library
       # that does this securely
-      escaped_query = q.gsub(/\\/, '\\\\').gsub(/"/, '\\"').gsub(/\$/, '\\$')
+      escaped_query = q.gsub(/\\/, "\\\\").gsub(/"/, '\\"').gsub(/\$/, '\\$')
 
       # construct the query
       command = "mysql"

data/lib/inspec/resources/pip.rb

@@ -117,7 +117,7 @@ module Inspec::Resources
         if defined?(windows_paths["Python"]) && pipcmd.nil?
           return nil if windows_paths["Pip"].nil?
 
-          pipdir = windows_paths["Python"].split('\\')
+          pipdir = windows_paths["Python"].split("\\")
           # remove python.exe
           pipdir.pop
           pipcmd = pipdir.push("Scripts").push("pip.exe").join("/")

data/lib/inspec/resources/registry_key.rb

@@ -281,7 +281,7 @@ module Inspec::Resources
       key = @options[:key]
       return "" unless key
 
-      key.start_with?('\\') ? key : "\\#{key}"
+      key.start_with?("\\") ? key : "\\#{key}"
     end
   end
 

data/lib/inspec/resources/users.rb

@@ -611,7 +611,7 @@ module Inspec::Resources
   # @see https://msdn.microsoft.com/en-us/library/aa394153(v=vs.85).aspx
   class WindowsUser < UserInfo
     def parse_windows_account(username)
-      account = username.split('\\')
+      account = username.split("\\")
       name = account.pop
       domain = account.pop unless account.empty?
       [name, domain]

data/lib/inspec/resources/windows_feature.rb

@@ -79,10 +79,11 @@ module Inspec::Resources
         result = cmd.stdout
         feature_name_regex = /Feature Name : (.*)(\r\n|\n)/
         description_regex = /Description : (.*)(\r\n|\n)/
+        state_regex = /State : (.*)(\r\n|\n)/
         feature_info = {
           name: result.match(feature_name_regex).captures[0].chomp,
           description: result.match(description_regex).captures[0].chomp,
-          installed: true,
+          installed: result.match(state_regex).captures[0].chomp == 'Enabled',
         }
       end
 

data/lib/inspec/runner.rb

@@ -243,7 +243,7 @@ module Inspec
       # to provide access to local profiles that add resources.
       @depends.each do |dep|
         # support for windows paths
-        dep = dep.tr('\\', "/")
+        dep = dep.tr("\\", "/")
         Inspec::Profile.for_path(dep, { profile_context: ctx }).load_libraries
       end
 

data/lib/inspec/utils/erlang_parser.rb

@@ -52,13 +52,13 @@ class ErlangParser < Parslet::Parser
 
   rule(:stringS) do
     str("'") >> (
-      str('\\') >> any | str("'").absent? >> any
+      str("\\") >> any | str("'").absent? >> any
     ).repeat.as(:string) >> str("'") >> filler?
   end
 
   rule(:stringD) do
     str('"') >> (
-      str('\\') >> any | str('"').absent? >> any
+      str("\\") >> any | str('"').absent? >> any
     ).repeat.as(:string) >> str('"') >> filler?
   end
 

data/lib/inspec/utils/filter.rb

@@ -375,13 +375,13 @@ module FilterTable
       methods_to_install_on_resource_class = @filter_methods + @custom_properties.keys
       methods_to_install_on_resource_class.each do |method_name|
         resource_class.send(:define_method, method_name) do |*args, &block|
-          begin
-            # self here is the resource instance
-            filter_table_instance = table_class.new(self, send(raw_data_fetcher_method_name), " with")
-            filter_table_instance.send(method_name, *args, &block)
-          rescue Inspec::Exceptions::ResourceFailed, Inspec::Exceptions::ResourceSkipped => e
-            FilterTable::ExceptionCatcher.new(resource_class, e)
-          end
+
+          # self here is the resource instance
+          filter_table_instance = table_class.new(self, send(raw_data_fetcher_method_name), " with")
+          filter_table_instance.send(method_name, *args, &block)
+        rescue Inspec::Exceptions::ResourceFailed, Inspec::Exceptions::ResourceSkipped => e
+          FilterTable::ExceptionCatcher.new(resource_class, e)
+
         end
       end
     end

data/lib/inspec/utils/nginx_parser.rb

@@ -31,19 +31,19 @@ class NginxParser < Parslet::Parser
 
   rule(:standard_value) do
     ((match(/[#;{'"]/).absent? >> any) >> (
-      str('\\') >> any | match('[#;{]|\s').absent? >> any
+      str("\\") >> any | match('[#;{]|\s').absent? >> any
     ).repeat).as(:value) >> space.repeat
   end
 
   rule(:single_quoted_value) do
     str("'") >> (
-      str('\\') >> any | str("'").absent? >> any
+      str("\\") >> any | str("'").absent? >> any
     ).repeat.as(:value) >> str("'") >> space.repeat
   end
 
   rule(:double_quoted_value) do
     str('"') >> (
-      str('\\') >> any | str('"').absent? >> any
+      str("\\") >> any | str('"').absent? >> any
     ).repeat.as(:value) >> str('"') >> space.repeat
   end
 

data/lib/inspec/version.rb

@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = "4.37.0".freeze
+  VERSION = "4.37.8".freeze
 end

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

@@ -170,6 +170,23 @@ module InspecPlugins
         [success, msg, access_token]
       end
 
+      # Use API access token to validate login using version API
+      def self.authenticate_login_using_version_api(url, api_token, insecure)
+        uri = URI.parse("#{url}/version")
+        req = Net::HTTP::Get.new(uri.path)
+        req["api-token"] = api_token
+        response = InspecPlugins::Compliance::HTTP.send_request(uri, req, insecure)
+
+        if response.code == "200"
+          msg = "Successfully Logged In"
+          success = true
+        else
+          success = false
+          msg = "Failed to authenticate to #{url} \n\Response code: #{response.code}\nBody: #{response.body}"
+        end
+        [success, msg]
+      end
+
       # Use username and password to get an API access token
       def self.get_token_via_password(url, username, password, insecure)
         uri = URI.parse("#{url}/login")

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

@@ -33,7 +33,8 @@ module InspecPlugins
 
             options["url"] = options["server"] + "/api/v0"
             token = options["dctoken"] || options["token"]
-            store_access_token(options, token)
+            success, msg = API::Login.authenticate_login(options)
+            success ? store_access_token(options, token) : msg
           end
 
           def self.store_access_token(options, token)
@@ -52,7 +53,7 @@ module InspecPlugins
             config["version"] = "0"
 
             config.store
-            config
+            API::Login.configuration_stored_message(config)
           end
 
           def self.verify_thor_options(o)
@@ -74,7 +75,8 @@ module InspecPlugins
 
             options["url"] = options["server"] + "/compliance"
             token = options["dctoken"] || options["token"]
-            store_access_token(options, token)
+            success, msg = API::Login.authenticate_login(options)
+            success ? store_access_token(options, token) : msg
           end
 
           def self.store_access_token(options, token)
@@ -99,7 +101,7 @@ module InspecPlugins
             config["version"] = InspecPlugins::Compliance::API.version(config)
 
             config.store
-            config
+            API::Login.configuration_stored_message(config)
           end
 
           # Automate login requires `--ent`, `--user`, and either `--token` or `--dctoken`
@@ -126,7 +128,8 @@ module InspecPlugins
             options["url"] = options["server"] + "/api"
 
             if options["user"] && options["token"]
-              compliance_store_access_token(options, options["token"])
+              success, msg = API::Login.authenticate_login(options)
+              success ? compliance_store_access_token(options, options["token"]) : msg
             elsif options["user"] && options["password"]
               compliance_login_user_pass(options)
             elsif options["refresh_token"]
@@ -171,7 +174,7 @@ module InspecPlugins
             config["version"] = InspecPlugins::Compliance::API.version(config)
 
             config.store
-            config
+            API::Login.configuration_stored_message(config)
           end
 
           # Compliance login requires `--user` or `--refresh_token`
@@ -192,6 +195,18 @@ module InspecPlugins
             raise ArgumentError, error_msg.join("\n") unless error_msg.empty?
           end
         end
+
+        def self.authenticate_login(options)
+          InspecPlugins::Compliance::API.authenticate_login_using_version_api(
+            options["url"],
+            options["token"],
+            options["insecure"]
+          )
+        end
+
+        def self.configuration_stored_message(config)
+          "Stored configuration for Chef #{config["server_type"].capitalize}: #{config["server"]}' with user: '#{config["user"]}'"
+        end
       end
     end
   end

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

@@ -34,9 +34,8 @@ module InspecPlugins
         desc: "Enterprise for #{AUTOMATE_PRODUCT_NAME} reporting (#{AUTOMATE_PRODUCT_NAME} Only)"
       def login(server)
         options["server"] = server
-        InspecPlugins::Compliance::API.login(options)
-        config = InspecPlugins::Compliance::Configuration.new
-        puts "Stored configuration for Chef #{config["server_type"].capitalize}: #{config["server"]}' with user: '#{config["user"]}'"
+        login_response = InspecPlugins::Compliance::API.login(options)
+        puts login_response
       end
 
       desc "profiles", "list all available profiles in #{AUTOMATE_PRODUCT_NAME}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec-core
 version: !ruby/object:Gem::Version
-  version: 4.37.0
+  version: 4.37.8
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-telemetry