winrm-fs 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97a55b39229287775fa730b017ba6dd14d735d62
-  data.tar.gz: 430eb6f48dea157a34280a51ff81b894ceb322e7
+  metadata.gz: 22bfb44445f8a68db43716cdce53483049420a30
+  data.tar.gz: ae2b5641e2fe84b6e9ee9e017447fe382ace9ce5
 SHA512:
-  metadata.gz: 1771439c5293d66745861ad962a75eaa1374d87a8f0fa4a37f8af503826e6b8e7ae99d8396aa7ae78aea3f29e15f33fe5a4385c5642c11365a9c5ea9ac465795
-  data.tar.gz: 34a678fc1e27ecb119918ff827f87674d6d0aedc3fb3826b9bd4ee875cb55b90cb337b1508681923b1bc8d9d7358d4fbdb7f47334062707821d291d17a4b70cf
+  metadata.gz: 13d3bc1660e11ba10a057bce5d10e7b246f738159885be0a5034bf70c4cd767f9e74d118b47cc29156d809901dbff34d9ec024497315662dbbaaef3032d05dc5
+  data.tar.gz: cb5c3dcbb68cdddad234a354745505d226c5d0edebc5793a7ce545977ef79a426ac98eb6fcd5d115944d9f30136750b5b05a24ce4a0c60558b8b3e4e6ab2173c

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/changelog.md

@@ -1,4 +1,7 @@
 # WinRM-fs Gem Changelog
+# 1.1.0
+- Convert MD5 hashes to SHA1.
+
 # 1.0.2
 - Fix `Pathname.glob` expansion of shortnames.
 

data/lib/winrm-fs/core/file_transporter.rb

@@ -70,7 +70,7 @@ module WinRM
         # @param locals [Array<String>,String] one or more local file or
         #   directory paths
         # @param remote [String] the base destination path on the remote host
-        # @return [Hash] report hash, keyed by the local MD5 digest
+        # @return [Hash] report hash, keyed by the local SHA1 digest
         def upload(locals, remote)
           files = nil
           report = nil
@@ -147,8 +147,8 @@ module WinRM
         # will have the base name of the source file appended. This only
         # applies to file uploads and not to folder uploads.
         #
-        # @param files [Hash] files hash, keyed by the local MD5 digest
-        # @return [Hash] a report hash, keyed by the local MD5 digest
+        # @param files [Hash] files hash, keyed by the local SHA1 digest
+        # @return [Hash] a report hash, keyed by the local SHA1 digest
         # @api private
         def reconcile_destinations!(files)
           files.each do |_, data|
@@ -158,10 +158,10 @@ module WinRM
           end
         end
 
-        # Adds an entry to a files Hash (keyed by local MD5 digest) for a
+        # Adds an entry to a files Hash (keyed by local SHA1 digest) for a
         # directory. When a directory is added, a temporary Zip file is created
         # containing the contents of the directory and any file-related data
-        # such as MD5 digest, size, etc. will be referring to the Zip file.
+        # such as SHA1 digest, size, etc. will be referring to the Zip file.
         #
         # @param hash [Hash] hash to be mutated
         # @param dir [String] directory path to be Zipped and added
@@ -170,19 +170,19 @@ module WinRM
         def add_directory_hash!(hash, dir, remote)
           logger.debug "creating hash for directory #{remote}"
           zip_io = TmpZip.new(dir, logger)
-          zip_md5 = md5sum(zip_io.path)
+          zip_sha1 = sha1sum(zip_io.path)
 
-          hash[zip_md5] = {
+          hash[zip_sha1] = {
             'src'     => dir,
             'src_zip' => zip_io.path.to_s,
             'zip_io'  => zip_io,
-            'tmpzip'  => "#{TEMP_UPLOAD_DIRECTORY}\\tmpzip-#{zip_md5}.zip",
+            'tmpzip'  => "#{TEMP_UPLOAD_DIRECTORY}\\tmpzip-#{zip_sha1}.zip",
             'dst'     => "#{remote}\\#{File.basename(dir)}",
             'size'    => File.size(zip_io.path)
           }
         end
 
-        # Adds an entry to a files Hash (keyed by local MD5 digest) for a file.
+        # Adds an entry to a files Hash (keyed by local SHA1 digest) for a file.
         #
         # @param hash [Hash] hash to be mutated
         # @param local [String] file path
@@ -191,7 +191,7 @@ module WinRM
         def add_file_hash!(hash, local, remote)
           logger.debug "creating hash for file #{remote}"
 
-          hash[md5sum(local)] = {
+          hash[sha1sum(local)] = {
             'src'   => local,
             'dst'   => remote,
             'size'  => File.size(local)
@@ -199,12 +199,12 @@ module WinRM
         end
 
         # Runs the check_files PowerShell script against a collection of
-        # destination path/MD5 checksum pairs. The PowerShell script returns
+        # destination path/SHA1 checksum pairs. The PowerShell script returns
         # its results as a CSV-formatted report which is converted into a Ruby
         # Hash.
         #
-        # @param files [Hash] files hash, keyed by the local MD5 digest
-        # @return [Hash] a report hash, keyed by the local MD5 digest
+        # @param files [Hash] files hash, keyed by the local SHA1 digest
+        # @return [Hash] a report hash, keyed by the local SHA1 digest
         # @api private
         def check_files(files)
           logger.debug 'Running check_files.ps1'
@@ -213,16 +213,16 @@ module WinRM
           parse_response(shell.run(script))
         end
 
-        # Constructs a collection of destination path/MD5 checksum pairs as a
+        # Constructs a collection of destination path/SHA1 checksum pairs as a
         # String representation of the contents of a PowerShell Hash Table.
         #
-        # @param files [Hash] files hash, keyed by the local MD5 digest
+        # @param files [Hash] files hash, keyed by the local SHA1 digest
         # @return [String] the inner contents of a PowerShell Hash Table
         # @api private
         def check_files_ps_hash(files)
-          hash = files.map do |md5, data|
+          hash = files.map do |sha1, data|
             [
-              md5,
+              sha1,
               {
                 'target' => data.fetch('tmpzip', data['dst']),
                 'src_basename' => File.basename(data['src']),
@@ -239,9 +239,9 @@ module WinRM
         # @param files [Hash] a files hash
         # @api private
         def cleanup(files)
-          files.select { |_, data| data.key?('zip_io') }.each do |md5, data|
+          files.select { |_, data| data.key?('zip_io') }.each do |sha1, data|
             data.fetch('zip_io').unlink
-            files.fetch(md5).delete('zip_io')
+            files.fetch(sha1).delete('zip_io')
             logger.debug "Cleaned up src_zip #{data['src_zip']}"
           end
         end
@@ -252,8 +252,8 @@ module WinRM
         # Hash. The script will not be invoked if there are no zip files
         # present in the incoming files Hash.
         #
-        # @param files [Hash] files hash, keyed by the local MD5 digest
-        # @return [Hash] a report hash, keyed by the local MD5 digest
+        # @param files [Hash] files hash, keyed by the local SHA1 digest
+        # @return [Hash] a report hash, keyed by the local SHA1 digest
         # @api private
         def extract_files(files)
           extracted_files = extract_files_ps_hash(files)
@@ -273,17 +273,17 @@ module WinRM
         # all zipped folders as a String representation of the contents of a
         # PowerShell Hash Table.
         #
-        # @param files [Hash] files hash, keyed by the local MD5 digest
+        # @param files [Hash] files hash, keyed by the local SHA1 digest
         # @return [String] the inner contents of a PowerShell Hash Table
         # @api private
         def extract_files_ps_hash(files)
           file_data = files.select { |_, data| data.key?('tmpzip') }
 
-          result = file_data.map do |md5, data|
+          result = file_data.map do |sha1, data|
             val = { 'dst' => data['dst'] }
             val['tmpzip'] = data['tmpzip'] if data['tmpzip']
 
-            [md5, val]
+            [sha1, val]
           end
 
           ps_hash(Hash[result])
@@ -300,14 +300,14 @@ module WinRM
           format('(%dm%.2fs)', minutes, seconds)
         end
 
-        # Contructs a Hash of files or directories, keyed by the local MD5
+        # Contructs a Hash of files or directories, keyed by the local SHA1
         # digest. Each file entry has a source and destination set, at a
         # minimum.
         #
         # @param locals [Array<String>] a collection of local files or
         #   directories
         # @param remote [String] the base destination path on the remote host
-        # @return [Hash] files hash, keyed by the local MD5 digest
+        # @return [Hash] files hash, keyed by the local SHA1 digest
         # @api private
         def make_files_hash(locals, remote)
           hash = {}
@@ -327,17 +327,17 @@ module WinRM
           hash
         end
 
-        # @return [String] the MD5 digest of a local file
+        # @return [String] the SHA1 digest of a local file
         # @api private
-        def md5sum(local)
-          Digest::MD5.file(local).hexdigest
+        def sha1sum(local)
+          Digest::SHA1.file(local).hexdigest
         end
 
         # Destructively merges a report Hash into an existing files Hash.
         # **Note:** this method mutates the files Hash.
         #
-        # @param files [Hash] files hash, keyed by the local MD5 digest
-        # @param report [Hash] report hash, keyed by the local MD5 digest
+        # @param files [Hash] files hash, keyed by the local SHA1 digest
+        # @param report [Hash] report hash, keyed by the local SHA1 digest
         # @api private
         def merge_with_report!(files, report)
           files.merge!(report) { |_, oldval, newval| oldval.merge(newval) }
@@ -355,7 +355,7 @@ module WinRM
         #
         # @param output [WinRM::Output] output object with stdout, stderr, and
         #   exit code
-        # @return [Hash] report hash, keyed by the local MD5 digest
+        # @return [Hash] report hash, keyed by the local SHA1 digest
         # @api private
         def parse_response(output)
           exitcode = output.exitcode
@@ -374,7 +374,7 @@ module WinRM
 
           array = CSV.parse(output.stdout, headers: true).map(&:to_hash)
           array.each { |h| h.each { |key, value| h[key] = nil if value == '' } }
-          Hash[array.map { |entry| [entry.fetch('src_md5'), entry] }]
+          Hash[array.map { |entry| [entry.fetch('src_sha1'), entry] }]
         end
 
         # Converts a Ruby hash into a PowerShell hash table, represented in a
@@ -487,20 +487,20 @@ module WinRM
         # Base64-encoded temporary files. A "dirty" file is one which has the
         # `"chk_dirty"` option set to `"True"` in the incoming files Hash.
         #
-        # @param files [Hash] files hash, keyed by the local MD5 digest
-        # @return [Hash] a report hash, keyed by the local MD5 digest
+        # @param files [Hash] files hash, keyed by the local SHA1 digest
+        # @return [Hash] a report hash, keyed by the local SHA1 digest
         # @api private
         def stream_upload_files(files)
           response = {}
-          files.each do |md5, data|
+          files.each do |sha1, data|
             src = data.fetch('src_zip', data['src'])
             if data['chk_dirty'] == 'True'
-              response[md5] = { 'dest' => data['tmpzip'] || data['dst'] }
+              response[sha1] = { 'dest' => data['tmpzip'] || data['dst'] }
               chunks, bytes = stream_upload_file(src, data['tmpzip'] || data['dst']) do |xfered|
                 yield data['src'], xfered
               end
-              response[md5]['chunks'] = chunks
-              response[md5]['xfered'] = bytes
+              response[sha1]['chunks'] = chunks
+              response[sha1]['xfered'] = bytes
             else
               logger.debug "File #{data['dst']} is up to date, skipping"
             end
@@ -512,7 +512,7 @@ module WinRM
         # Calculates count based on the sum of base64 encoded content size
         # of all files base 64 that are dirty.
         #
-        # @param files [Hash] files hash, keyed by the local MD5 digest
+        # @param files [Hash] files hash, keyed by the local SHA1 digest
         # @return [Fixnum] total byte size
         # @api private
         def total_base64_transfer_size(files)

data/lib/winrm-fs/file_manager.rb

@@ -29,11 +29,11 @@ module WinRM
         @logger = connection.logger
       end
 
-      # Gets the MD5 checksum of the specified file if it exists,
+      # Gets the SHA1 checksum of the specified file if it exists,
       # otherwise ''
       # @param [String] The remote file path
       # @parms [String] The digest method
-      def checksum(path, digest = 'MD5')
+      def checksum(path, digest = 'SHA1')
         @logger.debug("checksum with #{digest}: #{path}")
         script = WinRM::FS::Scripts.render('checksum', path: path, digest: digest)
         @connection.shell(:powershell) { |e| e.run(script).stdout.chomp }

data/lib/winrm-fs/scripts/check_files.ps1.erb

@@ -16,18 +16,18 @@ Function Check-Files($h) {
     }
     New-Object psobject -Property @{
       chk_exists = ($exists = Test-Path $dst -PathType Leaf)
-      src_md5 = ($sMd5 = $_.Key)
-      dst_md5 = ($dMd5 = if ($exists) { Get-MD5Sum $dst } else { $null })
+      src_sha1 = ($sMd5 = $_.Key)
+      dst_sha1 = ($dMd5 = if ($exists) { Get-SHA1Sum $dst } else { $null })
       chk_dirty = ($dirty = if ($sMd5 -ne $dMd5) { $true } else { $false })
       verifies = if ($dirty -eq $false) { $true } else { $false }
       target_is_folder = $dst_changed
     }
-  } | Select-Object -Property chk_exists,src_md5,dst_md5,chk_dirty,verifies,target_is_folder
+  } | Select-Object -Property chk_exists,src_sha1,dst_sha1,chk_dirty,verifies,target_is_folder
 }
 
-Function Get-MD5Sum($src) {
+Function Get-SHA1Sum($src) {
   Try {
-    $c = [System.Security.Cryptography.MD5]::Create()
+    $c = [System.Security.Cryptography.SHA1]::Create()
     $bytes = $c.ComputeHash(($in = (Get-Item $src).OpenRead()))
     return ([System.BitConverter]::ToString($bytes)).Replace("-", "").ToLower()
   } 

data/lib/winrm-fs/scripts/extract_files.ps1.erb

@@ -17,7 +17,7 @@ Function Decode-Files($hash) {
     $value = $hash[$key]
     $tzip, $dst = $Value["tmpzip"], $Value["dst"]
     if ($tzip) {Unzip-File $tzip $dst}
-    New-Object psobject -Property @{dst=$dst;src_md5=$key;tmpzip=$tzip}
+    New-Object psobject -Property @{dst=$dst;src_sha1=$key;tmpzip=$tzip}
   }
 }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: winrm-fs
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Shawn Neal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-19 00:00:00.000000000 Z
+date: 2017-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis