manageiq-smartstate 0.10.1 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 287bd411a014fb2fbf294e846486617f573730b3c14fa49a229e694f7e2dba74
-  data.tar.gz: 865841e4d859e72c3f0a5231c5c55bd8b1ebb1b58f720657772683a7b731c1af
+  metadata.gz: f38cf89d288bc86350bd4f5ec8c36e815acb87bf4f17d0f360223678241819dd
+  data.tar.gz: a9f67154e219a04b871400d9a4113d9e68ddf7ba2a7b782a81660017f414fd14
 SHA512:
-  metadata.gz: eaa83432959f0c5916064a88d01e894e8c4227ac85a1fee9744e7b83e1e153d617881651b822bd721692f8bc779c5e5652c73d001eb15dce74c986e48a234e3e
-  data.tar.gz: 3b5afd09407165a3948e745a77036537fa588786611cf2b2d4673ea5f7f012a4a627b9142d3c4deef8dc82081067ab20826a023d50c96f13cd1718ce659811bf
+  metadata.gz: 33a04e5b561bd8fa5367354de7941642e8ca8912fc4bf59d5c9cc9d386898fc57268d49b975988c6b6c8a260b765ac00af65987e5dd9a14825a45227fa01c0bf
+  data.tar.gz: bffa12eaf9fb6c9572954a8e279d3e85da9b40ba690ccd0cf5d11c0218226ebf6517d03c0206c54507ac6f8a6313802c3e661ea3ca5e85f22e277d57c6c45b58

data/.github/workflows/ci.yaml

@@ -11,12 +11,14 @@ jobs:
     strategy:
       matrix:
         ruby-version:
-        - '3.0'
         - '3.1'
+        - '3.3'
     env:
       CC_TEST_REPORTER_ID: "${{ secrets.CC_TEST_REPORTER_ID }}"
     steps:
     - uses: actions/checkout@v4
+    - name: Set up system
+      run: bin/before_install
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
@@ -26,6 +28,6 @@ jobs:
     - name: Run tests
       run: bundle exec rake
     - name: Report code coverage
-      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
+      if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.3' }}
       continue-on-error: true
       uses: paambaati/codeclimate-action@v9

data/bin/before_install

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ -n "$CI" ]; then
+  echo "== Installing system packages =="
+  sudo apt-get update
+  sudo apt-get install -y librpm-dev
+  echo
+fi

data/lib/OpenStackExtract/MiqOpenStackVm/MiqOpenStackImage.rb

@@ -33,6 +33,8 @@ class MiqOpenStackImage
 
   def miq_vm
     @miq_vm ||= begin
+      require "MiqVm/MiqVm"
+
       @temp_image_file = get_image_file
       hardware  = "scsi0:0.present = \"TRUE\"\n"
       hardware += "scsi0:0.filename = \"#{@temp_image_file.path}\"\n"

data/lib/OpenStackExtract/MiqOpenStackVm/MiqOpenStackInstance.rb

@@ -161,6 +161,8 @@ class MiqOpenStackInstance
   def miq_vm
     raise "Instance: #{instance.id}, does not have snapshot reference." unless snapshot_image_id
     @miq_vm ||= begin
+      require "MiqVm/MiqVm"
+
       @temp_image_file = get_image_file(snapshot_image_id)
       hardware  = "scsi0:0.present = \"TRUE\"\n"
       hardware += "scsi0:0.filename = \"#{@temp_image_file.path}\"\n"

data/lib/db/MiqSqlite/MiqSqlite3Table.rb

@@ -63,7 +63,7 @@ module MiqSqlite3DB
       return if @type != "table" || @name[0..6] == "sqlite_"  # Names beginning with sqlite_ are internal to engine
       @columns = []
       sql = @sql.gsub(/[\n\r]/, "")
-      re1 = /\s*CREATE\s+TABLE\s+(\w+)\s*\((.*)\)\s*/
+      re1 = /\s*CREATE\s+TABLE\s+'?(\w+)'?\s*\((.*)\)\s*/
       m = re1.match(sql)
       tname = m[1].to_s.chomp
       raise "Inconsistent Table Name" if tname != @name

data/lib/manageiq/smartstate/version.rb

@@ -1,5 +1,5 @@
 module ManageIQ
   module Smartstate
-    VERSION = "0.10.1".freeze
+    VERSION = "0.11.1".freeze
   end
 end

data/lib/metadata/linux/LinuxPackages.rb

@@ -6,7 +6,7 @@ require 'metadata/linux/MiqConaryPackages'
 
 module MiqLinux
   class Packages
-    attr_accessor :fs
+    attr_accessor :fs, :packages
     #
     # Debian based packageing.
     #
@@ -155,9 +155,13 @@ module MiqLinux
     #
     def procRPM(dbDir)
       $log.debug "Processing RPM package database"
-      rpmp = MiqRpmPackages.new(@fs, File.join(dbDir, "Packages"))
-      rpmp.each { |p| @packages << p }
-      rpmp.close
+
+      rpmp = MiqRpmPackages.new(@fs, dbDir)
+      begin
+        rpmp.each { |p| @packages << p }
+      ensure
+        rpmp.close
+      end
     end
 
     #

data/lib/metadata/linux/MiqRpmPackages/Bdb.rb

@@ -0,0 +1,151 @@
+require 'binary_struct'
+require 'manageiq/gems/pending'
+require 'util/miq-hash_struct'
+require 'db/MiqBdb/MiqBdb'
+require 'miq_unicode'
+
+class MiqRpmPackages
+  class Bdb < MiqRpmPackages
+    using ManageIQ::UnicodeString
+
+    #
+    # The data types we support.
+    #
+    RPM_INT32_TYPE          =  4
+    RPM_STRING_TYPE         =  6
+    RPM_STRING_ARRAY_TYPE   =  8
+    RPM_I18NSTRING_TYPE     =  9
+
+    #
+    # The things we care about.
+    #
+    NAME        = 1000
+    VERSION     = 1001
+    RELEASE     = 1002
+    SUMMARY     = 1004
+    DESCRIPTION = 1005
+    BUILDTIME   = 1006
+    INSTALLTIME = 1008
+    VENDOR      = 1011
+    GROUP       = 1016
+    URL         = 1020
+    ARCH        = 1022
+    REQUIRES    = 1049
+
+    TAGIDS = {
+      1000 => "name",
+      1001 => "version",
+      1002 => "release",
+      1004 => "summary",
+      1005 => "description",
+      1006 => "buildtime",
+      1008 => "installtime",
+      1011 => "vendor",
+      1016 => "category",  # group
+      1020 => "url",
+      1022 => "arch",
+      1049 => "depends",   # requires
+    }
+
+    #
+    # Nubbers on disk are in network byte order.
+    #
+    RPML_HEADER = BinaryStruct.new([
+      'N',        'num_index',
+      "N",        'num_data'
+    ])
+    RPML_HEADER_LEN = RPML_HEADER.size
+
+    ENTRY_INFO = BinaryStruct.new([
+      'N',        'tag',
+      'N',        'ttype',
+      'N',        'offset',
+      'N',        'count'
+    ])
+    ENTRY_INFO_LEN = ENTRY_INFO.size
+
+    def initialize(fs, dbFile)
+      @pkgDb = MiqBerkeleyDB::MiqBdb.new(dbFile, fs)
+      # Pre-read all pages into the bdb cache, as we will be processing all of them anyway.
+      @pkgDb.readAllPages
+    end
+
+    def each
+      @pkgDb.each_value do |v|
+        next if v.length <= RPML_HEADER_LEN
+
+        hdr = RPML_HEADER.decode(v)
+
+        offset = RPML_HEADER_LEN + (ENTRY_INFO_LEN * hdr['num_index'])
+        if v.length != offset + hdr['num_data']
+          $log.debug "record length = #{v.length}"
+          $log.debug "num_index = #{hdr['num_index']}"
+          $log.debug "num_data = #{hdr['num_data']}"
+          $log.error "Invalid or corrupt RPM database record"
+          next
+        end
+
+        data = v[offset, hdr['num_data']]
+        pkg = {}
+
+        eis = ENTRY_INFO.decode(v[RPML_HEADER_LEN..-1], hdr['num_index'])
+        eis.each do |ei|
+          tag = TAGIDS[ei['tag']]
+          next if tag.nil?
+          pkg[tag] = getVal(data, ei)
+          pkg[tag] = convert(tag, pkg[tag])
+        end
+        pkg['installed'] = true unless pkg.empty?
+        yield(MiqHashStruct.new(pkg))
+      end
+    end # def each
+
+    def close
+      @pkgDb.close
+    end
+
+    private
+
+    def time_tag?(tag)
+      ['installtime', 'buildtime'].include?(tag)
+    end
+
+    def convert(tag, val)
+      time_tag?(tag) ? Time.at(val).utc : val
+    end
+
+    def getVal(data, ei)
+      case ei['ttype']
+      when RPM_INT32_TYPE         then return(getInt32Val(data, ei['offset']))
+      when RPM_STRING_TYPE        then return(getStringVal(data, ei['offset']))
+      when RPM_STRING_ARRAY_TYPE  then return(getStringArray(data, ei['offset'], ei['count']).join("\n"))
+      when RPM_I18NSTRING_TYPE    then return(getStringArray(data, ei['offset'], ei['count']).join("\n").AsciiToUtf8)
+      else
+        $log.warn "MiqRpmPackages.getVal: unsupported data type: #{ei['ttype']}"
+        return("")
+      end
+    end
+
+    def getInt32Val(data, offset)
+      (data[offset, 4].unpack("N").first)
+    end
+
+    def getStringVal(data, offset)
+      eos = data.index(0.chr, offset) - offset
+      (data[offset, eos])
+    end
+
+    def getStringArray(data, offset, count)
+      ra = []
+      cpos = offset
+
+      count.times do
+        s = getStringVal(data, cpos)
+        ra << s
+        cpos += (s.length + 1)
+      end
+      ra.uniq!
+      (ra)
+    end
+  end
+end

data/lib/metadata/linux/MiqRpmPackages/Sqlite.rb

@@ -0,0 +1,58 @@
+require "tmpdir"
+
+class MiqRpmPackages
+  class Sqlite < MiqRpmPackages
+    def initialize(fs, dbFile)
+      require "rpm"
+
+      @fs           = fs
+      @db_file_path = dbFile
+
+      @rpmdb_tempdir = nil
+      @rpmdb_path    = nil
+
+      if fs.nil?
+        @rpmdb_path = @db_file_path
+      else
+        @rpmdb_tempdir = Dir.mktmpdir("rpmdb-")
+        rpmdb_dir = File.join(@rpmdb_tempdir, RPM['_dbpath'])
+        FileUtils.mkdir_p(rpmdb_dir)
+
+        rpmdb_tempfile = File.open(File.join(rpmdb_dir, "rpmdb.sqlite"), "wb")
+        rpmdb_file     = fs.fileOpen(@db_file_path, "r")
+
+        loop do
+          chunk = rpmdb_file.read(4_096)
+          break if chunk.nil?
+
+          rpmdb_tempfile.write(chunk)
+        end
+
+        rpmdb_tempfile.close
+        rpmdb_file.close
+
+        @rpmdb_path = rpmdb_tempfile.path
+      end
+    end
+
+    def each
+      RPM.transaction(@rpmdb_tempdir) do |ts|
+        ts.each do |pkg|
+          tagids = %w[name version release summary description buildtime vendor arch installtime]
+
+          result = tagids.each_with_object({}) { |tag, obj| obj[tag] = pkg[tag.to_sym] }
+          # These have different tag names for the tagid
+          result["category"]  = pkg[:group]
+          result["depends"]   = pkg[:requirename]&.join("\n")
+          result["installed"] = true unless result.empty?
+
+          yield MiqHashStruct.new(result)
+        end
+      end
+    end
+
+    def close
+      FileUtils.rm_rf(@rpmdb_tempdir) if @rpmdb_tempdir
+    end
+  end
+end

data/lib/metadata/linux/MiqRpmPackages.rb

@@ -1,152 +1,29 @@
-require 'binary_struct'
-require 'manageiq/gems/pending'
-require 'util/miq-hash_struct'
-require 'db/MiqBdb/MiqBdb'
-require 'miq_unicode'
 
-# RPM Specification located at: http://jrpm.sourceforge.net/rpmspec/index.html
-
-class MiqRpmPackages
-  using ManageIQ::UnicodeString
-
-  #
-  # The data types we support.
-  #
-  RPM_INT32_TYPE          =  4
-  RPM_STRING_TYPE         =  6
-  RPM_STRING_ARRAY_TYPE   =  8
-  RPM_I18NSTRING_TYPE     =  9
 
-  #
-  # The things we care about.
-  #
-  NAME        = 1000
-  VERSION     = 1001
-  RELEASE     = 1002
-  SUMMARY     = 1004
-  DESCRIPTION = 1005
-  BUILDTIME   = 1006
-  INSTALLTIME = 1008
-  VENDOR      = 1011
-  GROUP       = 1016
-  URL         = 1020
-  ARCH        = 1022
-  REQUIRES    = 1049
-
-  TAGIDS = {
-    1000 => "name",
-    1001 => "version",
-    1002 => "release",
-    1004 => "summary",
-    1005 => "description",
-    1006 => "buildtime",
-    1008 => "installtime",
-    1011 => "vendor",
-    1016 => "category",  # group
-    1020 => "url",
-    1022 => "arch",
-    1049 => "depends",   # requires
-  }
+# RPM Specification located at: http://jrpm.sourceforge.net/rpmspec/index.html
 
-  #
-  # Nubbers on disk are in network byte order.
-  #
-  RPML_HEADER = BinaryStruct.new([
-    'N',        'num_index',
-    "N",        'num_data'
-  ])
-  RPML_HEADER_LEN = RPML_HEADER.size
+require_relative "MiqRpmPackages/Bdb"
+require_relative "MiqRpmPackages/Sqlite"
 
-  ENTRY_INFO = BinaryStruct.new([
-    'N',        'tag',
-    'N',        'ttype',
-    'N',        'offset',
-    'N',        'count'
-  ])
-  ENTRY_INFO_LEN = ENTRY_INFO.size
+class MiqRpmPackages
+  class << self
+    private
 
-  def initialize(fs, dbFile)
-    @pkgDb = MiqBerkeleyDB::MiqBdb.new(dbFile, fs)
-    # Pre-read all pages into the bdb cache, as we will be processing all of them anyway.
-    @pkgDb.readAllPages
+    alias orig_new new
   end
 
-  def each
-    @pkgDb.each_value do |v|
-      next if v.length <= RPML_HEADER_LEN
-
-      hdr = RPML_HEADER.decode(v)
-
-      offset = RPML_HEADER_LEN + (ENTRY_INFO_LEN * hdr['num_index'])
-      if v.length != offset + hdr['num_data']
-        $log.debug "record length = #{v.length}"
-        $log.debug "num_index = #{hdr['num_index']}"
-        $log.debug "num_data = #{hdr['num_data']}"
-        $log.error "Invalid or corrupt RPM database record"
-        next
-      end
-
-      data = v[offset, hdr['num_data']]
-      pkg = {}
-
-      eis = ENTRY_INFO.decode(v[RPML_HEADER_LEN..-1], hdr['num_index'])
-      eis.each do |ei|
-        tag = TAGIDS[ei['tag']]
-        next if tag.nil?
-        pkg[tag] = getVal(data, ei)
-        pkg[tag] = convert(tag, pkg[tag])
+  def self.new(fs, dbDir)
+    if self == MiqRpmPackages
+      if fs.fileExists?(File.join(dbDir, "Packages"))
+        MiqRpmPackages::Bdb.new(fs, File.join(dbDir, "Packages"))
+      elsif fs.fileExists?(File.join(dbDir, "rpmdb.sqlite"))
+        MiqRpmPackages::Sqlite.new(fs, File.join(dbDir, "rpmdb.sqlite"))
+      else
+        raise ArgumentError, "Invalid RPM database"
       end
