manageiq-smartstate 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 716aa4395ecc988d0cb62308cabef745a9fe6e4d
-  data.tar.gz: 01fd9eb7d27bb07593b60b66d9412ed65e032dcd
+  metadata.gz: 4ee1b8fd08ac112af3f9c643ac6ae7a41b6dfef7
+  data.tar.gz: 973ebff243838e870439abc1996354f14159ba7c
 SHA512:
-  metadata.gz: 491debebea68f7fc8a5f12c4715061b0db955d9c61c73f3ebbda01ed18ea2bb5e6da3bf2589065ddcd5db597cfcb3bf1b022b89888dcbff2146c2840d84925ac
-  data.tar.gz: 604bd296a8641e42d8e223c99bf546104e083f5d9fa5be61f9af73e849b3218205e5d43ac1bb8de18aca4c7424232647845473c091719d03ad05641986e2db8f
+  metadata.gz: f1c82c83f6d311c98352f940d501e0a2e20fccd15436e05755fc245c95eb3406eea3c5c8c79338dce41321d22c488a248b7ded0d9731a80147bd5ec64ba7488e
+  data.tar.gz: 257dc3420aaccfdeba53bb3359c313e9d13514757427514119e201cd6a0eea189d0cc8a979986570a4824f9de15111ea607ec7afdfbec2ca5a5b40b452bfd75a

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.5.1".freeze
+    VERSION = "0.5.2".freeze
   end
 end

data/lib/metadata/VmConfig/VmConfig.rb

@@ -409,10 +409,10 @@ class VmConfig
       ems_display_text = "host(#{ems_host['use_vim_broker'] ? 'via broker' : 'directly'}):#{ems_host['host']}"
       $log.info "#{conn_reason}: Connecting to [#{ems_display_text}] for VM:[#{vmCfgFile}]"
 
-      require 'VMwareWebService/miq_fault_tolerant_vim'
+      require 'VMwareWebService/MiqVim'
 
       password_decrypt = ManageIQ::Password.decrypt(ems_host['password'])
-      hostVim = MiqFaultTolerantVim.new(:ip => ems_host['host'], :user => ems_host['user'], :pass => password_decrypt, :use_broker => ems_host['use_vim_broker'], :vim_broker_drb_uri => ems_host['vim_broker_drb_uri'])
+      hostVim = MiqVim.new(ems_host['host'], ems_host['user'], password_decrypt)
       $log.info "#{conn_reason}: Connection to [#{ems_display_text}] completed for VM:[#{vmCfgFile}] in [#{Time.now - st}] seconds"
       return hostVim
     rescue Timeout::Error => err

data/lib/metadata/util/md5deep.rb

@@ -126,37 +126,40 @@ class MD5deep
 
       begin
         #       unless File.directory?(currFile) then
-        unless isDir?(currFile)
-          # File we have an exclusion list and the current file is in it, skip to the next file
-          @fullFileCount += 1
-          fh = fileOpen(currFile)
-
-          xmlFileNode = xmlNode.add_element("file", "name" => x, "fqname" => currFile)
-          statHash = {}
-          statHash.merge!(getFileStats(fh))
-          statHash.merge!(calculate_digest(fh))
-          xmlFileNode.add_attributes(statHash)
-
-          ext = File.extname(currFile).downcase
-          if @opts.winVerList.include?(ext)
-            if @opts.versioninfo || @opts.imports
-              peHdr = PEheader.new(fh) rescue nil
-              unless peHdr.nil?
-                xmlFileNode.add_element("versioninfo", peHdr.versioninfo) if @opts.versioninfo && !peHdr.versioninfo.blank?
-                xmlFileNode.add_element("libraries", "imports" => peHdr.getImportList) if @opts.imports && !peHdr.imports.blank?
-              end
-            end
-          end
-
-          getFileContents(fh, xmlFileNode) if @opts.contents == true
-          fh.close
+        return if isDir?(currFile)
+
+        # File we have an exclusion list and the current file is in it, skip to the next file
+        @fullFileCount += 1
+        fh = fileOpen(currFile)
+
+        xmlFileNode = xmlNode.add_element("file", "name" => x, "fqname" => currFile)
+        statHash = {}
+        statHash.merge!(getFileStats(fh))
+        statHash.merge!(calculate_digest(fh))
+        xmlFileNode.add_attributes(statHash)
+
+        ext = File.extname(currFile).downcase
+        if @opts.winVerList.include?(ext)
+          pe_hdr = PEheader.new(fh) rescue nil
+          process_pe_header(pe_hdr, xmlFileNode) unless pe_hdr.nil?
         end
+
+        getFileContents(fh, xmlFileNode) if @opts.contents == true
+        fh.close
       rescue Errno::EACCES, RuntimeError, SystemCallError
         fh.close if fh.kind_of?(File) && !fh.closed?
       end
     end
   end
 
+  def process_pe_header(pe_hdr, xml_file_node)
+    xml_file_node.add_element("versioninfo", pe_hdr.versioninfo) if @opts.versioninfo && pe_hdr.versioninfo.present?
+    xml_file_node.add_element("libraries", "imports" => pe_hdr.getImportList) if @opts.imports && pe_hdr.imports.present?
+  rescue TypeError => err
+    $log.info "processFile: TypeError handling PEheader; skipping PEheader info"
+    $log.debug err.backtrace.join("\n")
+  end
+
   def isDir?(currFile)
     if @fs
       @fs.fileDirectory?(currFile)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest