manageiq-smartstate 0.3.4 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0c4e0ae5df27aeb31c51bf3cd62249be2b2a53d8
-  data.tar.gz: d8dc954b070111eb849bf9c0b1af5c2e01b5ee7d
+SHA256:
+  metadata.gz: f517cfb3cafa62840376ce516426e2af1b2180a8733cca57f0e6e212a1596f0f
+  data.tar.gz: b443f7a19ecfdfafc1c50432853fa22f789c33674f99cb54873dda3cb21b85ac
 SHA512:
-  metadata.gz: e59d6441ae21c768e7b25e046dd66395638d21845a4b8465a7c19b0c15a04c43aeaa7a7b0820d483a81562c77726f894a2b82fd39e59ac36e5391e734a3cb66c
-  data.tar.gz: fef77f29b8e8f2409c0320ea7463d8cd1ccb55fcb31b9cfcad3e187f300b784999b0d94736617b8084db7ea337a30185f08a4183e5bcdf8b73ad6270a5bf8e2c
+  metadata.gz: 807d2fb11644d303a15818020dfed093e28a5111f0bd3ec4944f6ee4ee42b6b8cb626f7322d6b59c78db84056d6665332c5f35fdc1011e15955f5bc458b7631b
+  data.tar.gz: 20e52907b15cf35f57a9f90104a0323b1ff3406b86668b54ed22db68e7408ac9c3cb9efbcb7468742b09c2c3e25add71979583253e658b714577125ff28548fc

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in manageiq-smartstate.gemspec
 gemspec
 
-gem "manageiq-gems-pending", :git => "https://github.com/ManageIQ/manageiq-gems-pending.git", :branch => "master"
+gem "manageiq-gems-pending", :git => "https://github.com/ManageIQ/manageiq-gems-pending.git", :branch => "ivanchuk"
 
 # Modified gems for vmware_web_service.  Setting sources here since they are git references
 gem "handsoap", "~>0.2.5", :require => false, :git => "https://github.com/ManageIQ/handsoap.git", :tag => "v0.2.5-5"

data/lib/fs/modules/LinuxMount.rb

@@ -309,23 +309,27 @@ module LinuxMount
     #
     components.each do |c|
       ncp = File.join(cp, c)
-      #
-      # Each file system know how to check for,
-      # and read its own links.
-      #
-      fs, lp = getFsPathBase(ncp)
-      if fs.fileSymLink?(lp)
-        sl = getSymLink(fs, lp)
-        if sl[0, 1] == '/'
-          cp = sl
-        else
-          cp = File.join(cp, sl)
-        end
+      cp = follow_all_symlinks(ncp)
+    end
+    cp
+  end
+
+  def follow_all_symlinks(link_ptr)
+    #
+    # Each filesystem knows how to check for,
+    # and read its own links.
+    #
+    no_more_links = false
+    until no_more_links
+      filesys, tmp_link_ptr = getFsPathBase(link_ptr)
+      if filesys.fileSymLink?(tmp_link_ptr)
+        symlink = getSymLink(filesys, tmp_link_ptr)
+        link_ptr = symlink[0, 1] == '/' ? symlink : File.join(File.dirname(link_ptr), symlink)
       else
-        cp = ncp
+        no_more_links = true
       end
     end
-    (cp)
+    link_ptr
   end
 
   def getSymLink(fs, p)

data/lib/fs/ntfs/data_run.rb

@@ -282,7 +282,7 @@ module NTFS
 
       @runSpec.each_slice(2) do |lcn, len|
         total_clusters += len
-        next unless total_clusters > start_vcn
+        next unless lcn && len && total_clusters > start_vcn
 
         start = lcn + (vcn - (total_clusters - len))
         count = len - (start - lcn)

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.3.4".freeze
+    VERSION = "0.3.9".freeze
   end
 end

data/lib/metadata/util/find_class_methods.rb

@@ -0,0 +1,133 @@
+module FindClassMethods
+  # Return directory entries matching specified glob pattern
+  #
+  # @param glob_pattern [String] pattern to match
+  # @param flags [Integer] file match flags
+  # @yield block invoked with each match if specified
+  #
+  # @see VfsRealFile.fnmatch
+  # @see FindClassMethods#dir_and_glob which does most of the work regarding globbing
+  # @see FindClassMethods#find which retrieves stats information & dir entries for found files
+  #
+  def self.glob(glob_pattern, filesys, flags = 0)
+    @fs = filesys
+    return [] unless (glob = dir_and_glob(glob_pattern))
+
+    ra = []
+    find(@search_path, glob_depth(glob)) do |p|
+      if (p = check_file(p, glob, flags))
+        block_given? ? yield(p) : ra << p
+      end
+    end
+    ra.sort_by(&:downcase)
+  end
+
+  #
+  # Determine if the file returned from "find" will be used or skipped.
+  #
+  def self.check_file(file, glob, flags)
+    return nil if file == @search_path
+
+    if @search_path == File::SEPARATOR
+      file.sub!(File::SEPARATOR, "")
+    else
+      file.sub!("#{@search_path}#{File::SEPARATOR}", "")
+    end
+
+    return nil if file == "" || !File.fnmatch(glob, file, flags)
+
+    @specified_path ? File.join(@specified_path, file) : file
+  end
+
+  #
+  # Modified version of Find.find:
+  # - Accepts only a single path.
+  # - Can be restricted by depth - optimization for glob searches.
+  #
+  # @param path [String] starting directory of the find
+  # @param max_depth [Integer] max number of levels to decend befroelookup
+  # @yield files found
+  #
+  def self.find(path, max_depth = nil)
+    block_given? || (return enum_for(__method__, path, max_depth))
+
+    depths = [0]
+    paths  = [path.dup]
+
+    while (file = paths.shift)
+      depth = depths.shift
+      yield file.dup.taint
+      next if max_depth && depth + 1 > max_depth
+
+      get_dir_entries(file).each do |f|
+        f = File.join(file, f)
+        paths.unshift f.untaint
+        depths.unshift depth + 1
+      end
+    end
+  end
+
+  def self.get_dir_entries(directory)
+    return [] unless @fs.fileExists?(directory) && @fs.fileDirectory?(directory)
+
+    files = @fs.dirEntries(directory)
+    files -= [".", ".."]
+    files.sort!
+    files.reverse_each
+  rescue Errno::ENOENT, Errno::EACCES, Errno::ENOTDIR, Errno::ELOOP, Errno::ENAMETOOLONG
+    $log.info "find: while-loop @fs.dirEntries #{directory} returned an error"
+    []
+  end
+
+  GLOB_CHARS = '*?[{'.freeze
+  def self.glob_str?(str)
+    str.gsub(/\\./, "X").count(GLOB_CHARS) != 0
+  end
+
+  # Returns files matching glob pattern
+  #
+  # @api private
+  # @param glob_pattern [String,Regex] pattern to search for
+  # @return [String] paths to files found
+  #
+  def self.dir_and_glob(glob_pattern)
+    stripped_path   = glob_pattern.sub(/^[a-zA-Z]:/, "")
+    glob_path       = Pathname.new(stripped_path)
+    @search_path    = File::SEPARATOR
+    @specified_path = File::SEPARATOR
+
+    unless glob_path.absolute?
+      @search_path    = Dir.getwd
+      @specified_path = nil
+    end
+
+    components   = path_components(glob_path)
+    @search_path = File.expand_path(@search_path, "/")
+    @fs.fileExists?(@search_path) ? File.join(components) : nil
+  end
+
+  def self.path_components(glob_path, search_path = @search_path)
+    components = glob_path.each_filename.to_a
+    while (comp = components.shift)
+      if glob_str?(comp)
+        components.unshift(comp)
+        break
+      end
+      @search_path = File.join(search_path, comp)
+      @specified_path = @specified_path ? File.join(@specified_path, comp) : comp
+    end
+    components
+  end
+
+  # Return max levels which glob pattern may resolve to
+  #
+  # @api private
+  # @param glob_pattern [String,Regex] pattern to search for
+  # @return [Integer] max levels which pattern may match
+  def self.glob_depth(glob_pattern)
+    path_components = Pathname(glob_pattern).each_filename.to_a
+    return nil if path_components.include?('**')
+
+    path_components.length
+  end
+end

data/lib/metadata/util/md5deep.rb

@@ -1,6 +1,7 @@
 require 'time'
 require 'metadata/util/win32/peheader'
 require 'metadata/util/win32/versioninfo'
+require 'metadata/util/find_class_methods'
 require 'util/miq-xml'
 require 'ostruct'
 require 'util/miq-encode'
@@ -54,29 +55,35 @@ class MD5deep
   def scan_glob(filename)
     filename.tr!("\\", "/")
     startDir = File.dirname(filename)
-    globPattern = File.basename(filename)
     @xml.root.add_attribute("base_path", startDir)
-    @fs.chdir(startDir)
+    path_prefix = startDir[0, 2]
+    @drive_letter = path_prefix.match?(/^\w\:/) ? path_prefix : ""
 
     # First check if we are passed a fully qualifed file name
     if @fs.fileExists?(filename)
-      isDir?(filename) ? process_dir_as_file(startDir, globPattern, @xml.root) : processFile(startDir, globPattern, @xml.root)
+      base_file = File.basename(filename)
+      isDir?(filename) ? process_dir_as_file(startDir, base_file, @xml.root) : processFile(startDir, base_file, @xml.root)
     else
       # If the file is not found then process the data as a glob pattern.
-      @fs.dirGlob(globPattern) do |f|
-        # $log.info "Glob file found: [#{f}]"
-        # Passing "startDir" as the first parameter is a work-around for issues
-        # when scanning Win VMs from Linux where the path returned from dirGlob
-        # do not include the drive letter.
-        # Below is the original line
-        # processFile(File.dirname(f), File.basename(f), @xml.root)
-        processFile(startDir, File.basename(f), @xml.root)
-      end
+      process_each_glob_file(filename)
     end
     @xml
   end
 
+  def process_each_glob_file(file_name)
+    FindClassMethods.glob(file_name, @fs) do |f|
+      # Passing "startDir" as the first parameter is a work-around for issues
+      # when scanning Win VMs from Linux where the path returned from dirGlob
+      # do not include the drive letter.
+      processFile(File.dirname(f), File.basename(f), @xml.root)
+    end
+  rescue => err
+    $log.error "process_each_glob_file: Exception #{err} rescued"
+    $log.debug err.backtrace.join("\n")
+  end
+
   def read_fs(path, xmlNode)
+    @drive_letter = @drive_letter.nil? ? "" : @drive_letter
     if @fs
       @fs.dirForeach(path)  { |x| processFile(path, x, xmlNode) }
       @fs.dirForeach(path)  { |x| processDir(path,  x, xmlNode) }
@@ -91,7 +98,7 @@ class MD5deep
 
   def processDir(path, x, xmlNode)
     if x != "." && x != ".."
-      currFile = File.join(path, x)
+      currFile = File.join(@drive_letter, path, x)
 
       begin
         if File.directory?(currFile)
@@ -110,7 +117,7 @@ class MD5deep
 
   def process_dir_as_file(path, x, xml_node)
     if x != "." && x != ".."
-      curr_dir = File.join(path, x)
+      curr_dir = File.join(@drive_letter, path, x)
       if isDir?(curr_dir)
         xml_file_node = xml_node.add_element("file", "name" => x, "fqname" => curr_dir)
         stat_hash = {}
@@ -122,39 +129,43 @@ class MD5deep
 
   def processFile(path, x, xmlNode)
     if (@opts.exclude.include?(x) == false) && x[0..0] != "$"
-      currFile = File.join(path, x)
+      currFile = File.join(@drive_letter, path, x)
 
       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
+    $log.debug "processFile: finished @xml is #{@xml}"
+  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 "process_pe_header: TypeError handling PEheader; skipping PEheader info"
+    $log.debug err.backtrace.join("\n")
   end
 
   def isDir?(currFile)
@@ -215,10 +226,15 @@ class MD5deep
       # Create hash for requested digests
       digest = create_digest_hash
 
-      fileName.seek(0, IO::SEEK_SET)
-      # Loop over each digest and add the file contents
-      while buf = fileName.read(10240000)
-        digest.each_pair { |_k, v| v << buf }
+      begin
+        fileName.seek(0, IO::SEEK_SET)
+        # Loop over each digest and add the file contents
+        while (buf = fileName.read(10_240_000))
+          digest.each_pair { |_k, v| v << buf }
+        end
+      rescue => err
+        $log.error "Error #{err} reading file to calculate digest"
+        $log.debug err.backtrace.join("\n")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.9
 platform: ruby
 authors:
 - ManageIQ Developers
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-09 00:00:00.000000000 Z
+date: 2020-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: azure-armrest
@@ -263,7 +263,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.0.0
 description: ManageIQ SmartState Analysis
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -525,6 +525,7 @@ files:
 - lib/metadata/linux/MiqConaryPackages.rb
 - lib/metadata/linux/MiqRpmPackages.rb
 - lib/metadata/util/event_log_filter.rb
+- lib/metadata/util/find_class_methods.rb
 - lib/metadata/util/md5deep.rb
 - lib/metadata/util/win32/Win32Accounts.rb
 - lib/metadata/util/win32/Win32EventLog.rb
@@ -544,7 +545,7 @@ homepage: https://github.com/ManageIQ/manageiq-smartstate
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -559,9 +560,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: ManageIQ SmartState Analysis
 test_files: []