train-core 3.3.1 → 3.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0245d5647c9a636cff344b8976bc6983d0f375f4e66b2baa4d2b8dccfcc98f24
-  data.tar.gz: c8a74114fd330ffeff3063fd9d452b7142287a0502033e1f91ae9e867c9c0966
+  metadata.gz: c4bfda9949a3f24a3c7d48f8bb23384c73f064eccfa0f44029872e13913880c9
+  data.tar.gz: 6598c63e265c79e1344010ace35b40d1f5bd1919bb8039d4ae868c54f9f85dc5
 SHA512:
-  metadata.gz: 4d622422a8d022e6e8c6770d7baf5ae00afd8466029bed65ce86fc08af51308818170744edbae6cfa7242e19ced2e30f202bdf98f16aa02a43547df171c47e05
-  data.tar.gz: dda8b333a8a2b9716e992630d65a37599a0a8a7099d52ffd3183a1cb82a2f2aeccdbca1fd5287f285b59ff931fba7a9eaa5ca3a42b65a19fa18ba9019632d355
+  metadata.gz: aeb75022b5ff8c0f93ce22b35a6d8af8b31c8f3906fe357e502cd6f7ab8e7cb0bf55df61c8e891579b5338f875413b6c1372535e5af30d3011d54fd8b7822968
+  data.tar.gz: 3c23b61031fe8c0e8d691929ccb9007a8272d1de9736b8c5bef1ffcfd8a3078b31f556454f6676cc9d9a2515333015852f64f8e5ce47d2313e393eb4b230f9f7

data/lib/train.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
@@ -7,7 +6,7 @@ require_relative "train/options"
 require_relative "train/plugins"
 require_relative "train/errors"
 require_relative "train/platforms"
-require "addressable/uri"
+require "addressable/uri" unless defined?(Addressable::URI)
 
 module Train
   # Create a new transport instance, with the plugin indicated by the

data/lib/train/errors.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)

data/lib/train/extras.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 

data/lib/train/extras/command_wrapper.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann
 

data/lib/train/extras/stat.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 # author: Dominik Richter
 # author: Christoph Hartmann
 module Train::Extras

data/lib/train/file.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # author: Christoph Hartmann
 # author: Dominik Richter

data/lib/train/file/local.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Train
   class File
     class Local < Train::File

data/lib/train/file/local/unix.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require "shellwords"
+require "shellwords" unless defined?(Shellwords)
 require_relative "../../extras/stat"
 
 module Train

data/lib/train/file/local/windows.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Train
   class File
     class Local

data/lib/train/file/remote.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Train
   class File
     class Remote < Train::File

data/lib/train/file/remote/aix.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require_relative "unix"
 
 module Train

data/lib/train/file/remote/linux.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require_relative "unix"
 
 module Train

data/lib/train/file/remote/qnx.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # author: Christoph Hartmann
 # author: Dominik Richter

data/lib/train/file/remote/unix.rb

@@ -1,4 +1,4 @@
-require "shellwords"
+require "shellwords" unless defined?(Shellwords)
 
 module Train
   class File

data/lib/train/file/remote/windows.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Train
   class File
     class Remote

data/lib/train/options.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 # Author:: Christoph Hartmann (<chris@lollyrock.com>)

data/lib/train/platforms.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require_relative "platforms/common"
 require_relative "platforms/detect"
 require_relative "platforms/detect/scanner"

data/lib/train/platforms/common.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Train::Platforms
   module Common
     # Add a family connection. This will create a family

data/lib/train/platforms/detect.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Train::Platforms
   module Detect
     # Main detect method to scan all platforms for a match

data/lib/train/platforms/detect/helpers/os_common.rb

@@ -1,6 +1,6 @@
 require_relative "os_linux"
 require_relative "os_windows"
-require "rbconfig"
+require "rbconfig" unless defined?(RbConfig)
 
 module Train::Platforms::Detect::Helpers
   module OSCommon
@@ -34,16 +34,24 @@ module Train::Platforms::Detect::Helpers
     end
 
     def command_output(cmd)
-      res = @backend.run_command(cmd).stdout
-      # When you try to execute command using ssh connction as root user and you have provided ssh user identity file
-      # it gives standard output to login as authorised user other than root. To show this standard ouput as an error
+      res = @backend.run_command(cmd)
+      stdout = res.stdout
+      stderr = res.stderr
+      # When you try to execute command using ssh connection as root user and you have provided ssh user identity file
+      # it gives standard output to login as authorized user other than root. To show this standard output as an error
       # to user we are matching the string of stdout and raising the error here so that user gets exact information.
-      if @backend.class.to_s == "Train::Transports::SSH::Connection" && res =~ /Please login as the user/
-        raise Train::UserError, "SSH failed: #{res}"
+      if @backend.class.to_s == "Train::Transports::SSH::Connection"
+        if stdout =~ /Please login as the user/
+          raise Train::UserError, "SSH failed: #{stdout}"
+        end
+
+        if stderr =~ /WARNING: Your password has expired/
+          raise Train::UserError, "SSH failed: #{stderr}"
+        end
       end
 
