manageiq-smartstate 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ef0a15e10489e8bc2a06cf1cf8a1732fc9cade
-  data.tar.gz: db6e93260808919d00578cfdfb1251fae213016d
+  metadata.gz: cd8eb1fbab5fe0cf25e935e7173c43f6cb928b36
+  data.tar.gz: 6254ef672dd4700f40da31c1b4c98d79b7217510
 SHA512:
-  metadata.gz: 6f85a2daa2ed024ef55f16bdf88ae9d713a4d0ca705fd4d57ddd13b0fdaa87d6f68273a6fc8b41f337bd6a63e4f4618a3c5348d073d6c8861362f9b1cb49eaf7
-  data.tar.gz: 68a90dea48f0a0ceefed907e16701c0fe495bfacc46652763046328c3acdc71a899aa4e6348c7bb9300f0ada79d56dd214fefcb41c5c62e1fdb11a94e2474fa4
+  metadata.gz: eaa532b372c70837dfaf164ba463374a6235291e5517385469be72d95e6fc60dd3cdb957ac32d1f7ecdb14f87a372785bbe196a10a43d995129906203d38de89
+  data.tar.gz: bba8041436423755f0a234c566168a7831159da571605638290789a3f9e7246fdda6e75912a2bc9d3b50f1ef236fed74094c284369357a3fc4c2184326642951

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.5.4".freeze
+    VERSION = "0.5.5".freeze
   end
 end

data/lib/metadata/util/find_class_methods.rb

@@ -0,0 +1,132 @@
+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|
+      p = check_file(p, glob, flags)
+      p && block_given? ? yield(p) : ra << p
+    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.difference([".", ".."])
+    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.info "scan_glob: 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,7 +129,7 @@ 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
@@ -150,13 +157,14 @@ class MD5deep
         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 "processFile: TypeError handling PEheader; skipping PEheader info"
+    $log.info "process_pe_header: TypeError handling PEheader; skipping PEheader info"
     $log.debug err.backtrace.join("\n")
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - ManageIQ Developers
@@ -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