train-core 3.2.28 → 3.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cfdc185e0d7c0d0b9271fb1ccd626cac1ef57d56988660727f1b04fa2551446
-  data.tar.gz: a9a030b0fd0bd204d2fa3e628dbffe182a52bbf75e4382fbd44de8dba684ac35
+  metadata.gz: 49d500e3ff1e260a0879ff7da716c7407934e53deef0f15df171c03cd26c9dff
+  data.tar.gz: 54d6e4b4907efcccc7c99cae92c6e81b7d34c172d8601faa8b9a725a2edb9590
 SHA512:
-  metadata.gz: 821492e02d6b61f758b5e5532474bf24d3751f8d0eb1a6632b752151b337d832ad5206afa895496c6c21f2ea713eb27c5aba7af091daaab9a145536c88f6d8c5
-  data.tar.gz: e52413eef52213b2ba746a60b3ac56771a230ce56e00dc7ae83225c8b46e1ad6ff8cb1125d0536b20a930b8210e4c0fdbc827a92ed903a052d907bf786cfa8ea
+  metadata.gz: 846c9daf8a830259f3919a44fe6e12f5e5911a01c63d6a3362ec7dc05bd644e332189c94e878435ca622c697d2cfd33e903f599e41cfd5b42fb6c346d81705f3
+  data.tar.gz: 105276a39b26b161a41cefc2b9f1ebaa989055d08d08d246927dfe1f2843c66cdaa5f4520b1ded0478d88b8d13e3b381daa9f4674fd4e1fcf8ffe1e96cbf08dc

data/lib/train.rb

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

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,5 +1,3 @@
-# encoding: utf-8
-
 require "shellwords"
 require_relative "../../extras/stat"
 

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

@@ -22,8 +22,14 @@ module Train
         def exist?
           @exist ||= begin
             f = @follow_symlink ? "" : " || test -L #{@spath}"
-            @backend.run_command("test -e #{@spath}" + f)
-              .exit_status == 0
+            if @backend.platform.solaris?
+              # Solaris does not support `-e` flag in default `test`,
+              # so we specify by running /usr/bin/test:
+              # https://github.com/inspec/train/issues/587
+              @backend.run_command("/usr/bin/test -e #{@spath}" + f)
+            else
+              @backend.run_command("test -e #{@spath}" + f)
+            end.exit_status == 0
           end
         end
 

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

@@ -34,16 +34,24 @@ module Train::Platforms::Detect::Helpers
     end
 
     def command_output(cmd)
-      res = @backend.run_command(cmd).stdout
+      res = @backend.run_command(cmd)
+      stdout = res.stdout
+      stderr = res.stderr
       # 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
       # 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

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

@@ -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/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

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>)

data/lib/train/plugins/base_connection.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require_relative "../errors"
 require_relative "../extras"
 require_relative "../file"

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
@@ -16,6 +14,9 @@ class Train::Transports::SSH
       # Use all options left that are not `nil` for `Net::SSH.start` later
       @ssh_options = options.reject { |_key, value| value.nil? }
 
+      # Allow older algorithms
+      @ssh_options[:append_all_supported_algorithms] = true
+
       @prompt = /^\S+[>#]\r\n.*$/
     end
 

data/lib/train/transports/local.rb

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

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>)
@@ -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

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>)
@@ -54,7 +53,7 @@ class Train::Transports::SSH
       @bastion_user           = @options.delete(:bastion_user)
       @bastion_port           = @options.delete(:bastion_port)
 
-      @cmd_wrapper            = CommandWrapper.load(self, @transport_options)
+      @cmd_wrapper = CommandWrapper.load(self, @transport_options)
     end
 
     # (see Base::Connection#close)

data/lib/train/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 3.2.28
+  version: 3.3.13
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-13 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +87,7 @@ dependencies:
         version: '1.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -83,7 +97,7 @@ dependencies:
         version: '1.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +107,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -103,7 +117,7 @@ dependencies:
         version: '2.9'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 description: A minimal Train with a backends for ssh and winrm.
 email:
 - inspec@chef.io