-      res.strip! unless res.nil?
-      res
+      stdout.strip! unless stdout.nil?
+      stdout
     end
 
     def unix_uname_s
@@ -157,7 +165,7 @@ module Train::Platforms::Detect::Helpers
     def json_cmd(cmd)
       cmd = @backend.run_command(cmd)
       if cmd.exit_status == 0 && !cmd.stdout.empty?
-        require "json"
+        require "json" unless defined?(JSON)
         eos_ver = JSON.parse(cmd.stdout)
         @platform[:release] = eos_ver["version"]
         @platform[:arch] = eos_ver["architecture"]

data/lib/train/platforms/detect/helpers/os_linux.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Train::Platforms::Detect::Helpers
   module Linux
     def redhatish_platform(conf)

data/lib/train/platforms/detect/scanner.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require_relative "helpers/os_common"
 
 module Train::Platforms::Detect

data/lib/train/platforms/detect/specifications/api.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Train::Platforms::Detect::Specifications
   class Api
     def self.load

data/lib/train/platforms/detect/specifications/os.rb

@@ -128,7 +128,7 @@ module Train::Platforms::Detect::Specifications
 
       declare_lsb("scientific", "Scientific Linux", "redhat", /scientific/i)
 
-      declare_lsb("xenserver", "Xenserer Linux", "redhat", /xenserver/i)
+      declare_lsb("xenserver", "Xenserver Linux", "redhat", /xenserver/i)
 
       declare_instance("parallels-release", "Parallels Linux", "redhat") do
         if (raw = unix_file_contents("/etc/parallels-release"))
@@ -357,7 +357,7 @@ module Train::Platforms::Detect::Specifications
       declare_instance("mac_os_x", "macOS X", "darwin") do
         cmd = unix_file_contents("/System/Library/CoreServices/SystemVersion.plist")
         @platform[:uuid_command] = "system_profiler SPHardwareDataType | awk '/UUID/ { print $3; }'"
-        cmd =~ /Mac OS X/i
+        cmd =~ /Mac OS X|macOS/i
       end
 
       declare_instance("darwin", "Darwin", "darwin") do
@@ -369,6 +369,7 @@ module Train::Platforms::Detect::Specifications
       declare_bsd("freebsd", "Freebsd", "bsd", /freebsd/i)
       declare_bsd("openbsd", "Openbsd", "bsd", /openbsd/i)
       declare_bsd("netbsd", "Netbsd", "bsd", /netbsd/i)
+      declare_bsd("dragonflybsd", "Dragonflybsd", "bsd", /dragonfly/i)
     end
 
     def self.load_other

data/lib/train/platforms/detect/uuid.rb

@@ -1,6 +1,6 @@
 require "digest/sha1"
-require "securerandom"
-require "json"
+require "securerandom" unless defined?(SecureRandom)
+require "json" unless defined?(JSON)
 
 module Train::Platforms::Detect
   class UUID

data/lib/train/platforms/family.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Train::Platforms
   class Family
     include Train::Platforms::Common

data/lib/train/platforms/platform.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Train::Platforms
   class Platform
     include Train::Platforms::Common
@@ -47,7 +45,7 @@ module Train::Platforms
       @uuid ||= Train::Platforms::Detect::UUID.new(self).find_or_create_uuid.downcase
     end
 
-    # This is for backwords compatability with
+    # This is for backwards compatibility with
     # the current inspec os resource.
     def[](name)
       if respond_to?(name)

data/lib/train/plugin_test_helper.rb

@@ -13,13 +13,13 @@ require "minitest/spec"
 require "minitest/autorun"
 
 # Data formats commonly used in testing
-require "json"
-require "ostruct"
+require "json" unless defined?(JSON)
+require "ostruct" unless defined?(OpenStruct)
 
 # Utilities often needed
-require "fileutils"
-require "tmpdir"
-require "pathname"
+require "fileutils" unless defined?(FileUtils)
+require "tmpdir" unless defined?(Dir.mktmpdir)
+require "pathname" unless defined?(Pathname)
 
 # You might want to put some debugging tools here.  We run tests to find bugs,
 # after all.

data/lib/train/plugins.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 # Author:: Christoph Hartmann (<chris@lollyrock.com>)
@@ -24,7 +23,7 @@ module Train
   # Create a versioned plugin by providing the transport layer plugin version
   # to this method. It will then select the correct class to inherit from.
   #
-  # The plugin version determins what methods will be available to your plugin.
+  # The plugin version determines what methods will be available to your plugin.
   #
   # @param [Int] version = 1 the plugin version to use
   # @return [Transport] the versioned transport base class

data/lib/train/plugins/base_connection.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require_relative "../errors"
 require_relative "../extras"
 require_relative "../file"
@@ -160,7 +158,7 @@ class Train::Plugins::Transport
     # service is preferred to simply waiting on a socket to become
     # available.
     def wait_until_ready
