manageiq-smartstate 0.5.9 → 0.7.0

data/lib/fs/iso9660/rock_ridge.rb

@@ -1,7 +1,9 @@
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 module Iso9660
+  using ManageIQ::UnicodeString
+
   # SUSP extensions are present if the first two characters of the SUA of
   # the first directory entry are "SP". After SUSP is identified, if the
   # first two characters of any directory entry's SUA are "RR" a Rock Ridge

data/lib/fs/modules/LinuxMount.rb

@@ -321,9 +321,9 @@ module LinuxMount
     #
     no_more_links = false
     until no_more_links
-      filesys, link_ptr = getFsPathBase(link_ptr)
-      if filesys.fileSymLink?(link_ptr)
-        symlink = getSymLink(filesys, link_ptr)
+      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
         no_more_links = true

data/lib/fs/ntfs/attrib_attribute_list.rb

@@ -1,8 +1,10 @@
 require 'fs/ntfs/utils'
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 module NTFS
+  using ManageIQ::UnicodeString
+
   #
   # ATTR_LIST_ENTRY - Attribute: Attribute list (0x20).
   #

data/lib/fs/ntfs/attrib_file_name.rb

@@ -1,10 +1,12 @@
 require 'fs/ntfs/utils'
 require 'util/win32/nt_util'
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'fs/ntfs/attrib_standard_information'
 
 module NTFS
+  using ManageIQ::UnicodeString
+
   #
   # FILE_NAME_ATTR - Attribute: Filename (0x30)
   #

data/lib/fs/ntfs/attrib_header.rb

@@ -1,9 +1,11 @@
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'fs/ntfs/utils'
 require 'fs/ntfs/attrib_type'
 
 module NTFS