-      pkg['installed'] = true unless pkg.empty?
-      yield(MiqHashStruct.new(pkg))
-    end
-  end # def each
-
-  def close
-    @pkgDb.close
-  end
-
-  private
-
-  def time_tag?(tag)
-    ['installtime', 'buildtime'].include?(tag)
-  end
-
-  def convert(tag, val)
-    time_tag?(tag) ? Time.at(val).utc : val
-  end
-
-  def getVal(data, ei)
-    case ei['ttype']
-    when RPM_INT32_TYPE         then return(getInt32Val(data, ei['offset']))
-    when RPM_STRING_TYPE        then return(getStringVal(data, ei['offset']))
-    when RPM_STRING_ARRAY_TYPE  then return(getStringArray(data, ei['offset'], ei['count']).join("\n"))
-    when RPM_I18NSTRING_TYPE    then return(getStringArray(data, ei['offset'], ei['count']).join("\n").AsciiToUtf8)
     else
-      $log.warn "MiqRpmPackages.getVal: unsupported data type: #{ei['ttype']}"
-      return("")
-    end
-  end
-
-  def getInt32Val(data, offset)
-    (data[offset, 4].unpack("N").first)
-  end
-
-  def getStringVal(data, offset)
-    eos = data.index(0.chr, offset) - offset
-    (data[offset, eos])
-  end
-
-  def getStringArray(data, offset, count)
-    ra = []
-    cpos = offset
-
-    count.times do
-      s = getStringVal(data, cpos)
-      ra << s
-      cpos += (s.length + 1)
+      orig_new(fs, dbDir)
     end
-    ra.uniq!
-    (ra)
   end
 end # class MiqRPM
 

data/lib/metadata/util/find_class_methods.rb

@@ -56,12 +56,12 @@ module FindClassMethods
 
     while (file = paths.shift)
       depth = depths.shift
-      yield file.dup.taint
+      yield file.dup
       next if max_depth && depth + 1 > max_depth
 
       get_dir_entries(file).each do |f|
         f = File.join(file, f)
-        paths.unshift f.untaint
+        paths.unshift f
         depths.unshift depth + 1
       end
     end

data/manageiq-smartstate.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activesupport"
+  spec.add_dependency "activesupport",      ">= 7.0.8", "<8.0"
   spec.add_dependency "awesome_spawn",      "~> 1.5"
   spec.add_dependency "azure-armrest",      "~> 0.9"
   spec.add_dependency "binary_struct",      "~> 2.1"
@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "linux_block_device", "~>0.2.1"
   spec.add_dependency "manageiq-password",  "< 2"
   spec.add_dependency "memory_buffer",      ">=0.1.0"
+  spec.add_dependency "rpm2",               "~>0.1.0"
   spec.add_dependency "rufus-lru",          "~>1.0.3"
   spec.add_dependency "sys-uname",          "~>1.2.1"
   spec.add_dependency "uuidtools",          "~>2.1"

data/renovate.json

@@ -1,6 +1,5 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:recommended"
-  ]
+  "inheritConfig": true,
+  "inheritConfigRepoName": "manageiq/renovate-config"
 }

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: manageiq-smartstate
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.1
 platform: ruby
 authors:
 - ManageIQ Developers
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +15,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 7.0.8
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: awesome_spawn
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +127,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: rpm2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rufus-lru
   requirement: !ruby/object:Gem::Requirement
@@ -305,7 +324,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.1
 description: ManageIQ SmartState Analysis
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -323,6 +341,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/before_install
 - bin/console
 - bin/setup
 - lib/MiqContainerGroup/MiqContainerGroup.rb
@@ -553,6 +572,8 @@ files:
 - lib/metadata/linux/LinuxUtils.rb
 - lib/metadata/linux/MiqConaryPackages.rb
 - lib/metadata/linux/MiqRpmPackages.rb
+- lib/metadata/linux/MiqRpmPackages/Bdb.rb
+- lib/metadata/linux/MiqRpmPackages/Sqlite.rb
 - lib/metadata/util/event_log_filter.rb
 - lib/metadata/util/find_class_methods.rb
 - lib/metadata/util/md5deep.rb
@@ -579,7 +600,6 @@ homepage: https://github.com/ManageIQ/manageiq-smartstate
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -594,8 +614,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: ManageIQ SmartState Analysis
 test_files: []