inspec-core 4.37.25 → 4.37.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e113de1997a85e75b6186d7704201915862612280bced44513199bbb64b0e40
-  data.tar.gz: c0962fb880cb50ffed8519aa952c728492dc35d0f232b148e20a30bcb0f5eca2
+  metadata.gz: 9c945fbd0ce14959ea0286c4bfc5928d547bd7c48dd80828a955585493383476
+  data.tar.gz: c9f3f58a8b68ec6039ef432421150690870ffce295691ad2e9f1b72e31b4802b
 SHA512:
-  metadata.gz: 16439816a2895607b2f2181ba4145911d786dac1940e00e31b9d271ef0af6315f54cee354d6fc8f2faccd069a2183c2da3f35aa4f242513d9e68c5c6b5ad2fd6
-  data.tar.gz: f19ec8498e808e36140353208bea624b02ebe0461bbce4cc133e190b763afd53478557a2e4bd6177d73c5cd6c90e56ac9cd5c82245493fb71015834da6414da3
+  metadata.gz: b75d54fae752d292467fe333a8081c739ae24c2570256b26a6c104893e29a234182018e00d555a31e02cd19f189c7561489b1c2c13b03c4eacca04562b3a3343
+  data.tar.gz: bc67f78180eb7516f28dfae3fc0bcf8a0bb523b05ff3e5aa32df156279797d9d6f3801c00ff347159fc7cdf399d1c6a00cd29a4a506611c53c044eaac5a938dc

data/Gemfile

@@ -20,11 +20,22 @@ end
 # but our runtime dep is still 3.9+
 gem "rspec", ">= 3.10"
 
+def probably_x86?
+  # We don't currently build on ARM windows, so assume x86 there
+  return true if RUBY_PLATFORM =~ /windows|mswin|msys|mingw|cygwin/
+
+  # Otherwise rely on uname -m
+  `uname -m`.match?(/^(x86_64|i\d86)/)
+end
+
 group :omnibus do
   gem "rb-readline"
   gem "appbundler"
   gem "ed25519" # ed25519 ssh key support done here as its a native gem we can't put in the gemspec
   gem "bcrypt_pbkdf" # ed25519 ssh key support done here as its a native gem we can't put in the gemspec
+  if probably_x86?
+    gem "x25519" # ed25519 KEX module, not supported on ARM
+  end
 end
 
 group :test do
@@ -55,6 +66,7 @@ end
 if Gem.ruby_version >= Gem::Version.new("2.7.0")
   group :kitchen do
     gem "berkshelf"
+    gem "chef", ">= 16.0" # Required to allow net-ssh > 6
     gem "test-kitchen", ">= 2.8"
     gem "kitchen-inspec", ">= 2.0"
     gem "kitchen-dokken", ">= 2.11"

data/lib/inspec/resources/mysql_session.rb

@@ -44,10 +44,14 @@ module Inspec::Resources
       @port = port
       @socket = socket
       init_fallback if user.nil? || pass.nil?
-      skip_resource("Can't run MySQL SQL checks without authentication") if @user.nil? || @pass.nil?
+      raise Inspec::Exceptions::ResourceFailed, "Can't run MySQL SQL checks without authentication." if @user.nil? || @pass.nil?
+
+      test_connection
     end
 
     def query(q, db = "")
+      raise Inspec::Exceptions::ResourceFailed, "#{resource_exception_message}" if resource_failed?
+
       mysql_cmd = create_mysql_cmd(q, db)
       cmd = if !@pass.nil?
               inspec.command(mysql_cmd, redact_regex: /(mysql -u\w+ -p).+(\s-(h|S).*)/)
@@ -56,7 +60,7 @@ module Inspec::Resources
             end
       out = cmd.stdout + "\n" + cmd.stderr
       if cmd.exit_status != 0 || out =~ /Can't connect to .* MySQL server/ || out.downcase =~ /^error:.*/
-        Lines.new(out, "MySQL query with errors: #{q}", cmd.exit_status)
+        raise Inspec::Exceptions::ResourceFailed, "MySQL query with errors: #{out}"
       else
         Lines.new(cmd.stdout.strip, "MySQL query: #{q}", cmd.exit_status)
       end
@@ -68,6 +72,12 @@ module Inspec::Resources
 
     private
 
+    # Querying on the database to make sure conneciton can be established. If not this will set the resource exception
+    # message which we raise before querying on the database using mysql_session object.
+    def test_connection
+      query("select now()")
+    end
+
     def escape_string(query)
       Shellwords.escape(query)
     end

data/lib/inspec/resources/postgres_session.rb

@@ -45,14 +45,19 @@ module Inspec::Resources
       @pass = pass
       @host = host || "localhost"
       @port = port || 5432
+      raise Inspec::Exceptions::ResourceFailed, "Can't run PostgreSQL SQL checks without authentication." if @user.nil? || @pass.nil?
+
+      test_connection
     end
 
     def query(query, db = [])
+      raise Inspec::Exceptions::ResourceFailed, "#{resource_exception_message}" if resource_failed?
+
       psql_cmd = create_psql_cmd(query, db)
       cmd = inspec.command(psql_cmd, redact_regex: /(PGPASSWORD=').+(' psql .*)/)
       out = cmd.stdout + "\n" + cmd.stderr
       if cmd.exit_status != 0 || out =~ /could not connect to .*/ || out.downcase =~ /^error:.*/
-        Lines.new(out, "PostgreSQL query with errors: #{query}")
+        raise Inspec::Exceptions::ResourceFailed, "PostgreSQL query with errors: #{out}"
       else
         Lines.new(cmd.stdout.strip, "PostgreSQL query: #{query}")
       end
@@ -60,6 +65,10 @@ module Inspec::Resources
 
     private
 
+    def test_connection
+      query("select now()")
+    end
+
     def escaped_query(query)
       Shellwords.escape(query)
     end

data/lib/inspec/version.rb

@@ -1,3 +1,3 @@
 module Inspec
-  VERSION = "4.37.25".freeze
+  VERSION = "4.37.30".freeze
 end

metadata

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