+  using ManageIQ::UnicodeString
+
   # Standard attribute header.
   # Each attribute begins with one of these.
   STANDARD_ATTRIBUTE_HEADER = BinaryStruct.new([

data/lib/fs/ntfs/attrib_index_root.rb

@@ -1,10 +1,12 @@
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'fs/ntfs/index_node_header'
 require 'fs/ntfs/directory_index_node'
 require 'fs/ntfs/index_record_header'
 
 module NTFS
+  using ManageIQ::UnicodeString
+
   #
   # INDEX_ROOT - Attribute: Index root (0x90).
   #

data/lib/fs/ntfs/attrib_object_id.rb

@@ -1,4 +1,4 @@
-require 'util/miq-uuid'
+require 'uuidtools'
 
 module NTFS
   # There is no real data definition for this class - it consists entirely of GUIDs.

data/lib/fs/ntfs/attrib_volume_name.rb

@@ -1,6 +1,8 @@
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 module NTFS
+  using ManageIQ::UnicodeString
+
   #
   # VOLUME_NAME - Attribute: Volume name (0x60).
   #

data/lib/fs/xfs/allocation_group.rb

@@ -1,5 +1,5 @@
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 require 'memory_buffer'
 require 'fs/xfs/superblock'

data/lib/fs/xfs/bmap_btree_block.rb

@@ -1,5 +1,5 @@
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 
 require 'rufus/lru'

data/lib/fs/xfs/superblock.rb

@@ -1,7 +1,7 @@
 # encoding: US-ASCII
 
 require 'binary_struct'
-require 'util/miq-uuid'
+require 'uuidtools'
 require 'stringio'
 require 'memory_buffer'
 require 'fs/xfs/allocation_group'

data/lib/manageiq/smartstate/util.rb

@@ -13,6 +13,24 @@ module ManageIQ
       rescue
         return uri_path
       end
+
+      def self.base24_decode(byte_array)
+        digits = %w(B C D F G H J K M P Q R T V W X Y 2 3 4 6 7 8 9)
+        out = " " * 29
+        out.length.downto(0) do |i|
+          if i.modulo(6) == 0
+            out[i, 1] = "-"
+          else
+            map_index = 0
+            15.downto(0) do |j|
+              byte_value = (map_index << 8) | byte_array[j]
+              byte_array[j], map_index = byte_value.divmod(24)
+              out[i, 1] = digits[map_index]
+            end
+          end
+        end
+        out[1..-1]
+      end
     end
   end
 end

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.5.9".freeze
+    VERSION = "0.7.0".freeze
   end
 end

data/lib/metadata/MIQExtract/MIQExtract.rb

@@ -1,4 +1,3 @@
-require 'MiqVm/MiqVm'
 require 'metadata/util/md5deep'
 require 'util/miq-xml'
 require 'ostruct'
@@ -100,7 +99,7 @@ class MIQExtract
         yield({:msg => 'Scanning Profile-Registry'}) if block_given?
 
         filters = []
-        reg_filters[:HKCU].to_miq_a.each { |f| filters << {:key => split_registry(f['key']).join('/'), :depth => f['depth']} }
+        Array.wrap(reg_filters[:HKCU]).each { |f| filters << {:key => split_registry(f['key']).join('/'), :depth => f['depth']} }
         @scanProfiles.parse_data(@target, RemoteRegistry.new(@systemFs, @xml_class).loadCurrentUser(filters)) unless filters.empty?
 
         filters = {}
@@ -127,7 +126,7 @@ class MIQExtract
 
   def extract(category, &blk)
     xml = nil
-    category.to_miq_a.each do |c|
+    Array.wrap(category.presence).each do |c|
       c = c.downcase
       xml = case c
             when "accounts" then getAccounts(c)

data/lib/metadata/VmConfig/GetNativeCfg.rb

@@ -1,12 +1,10 @@
 require 'util/miq-xml'
-require 'util/runcmd'
 require 'metadata/VmConfig/VmConfig'
+require 'awesome_spawn'
 
 class GetNativeCfg
-  LSHW = "lshw"
-
   def self.new
-    lshwXml = MiqUtil.runcmd("#{LSHW} -xml")
+    lshwXml = AwesomeSpawn.run!("lshw", :params => ["-xml"], :combined_output => true).output
     nodeHash = Hash.new { |h, k| h[k] = [] }
     doc = MiqXml.load(lshwXml)
     doc.find_match("//node").each { |n| nodeHash[n.attributes["id"].split(':', 2)[0]] << n }

data/lib/metadata/VmConfig/VmConfig.rb

@@ -1,6 +1,6 @@
 require 'pathname'
 require 'metadata/VMMount/VMMount'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'util/miq-xml'
 require 'VMwareWebService/MiqVimInventory'
 require 'timeout'
@@ -8,6 +8,8 @@ require 'util/miq-extensions'
 require 'VMwareWebService/MiqVimBroker'
 
 class VmConfig
+  using ManageIQ::UnicodeString
+
   attr_reader :configFile
 
   def initialize(filename)
@@ -364,7 +366,7 @@ class VmConfig
 
   def resolve_ds_path(filename)
     # TODO: Determine if we need to do any work here.
-    ds, dir, name = split_filename(filename)
+    ds, _dir, _name = split_filename(filename)
     return filename unless ds.nil?
 
     @ds_replace ||= {}
@@ -373,7 +375,7 @@ class VmConfig
     end
 
     ds_filename = resolve_ds_path_with_vim(filename)
-    ds, dir, name = split_filename(ds_filename)
+    ds, dir, _name = split_filename(ds_filename)
     unless ds.nil?
       idx = filename.index(dir)
       replaced_str = filename[0, idx]
@@ -498,7 +500,7 @@ class VmConfig
   end
 
   def rhevm_disk_file_entry(disk)
-    storage_id = disk.storage_domains.first&.id
+    storage_id = disk.storage_domains&.first&.id
     disk_id = disk.image_id || disk.id
     full_path = storage_id && File.join('/dev', storage_id, disk_id)
     {:path => full_path, :name => disk_id, :size => disk.actual_size.to_i}
@@ -550,7 +552,7 @@ class VmConfig
         elsif miqvm.rhevmVm
           disks = miqvm.rhevm.collect_vm_disks(miqvm.rhevmVm)
           disks.each do |disk|
-            storage_id = disk.storage_domains.first&.id
+            storage_id = disk.storage_domains&.first&.id
             disk_id = disk.image_id || disk.id
             full_path = storage_id && File.join('/dev', storage_id, disk_id)
             d = {:path => full_path, :name => disk.name.to_s, :size => disk.actual_size.to_i}

data/lib/metadata/VmConfig/cfgConfig.rb

@@ -1,4 +1,8 @@
+require 'miq_unicode'
+
 module CfgConfig
+  using ManageIQ::UnicodeString
+
   def convert(filename)
     @convertText = ""
     $log.debug "Processing Windows Configuration file [#{filename}]"

data/lib/metadata/VmConfig/xmlConfig.rb

@@ -1,5 +1,5 @@
 require 'util/miq-xml'
-require 'util/runcmd'
+require 'awesome_spawn'
 
 module XmlConfig
   def convert(filename)
@@ -12,9 +12,9 @@ module XmlConfig
       if Sys::Platform::IMPL == :linux
         begin
           # First check to see if the command is available
-          MiqUtil.runcmd("virsh list")
+          AwesomeSpawn.run!("virsh", :params => ["list"])
           begin
-            xml_data = MiqUtil.runcmd("virsh dumpxml #{File.basename(filename, ".*")}")
+            xml_data = AwesomeSpawn.run!("virsh", :params => ["dumpxml", File.basename(filename, ".*")], :combined_output => true).output
           rescue => err
             $log.error "#{err}\n#{err.backtrace.join("\n")}"
           end

data/lib/metadata/linux/MiqRpmPackages.rb

@@ -1,11 +1,13 @@
 require 'binary_struct'
 require 'util/miq-hash_struct'
 require 'db/MiqBdb/MiqBdb'
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 # RPM Specification located at: http://jrpm.sourceforge.net/rpmspec/index.html
 
 class MiqRpmPackages
+  using ManageIQ::UnicodeString
+
   #
   # The data types we support.
   #

data/lib/metadata/util/md5deep.rb

@@ -13,6 +13,8 @@ class MD5deep
   def initialize(fs = nil, options = {})
     @fullFileCount = 0
     @fullDirCount = 0
+    @drive_letter = nil
+
     # Create XML document
     @xml = XmlHash.createDoc(:filesystem)
     @fs = fs.kind_of?(MiqFS) ? fs : nil
@@ -179,9 +181,9 @@ class MD5deep
 
   def fileOpen(currFile)
     if @fs
-      fh = @fs.fileOpen(currFile)
+      @fs.fileOpen(currFile)
     else
-      fh = File.open(currFile)
+      File.open(currFile)
     end
   end
 

data/lib/metadata/util/win32/Win32Accounts.rb

@@ -2,8 +2,11 @@
 
 require 'util/miq-xml'
 require 'enumerator'
+require 'miq_unicode'
 
 module MiqWin32
+  using ManageIQ::UnicodeString
+
   class Accounts
     attr_reader :users, :groups
 

data/lib/metadata/util/win32/Win32EventLog.rb

@@ -19,13 +19,15 @@ require 'digest/md5'
 
 # Common utilities.
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'util/miq-xml'
 require 'util/miq-exception'
 
 require 'metadata/util/event_log_filter'
 
 class Win32EventLog
+  using ManageIQ::UnicodeString
+
   # Standard file log names
   SYSTEM_LOGS = %w(Application System Security)
   BUFFER_READ_SIZE = 10485760  # 10 MB buffer
@@ -684,8 +686,8 @@ class Win32EventLog
       reg.each_key do |subKey, _wtime|
         subpath = "#{src}\\#{subKey}"
         subKey.downcase!
-        Win32::Registry::HKEY_LOCAL_MACHINE.open(subpath) do |reg|
-          reg.each_value do |name, _type, data|
+        Win32::Registry::HKEY_LOCAL_MACHINE.open(subpath) do |subreg|
+          subreg.each_value do |name, _type, data|
             case name
             when 'EventMessageFile', 'ParameterMessageFile', 'CategoryMessageFile' then
               fn = data.to_s

data/lib/metadata/util/win32/Win32Software.rb

@@ -251,11 +251,13 @@ module MiqWin32
     end
 
     def self.DecodeProductKey(product_key)
-      return if product_key.blank? || product_key.length < 67
-      y = []; product_key.split(",")[52..67].each { |b| y << b.hex }
-      return MIQEncode.base24Decode(y)
+      parts = product_key.to_s.split(",")
+      return if parts.length < 67
+
+      ManageIQ::Smartstate::Util.base24_decode(parts[52..67].map(&:hex))
     rescue => err
       $log.error "MIQ(DecodeProductKey): [#{err}]"
+      nil
     end
 
     private

data/lib/metadata/util/win32/fleece_hives.rb

@@ -92,14 +92,6 @@ class FleeceHives
     xmlCol
   end
 
-  def self.DecodeProductKey(product_key)
-    return if product_key.blank? || product_key.length < 67
-    y = []; product_key.split(",")[52..67].each { |b| y << b.hex }
-    return MIQEncode.base24Decode(y)
-  rescue => err
-    $log.error "MIQ(OS-DecodeProductKey): [#{err}]"
-  end
-
   def self.collectProductKeys(_xml, xmlCol, regHnd)
     prodKeys = MIQRexml.findElement("software/productkeys", xmlCol.root)
     regHnd.digitalProductKeys.each do |e|

data/lib/metadata/util/win32/ms-registry.rb

@@ -1,7 +1,7 @@
 # encoding: US-ASCII
 
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 require 'enumerator'
 require 'util/miq-xml'
 require 'util/xml/xml_hash'
@@ -13,6 +13,8 @@ DEBUG_LOG_PERFORMANCE = false
 DEBUG_FILE_READS = false
 
 class MSRegHive
+  using ManageIQ::UnicodeString
+
   attr_reader :fileLoadTime, :fileParseTime, :digitalProductKeys, :xmlNode
 
   # Size of the HBIN data (as well as initiale REGF) segments

data/lib/metadata/util/win32/peheader.rb

@@ -1,9 +1,8 @@
 # encoding: US-ASCII
 
 require 'stringio'
-
 require 'binary_struct'
-require 'util/miq-unicode'
+require 'miq_unicode'
 
 # Notes:
 #       The peheader object member 'icons' is an array of icons in the file. Sub 0 is the application
@@ -12,11 +11,11 @@ require 'util/miq-unicode'
 #       to open them and display each resolution contained in the icon (if more than one).
 
 class PEheader
+  using ManageIQ::UnicodeString
+
   IMAGE_NT_SIGNATURE = "PE\0\0"
   IMAGE_DOS_SIGNATURE = "MZ"
 
-  attr_reader :imports, :icons, :messagetables, :versioninfo
-
   def initialize(path)
     @fname = path
     @dataDirs = []
@@ -91,19 +90,19 @@ class PEheader
   end
 
   def imports
-    @import_array ||= getImports
+    @imports ||= getImports
   end
 
   def icons
-    @icon_array ||= getIcons(@fBuf)
+    @icons ||= getIcons(@fBuf)
   end
 
   def messagetables
-    @messagetable_hash ||= getMessagetables
+    @messagetables ||= getMessagetables
   end
 
   def versioninfo
-    @versioninfo_array ||= getVersioninfo
+    @versioninfo ||= getVersioninfo
   end
 
   # //////////////////////////////////////////////////////////////////////////