-      # this method may be left unimplemented if that is applicablelog
+      # this method may be left unimplemented if that is applicable log
     end
 
     private

data/lib/train/plugins/transport.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 # Author:: Christoph Hartmann (<chris@lollyrock.com>)

data/lib/train/transports/cisco_ios_connection.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 class Train::Transports::SSH
   class CiscoIOSConnection < BaseConnection
     class BadEnablePassword < Train::TransportError; end

data/lib/train/transports/local.rb

@@ -1,11 +1,10 @@
-# encoding: utf-8
 #
 # author: Dominik Richter
 # author: Christoph Hartmann
 
 require_relative "../plugins"
 require_relative "../errors"
-require "mixlib/shellout"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 module Train::Transports
   class Local < Train.plugin(1)
@@ -112,7 +111,7 @@ module Train::Transports
       end
 
       class WindowsShellRunner
-        require "json"
+        require "json" unless defined?(JSON)
         require "base64"
 
         def initialize(powershell_cmd = "powershell")
@@ -136,9 +135,9 @@ module Train::Transports
       end
 
       class WindowsPipeRunner
-        require "json"
+        require "json" unless defined?(JSON)
         require "base64"
-        require "securerandom"
+        require "securerandom" unless defined?(SecureRandom)
 
         def initialize(powershell_cmd = "powershell")
           @powershell_cmd = powershell_cmd
@@ -147,7 +146,7 @@ module Train::Transports
         end
 
         # @param  cmd The command to execute
-        # @return Local::ComandResult with stdout, stderr and exitstatus
+        # @return Local::CommandResult with stdout, stderr and exitstatus
         #         Note that exitstatus ($?) in PowerShell is boolean, but we use a numeric exit code.
         #         A command that succeeds without setting an exit code will have exitstatus 0
         #         A command that exits with an exit code will have that value as exitstatus

data/lib/train/transports/ssh.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
@@ -18,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/ssh"
+require "net/ssh" unless defined?(Net::SSH)
 require "net/scp"
 require_relative "../errors"
 
@@ -65,6 +64,9 @@ module Train::Transports
     option :non_interactive, default: false
     option :verify_host_key, default: false
 
+    # Allow connecting with older algorithms
+    option :append_all_supported_algorithms, default: true
+
     option :compression_level do |opts|
       # on nil or false: set compression level to 0
       opts[:compression] ? 6 : 0
@@ -76,7 +78,7 @@ module Train::Transports
       validate_options(opts)
       conn_opts = connection_options(opts)
 
-      if defined?(@connection) && @connection_options == conn_opts
+      if defined?(@connection) && reusable_connection?(conn_opts)
         reuse_connection(&block)
       else
         create_new_connection(conn_opts, &block)
@@ -85,6 +87,13 @@ module Train::Transports
 
     private
 
+    def reusable_connection?(conn_opts)
+      return false unless @connection_options
+
+      # Do requested options match their current settings
+      @connection_options.all? { |k, v| conn_opts[k] == v }
+    end
+
     def validate_options(options)
       super(options)
 
@@ -167,6 +176,7 @@ module Train::Transports
         bastion_user: opts[:bastion_user],
         bastion_port: opts[:bastion_port],
         non_interactive: opts[:non_interactive],
+        append_all_supported_algorithms: opts[:append_all_supported_algorithms],
         transport_options: opts,
       }
       # disable host key verification. The hash key and value to use
@@ -227,7 +237,7 @@ module Train::Transports
     # Creates a new SSH Connection instance and save it for potential future
     # reuse.
     #
-    # @param options [Hash] conneciton options
+    # @param options [Hash] connection options
     # @return [Ssh::Connection] an SSH Connection instance
     # @api private
     def create_new_connection(options, &block)

data/lib/train/transports/ssh_connection.rb

@@ -1,4 +1,3 @@
-# encoding: utf-8
 #
 # Author:: Fletcher Nichol (<fnichol@nichol.ca>)
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
@@ -18,9 +17,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "net/ssh"
+require "net/ssh" unless defined?(Net::SSH)
 require "net/scp"
-require "timeout"
+require "timeout" unless defined?(Timeout)
 
 class Train::Transports::SSH
   # A Connection instance can be generated and re-generated, given new
@@ -202,8 +201,6 @@ class Train::Transports::SSH
         require "net/ssh/proxy/command"
         @options[:proxy] = Net::SSH::Proxy::Command.new(generate_proxy_command)
       end
-      # Allow older algorithms
-      @options[:append_all_supported_algorithms] = true
       Net::SSH.start(@hostname, @username, @options.clone.delete_if { |_key, value| value.nil? })
     rescue *RESCUE_EXCEPTIONS_ON_ESTABLISH => e
       if (opts[:retries] -= 1) <= 0

data/lib/train/version.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
 #
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = "3.3.1".freeze
+  VERSION = "3.3.21".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.21
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2020-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable