train-core 1.4.25 → 1.4.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51d43b1dc60a1747f0215b8e6d2ec94541968061fa0ab14a88fa630ba64b37e9
-  data.tar.gz: 114d0a2972802575e5d2575ad28628fba5031a81f8edeb6ee6227d176f0eaa95
+  metadata.gz: 873addbef7c16e3ff149dbad280ae61c1913b689adcd50535bd0471ad091f020
+  data.tar.gz: 0dce14e56c157bb0ab9291a04768b3786cefdbf2e0952401d61bc76e7e5f693f
 SHA512:
-  metadata.gz: f931b3f74fe9241ef133d86563f45a2e999791f3dad0191b4899e84920695978deed6956d6e9bab3350d239097562262757e83576368c369000bb3e240578eb2
-  data.tar.gz: 89d8798088458c192976cc3070efac5ef6e912a686d4e83fa508b65ae063d9e8dd50f0bf5925b85658c5f6431a26f11ab158101df102fc083ba7a84c91822852
+  metadata.gz: c27449cfdf20762084d4e7c759b08a9da4ff7a78221320c3218059509ac409fc524aa5cfd8f542a85a8518c181613f93eb17c04b003201ace6047c88708413e2
+  data.tar.gz: ab7334d0c6db00ba245bf8a74bad71ac0bf95d7542b3a904748bd965eaec602e282508d15eb825bb67279af605b26537d3b4a1ff6371e5a8cf7385466eb6c47f

data/CHANGELOG.md

@@ -1,24 +1,34 @@
-<!-- latest_release 1.4.25 -->
-## [v1.4.25](https://github.com/inspec/train/tree/v1.4.25) (2018-08-01)
+<!-- latest_release 1.4.29 -->
+## [v1.4.29](https://github.com/inspec/train/tree/v1.4.29) (2018-08-15)
 
 #### Merged Pull Requests
-- Remove not needed google-cloud dependency (see #328) and correct GCP … [#329](https://github.com/inspec/train/pull/329) ([skpaterson](https://github.com/skpaterson))
+- Add non_interactive support for SSH [#336](https://github.com/inspec/train/pull/336) ([marcparadise](https://github.com/marcparadise))
 <!-- latest_release -->
 
-<!-- release_rollup since=1.4.24 -->
-### Changes since 1.4.24 release
+<!-- release_rollup since=1.4.25 -->
+### Changes since 1.4.25 release
+
+#### Features & Enhancements
+- Pulls file credentials parsing out of Azure class [#324](https://github.com/inspec/train/pull/324) ([dmccown](https://github.com/dmccown)) <!-- 1.4.27 -->
 
 #### Merged Pull Requests
-- Remove not needed google-cloud dependency (see #328) and correct GCP … [#329](https://github.com/inspec/train/pull/329) ([skpaterson](https://github.com/skpaterson)) <!-- 1.4.25 -->
+- Add non_interactive support for SSH [#336](https://github.com/inspec/train/pull/336) ([marcparadise](https://github.com/marcparadise)) <!-- 1.4.29 -->
+- Require Ruby 2.0 and allow net-ssh 5.0 [#334](https://github.com/inspec/train/pull/334) ([tas50](https://github.com/tas50)) <!-- 1.4.28 -->
+- Modify checksum logic to use system binaries [#251](https://github.com/inspec/train/pull/251) ([jerryaldrichiii](https://github.com/jerryaldrichiii)) <!-- 1.4.26 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v1.4.25](https://github.com/inspec/train/tree/v1.4.25) (2018-08-01)
+
+#### Merged Pull Requests
+- Remove not needed google-cloud dependency (see #328) and correct GCP … [#329](https://github.com/inspec/train/pull/329) ([skpaterson](https://github.com/skpaterson))
+<!-- latest_stable_release -->
+
 ## [v1.4.24](https://github.com/inspec/train/tree/v1.4.24) (2018-07-26)
 
 #### Merged Pull Requests
 - Add shallow_link_path to inspect symlink direct link [#309](https://github.com/inspec/train/pull/309) ([ColinHebert](https://github.com/ColinHebert))
 - Retry SSH command on IOError (Cisco IOS specific) [#326](https://github.com/inspec/train/pull/326) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
-<!-- latest_stable_release -->
 
 ## [v1.4.22](https://github.com/inspec/train/tree/v1.4.22) (2018-07-16)
 

data/lib/train/file.rb

@@ -5,12 +5,10 @@
 
 require 'train/file/local'
 require 'train/file/remote'
-require 'digest/sha2'
-require 'digest/md5'
 require 'train/extras/stat'
 
 module Train
-  class File
+  class File # rubocop:disable Metrics/ClassLength
     def initialize(backend, path, follow_symlink = true)
       @backend = backend
       @path = path || ''
@@ -48,22 +46,6 @@ module Train
       :unknown
     end
 
-    def md5sum
-      res = Digest::MD5.new
-      res.update(content)
-      res.hexdigest
-    rescue TypeError => _
-      nil
-    end
-
-    def sha256sum
-      res = Digest::SHA256.new
-      res.update(content)
-      res.hexdigest
-    rescue TypeError => _
-      nil
-    end
-
     def source
       if @follow_symlink
         self.class.new(@backend, @path, false)
@@ -147,5 +129,82 @@ module Train
 
       !mounted.nil? && !mounted.stdout.nil? && !mounted.stdout.empty?
     end
+
+    def md5sum
+      # Skip processing rest of method if fallback method is selected
+      return perform_checksum_ruby(:md5) if defined?(@ruby_checksum_fallback)
+
+      checksum = if @backend.os.family == 'windows'
+                   perform_checksum_windows(:md5)
+                 else
+                   @md5_command ||= case @backend.os.family
+                                    when 'darwin'
+                                      'md5 -r'
+                                    when 'solaris'
+                                      'digest -a md5'
+                                    else
+                                      'md5sum'
+                                    end
+
+                   perform_checksum_unix(@md5_command)
+                 end
+
+      checksum || perform_checksum_ruby(:md5)
+    end
+
+    def sha256sum
+      # Skip processing rest of method if fallback method is selected
+      return perform_checksum_ruby(:sha256) if defined?(@ruby_checksum_fallback)
+
+      checksum = if @backend.os.family == 'windows'
+                   perform_checksum_windows(:sha256)
+                 else
+                   @sha256_command ||= case @backend.os.family
+                                       when 'darwin', 'hpux', 'qnx'
+                                         'shasum -a 256'
+                                       when 'solaris'
+                                         'digest -a sha256'
+                                       else
+                                         'sha256sum'
+                                       end
+
+                   perform_checksum_unix(@sha256_command)
+                 end
+
+      checksum || perform_checksum_ruby(:sha256)
+    end
+
+    private
+
+    def perform_checksum_unix(cmd)
+      res = @backend.run_command("#{cmd} #{@path}")
+      res.stdout.split(' ').first if res.exit_status == 0
+    end
+
+    def perform_checksum_windows(method)
+      cmd = "CertUtil -hashfile #{@path} #{method.to_s.upcase}"
+      res = @backend.run_command(cmd)
+      res.stdout.split("\r\n")[1].tr(' ', '') if res.exit_status == 0
+    end
+
+    # This pulls the content of the file to the machine running Train and uses
+    # Digest to perform the checksum. This is less efficient than using remote
+    # system binaries and can lead to incorrect results due to encoding.
+    def perform_checksum_ruby(method)
+      # This is used to skip attempting other checksum methods. If this is set
+      # then we know all other methods have failed.
+      @ruby_checksum_fallback = true
+      case method
+      when :md5
+        res = Digest::MD5.new
+      when :sha256
+        res = Digest::SHA256.new
+      end
+
+      res.update(content)
+      res.hexdigest
+    rescue TypeError => _
+      nil
+    end
   end
 end

data/lib/train/version.rb

@@ -3,5 +3,5 @@
 # Author:: Dominik Richter (<dominik.richter@gmail.com>)
 
 module Train
-  VERSION = '1.4.25'.freeze
+  VERSION = '1.4.29'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: train-core
 version: !ruby/object:Gem::Version
-  version: 1.4.25
+  version: 1.4.29
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout