ohai 14.15.0 → 15.0.35

data/lib/ohai/plugins/solaris2/dmi.rb

@@ -35,57 +35,57 @@ Ohai.plugin(:DMI) do
     # this is what the *real* IDs are:
     # pulled from http://src.opensolaris.org/source/xref/nwam/nwam1/usr/src/uts/common/sys/smbios.h
     smb_to_id = {
-      "SMB_TYPE_BIOS" =>         0, # BIOS information (R)
-      "SMB_TYPE_SYSTEM" =>       1, # system information (R)
-      "SMB_TYPE_BASEBOARD" =>    2, # base board
-      "SMB_TYPE_CHASSIS" =>      3, # system enclosure or chassis (R)
-      "SMB_TYPE_PROCESSOR" =>    4, # processor (R)
-      "SMB_TYPE_MEMCTL" =>       5, # memory controller (O)
-      "SMB_TYPE_MEMMOD" =>       6, # memory module (O)
-      "SMB_TYPE_CACHE" =>        7, # processor cache (R)
-      "SMB_TYPE_PORT" =>         8, # port connector
-      "SMB_TYPE_SLOT" =>         9, # upgradeable system slot (R)
-      "SMB_TYPE_OBDEVS" =>       10, # on-board devices
-      "SMB_TYPE_OEMSTR" =>       11, # OEM string table
-      "SMB_TYPE_SYSCONFSTR" =>   12, # system configuration string table
-      "SMB_TYPE_LANG" =>         13, # BIOS language information
-      "SMB_TYPE_GROUP" =>        14, # group associations
-      "SMB_TYPE_EVENTLOG" =>     15, # system event log
-      "SMB_TYPE_MEMARRAY" =>     16, # physical memory array (R)
-      "SMB_TYPE_MEMDEVICE" =>    17, # memory device (R)
-      "SMB_TYPE_MEMERR32" =>     18, # 32-bit memory error information
-      "SMB_TYPE_MEMARRAYMAP" =>  19, # memory array mapped address (R)
+      "SMB_TYPE_BIOS" => 0, # BIOS information (R)
+      "SMB_TYPE_SYSTEM" => 1, # system information (R)
+      "SMB_TYPE_BASEBOARD" => 2, # base board
+      "SMB_TYPE_CHASSIS" => 3, # system enclosure or chassis (R)
+      "SMB_TYPE_PROCESSOR" => 4, # processor (R)
+      "SMB_TYPE_MEMCTL" => 5, # memory controller (O)
+      "SMB_TYPE_MEMMOD" => 6, # memory module (O)
+      "SMB_TYPE_CACHE" => 7, # processor cache (R)
+      "SMB_TYPE_PORT" => 8, # port connector
+      "SMB_TYPE_SLOT" => 9, # upgradeable system slot (R)
+      "SMB_TYPE_OBDEVS" => 10, # on-board devices
+      "SMB_TYPE_OEMSTR" => 11, # OEM string table
+      "SMB_TYPE_SYSCONFSTR" => 12, # system configuration string table
+      "SMB_TYPE_LANG" => 13, # BIOS language information
+      "SMB_TYPE_GROUP" => 14, # group associations
+      "SMB_TYPE_EVENTLOG" => 15, # system event log
+      "SMB_TYPE_MEMARRAY" => 16, # physical memory array (R)
+      "SMB_TYPE_MEMDEVICE" => 17, # memory device (R)
+      "SMB_TYPE_MEMERR32" => 18, # 32-bit memory error information
+      "SMB_TYPE_MEMARRAYMAP" => 19, # memory array mapped address (R)
       "SMB_TYPE_MEMDEVICEMAP" => 20, # memory device mapped address (R)
-      "SMB_TYPE_POINTDEV" =>     21, # built-in pointing device
-      "SMB_TYPE_BATTERY" =>      22, # portable battery
-      "SMB_TYPE_RESET" =>        23, # system reset settings
-      "SMB_TYPE_SECURITY" =>     24, # hardware security settings
-      "SMB_TYPE_POWERCTL" =>     25, # system power controls
-      "SMB_TYPE_VPROBE" =>       26, # voltage probe
-      "SMB_TYPE_COOLDEV" =>      27, # cooling device
-      "SMB_TYPE_TPROBE" =>       28, # temperature probe
-      "SMB_TYPE_IPROBE" =>       29, # current probe
-      "SMB_TYPE_OOBRA" =>        30, # out-of-band remote access facility
-      "SMB_TYPE_BIS" =>          31, # boot integrity services
-      "SMB_TYPE_BOOT" =>         32, # system boot status (R)
-      "SMB_TYPE_MEMERR64" =>     33, # 64-bit memory error information
-      "SMB_TYPE_MGMTDEV" =>      34, # management device
-      "SMB_TYPE_MGMTDEVCP" =>    35, # management device component
-      "SMB_TYPE_MGMTDEVDATA" =>  36, # management device threshold data
-      "SMB_TYPE_MEMCHAN" =>      37, # memory channel
-      "SMB_TYPE_IPMIDEV" =>      38, # IPMI device information
-      "SMB_TYPE_POWERSUP" =>     39, # system power supply
-      "SMB_TYPE_ADDINFO" =>      40, # additional information
-      "SMB_TYPE_OBDEVEXT" =>     41, # on-board device extended info
-      "SMB_TYPE_MCHI" =>         42, # mgmt controller host interface
-      "SMB_TYPE_INACTIVE" =>     126, # inactive table entry
-      "SMB_TYPE_EOT" =>          127, # end of table
-      "SMB_TYPE_OEM_LO" =>       128, # start of OEM-specific type range
+      "SMB_TYPE_POINTDEV" => 21, # built-in pointing device
+      "SMB_TYPE_BATTERY" => 22, # portable battery
+      "SMB_TYPE_RESET" => 23, # system reset settings
+      "SMB_TYPE_SECURITY" => 24, # hardware security settings
+      "SMB_TYPE_POWERCTL" => 25, # system power controls
+      "SMB_TYPE_VPROBE" => 26, # voltage probe
+      "SMB_TYPE_COOLDEV" => 27, # cooling device
+      "SMB_TYPE_TPROBE" => 28, # temperature probe
+      "SMB_TYPE_IPROBE" => 29, # current probe
+      "SMB_TYPE_OOBRA" => 30, # out-of-band remote access facility
+      "SMB_TYPE_BIS" => 31, # boot integrity services
+      "SMB_TYPE_BOOT" => 32, # system boot status (R)
+      "SMB_TYPE_MEMERR64" => 33, # 64-bit memory error information
+      "SMB_TYPE_MGMTDEV" => 34, # management device
+      "SMB_TYPE_MGMTDEVCP" => 35, # management device component
+      "SMB_TYPE_MGMTDEVDATA" => 36, # management device threshold data
+      "SMB_TYPE_MEMCHAN" => 37, # memory channel
+      "SMB_TYPE_IPMIDEV" => 38, # IPMI device information
+      "SMB_TYPE_POWERSUP" => 39, # system power supply
+      "SMB_TYPE_ADDINFO" => 40, # additional information
+      "SMB_TYPE_OBDEVEXT" => 41, # on-board device extended info
+      "SMB_TYPE_MCHI" => 42, # mgmt controller host interface
+      "SMB_TYPE_INACTIVE" => 126, # inactive table entry
+      "SMB_TYPE_EOT" => 127, # end of table
+      "SMB_TYPE_OEM_LO" => 128, # start of OEM-specific type range
       "SUN_OEM_EXT_PROCESSOR" => 132, # processor extended info
-      "SUN_OEM_PCIEXRC" =>       138, # PCIE RootComplex/RootPort info
-      "SUN_OEM_EXT_MEMARRAY" =>  144, # phys memory array extended info
+      "SUN_OEM_PCIEXRC" => 138, # PCIE RootComplex/RootPort info
+      "SUN_OEM_EXT_MEMARRAY" => 144, # phys memory array extended info
       "SUN_OEM_EXT_MEMDEVICE" => 145, # memory device extended info
-      "SMB_TYPE_OEM_HI" =>       256, # end of OEM-specific type range
+      "SMB_TYPE_OEM_HI" => 256, # end of OEM-specific type range
     }
 
     # all output lines should fall within one of these patterns

data/lib/ohai/plugins/solaris2/virtualization.rb

@@ -22,6 +22,7 @@ Ohai.plugin(:Virtualization) do
   require "ohai/mixin/dmi_decode"
   include Ohai::Mixin::DmiDecode
   provides "virtualization"
+  depends "dmi"
 
   def collect_solaris_guestid
     command = "/usr/sbin/zoneadm list -p"
@@ -44,16 +45,13 @@ Ohai.plugin(:Virtualization) do
       end
     end
 
-    # Pass smbios information to the dmi_decode mixin to
-    # identify possible virtualization systems
-    smbios_path = Ohai.abs_path("/usr/sbin/smbios")
-    if File.exist?(smbios_path)
-      guest = guest_from_dmi(shell_out(smbios_path).stdout)
-      if guest
-        virtualization[:system] = guest
-        virtualization[:role] = "guest"
-        virtualization[:systems][guest.to_sym] = "guest"
-      end
+    # parse dmi to discover various virtualization guests
+    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version))
+    if guest
+      logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest")
+      virtualization[:system] = guest
+      virtualization[:role] = "guest"
+      virtualization[:systems][guest.to_sym] = "guest"
     end
 
     if File.executable?("/usr/sbin/zoneadm")

data/lib/ohai/plugins/virtualbox.rb

@@ -20,30 +20,30 @@ Ohai.plugin(:Virtualbox) do
   provides "virtualbox"
 
   collect_data do
-    begin
-      so = shell_out("VBoxControl guestproperty enumerate")
 
-      if so.exitstatus == 0
-        virtualbox Mash.new
-        virtualbox[:host] = Mash.new
-        virtualbox[:guest] = Mash.new
-        so.stdout.lines.each do |line|
-          case line
-          when /LanguageID, value: (\S*),/
-            virtualbox[:host][:language] = Regexp.last_match(1)
-          when /VBoxVer, value: (\S*),/
-            virtualbox[:host][:version] = Regexp.last_match(1)
-          when /VBoxRev, value: (\S*),/
-            virtualbox[:host][:revision] = Regexp.last_match(1)
-          when /GuestAdd\/VersionExt, value: (\S*),/
-            virtualbox[:guest][:guest_additions_version] = Regexp.last_match(1)
-          when /GuestAdd\/Revision, value: (\S*),/
-            virtualbox[:guest][:guest_additions_revision] = Regexp.last_match(1)
-          end
+    so = shell_out("VBoxControl guestproperty enumerate")
+
+    if so.exitstatus == 0
+      virtualbox Mash.new
+      virtualbox[:host] = Mash.new
+      virtualbox[:guest] = Mash.new
+      so.stdout.lines.each do |line|
+        case line
+        when /LanguageID, value: (\S*),/
+          virtualbox[:host][:language] = Regexp.last_match(1)
+        when /VBoxVer, value: (\S*),/
+          virtualbox[:host][:version] = Regexp.last_match(1)
+        when /VBoxRev, value: (\S*),/
+          virtualbox[:host][:revision] = Regexp.last_match(1)
+        when /GuestAdd\/VersionExt, value: (\S*),/
+          virtualbox[:guest][:guest_additions_version] = Regexp.last_match(1)
+        when /GuestAdd\/Revision, value: (\S*),/
+          virtualbox[:guest][:guest_additions_revision] = Regexp.last_match(1)
         end
       end
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin Virtualbox: Could not execute "VBoxControl guestproperty enumerate". Skipping data')
     end
+  rescue Ohai::Exceptions::Exec
+    logger.trace('Plugin Virtualbox: Could not execute "VBoxControl guestproperty enumerate". Skipping data')
+
   end
 end

data/lib/ohai/plugins/windows/filesystem.rb

@@ -23,8 +23,8 @@ Ohai.plugin(:Filesystem) do
   #
   # @see https://docs.microsoft.com/en-us/windows/desktop/SecProv/getconversionstatus-win32-encryptablevolume#parameters
   #
-  CONVERSION_STATUS ||= %w{FullyDecrypted FullyEncrypted EncryptionInProgress
-                           DecryptionInProgress EncryptionPaused DecryptionPaused}.freeze
+  CONVERSION_STATUS = %w{FullyDecrypted FullyEncrypted EncryptionInProgress
+                         DecryptionInProgress EncryptionPaused DecryptionPaused}.freeze
 
   # Returns a Mash loaded with logical details
   #

data/lib/ohai/plugins/windows/fips.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright (c) 2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2016-2018 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,30 +28,11 @@ Ohai.plugin(:Fips) do
   collect_data(:windows) do
     fips Mash.new
 
-    # Check for new fips_mode method added in Ruby 2.5. After we drop support
-    # for Ruby 2.4, clean up everything after this and collapse the FIPS plugins.
     require "openssl"
     if defined?(OpenSSL.fips_mode) && OpenSSL.fips_mode && !$FIPS_TEST_MODE
       fips["kernel"] = { "enabled" => true }
     else
-      require "win32/registry"
-      # from http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx
-      if ::RbConfig::CONFIG["target_cpu"] == "i386"
-        reg_type = Win32::Registry::KEY_READ | 0x100
-      elsif ::RbConfig::CONFIG["target_cpu"] == "x86_64"
-        reg_type = Win32::Registry::KEY_READ | 0x200
-      else
-        reg_type = Win32::Registry::KEY_READ
-      end
-
-      begin
-        Win32::Registry::HKEY_LOCAL_MACHINE.open('System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy', reg_type) do |policy|
-          enabled = policy["Enabled"]
-          fips["kernel"] = { "enabled" => enabled == 0 ? false : true }
-        end
-      rescue Win32::Registry::Error
-        fips["kernel"] = { "enabled" => false }
-      end
+      fips["kernel"] = { "enabled" => false }
     end
   end
 end

data/lib/ohai/plugins/windows/virtualization.rb

@@ -20,6 +20,8 @@
 
 Ohai.plugin(:Virtualization) do
   provides "virtualization"
+  require "ohai/mixin/dmi_decode"
+  include Ohai::Mixin::DmiDecode
 
   collect_data(:windows) do
     require "wmi-lite/wmi"
@@ -27,44 +29,16 @@ Ohai.plugin(:Virtualization) do
     virtualization Mash.new unless virtualization
     virtualization[:systems] = Mash.new unless virtualization[:systems]
 
-    # Grab BIOS data from WMI to determine vendor information
+    # Grab system DMI data from WMI to determine vendor information
     wmi = WmiLite::Wmi.new
-    bios = wmi.instances_of("Win32_BIOS")
+    dmi = wmi.first_of("Win32_ComputerSystemProduct")
 
-    case bios[0]["manufacturer"]
-    when "innotek GmbH"
-      virtualization[:system] = "vbox"
+    guest = guest_from_dmi_data(dmi["vendor"], dmi["name"], dmi["version"])
+    if guest
+      logger.trace("Plugin Virtualization: DMI data in Win32_ComputerSystemProduct indicates #{guest} guest")
+      virtualization[:system] = guest
       virtualization[:role] = "guest"
-      virtualization[:systems][:vbox] = "guest"
-    when "Parallels Software International Inc."
-      virtualization[:system] = "parallels"
-      virtualization[:role] = "guest"
-      virtualization[:systems][:parallels] = "guest"
-    when "Bochs"
-      virtualization[:system] = "kvm"
-      virtualization[:role] = "guest"
-      virtualization[:systems][:kvm] = "guest"
-    when "American Megatrends Inc."
-      if bios[0]["version"] =~ /VRTUAL -/
-        virtualization[:system] = "hyper-v"
-        virtualization[:role] = "guest"
-        virtualization[:systems][:hyperv] = "guest"
-      end
-    when "Xen"
-      virtualization[:system] = "xen"
-      virtualization[:role] = "guest"
-      virtualization[:systems][:xen] = "guest"
-    when "Veertu"
-      virtualization[:system] = "veertu"
-      virtualization[:role] = "guest"
-      virtualization[:systems][:veertu] = "guest"
-    end
-
-    # vmware fusion detection
-    if bios[0]["serialnumber"] =~ /VMware/
-      virtualization[:system] = "vmware"
-      virtualization[:role] = "guest"
-      virtualization[:systems][:vmware] = "guest"
+      virtualization[:systems][guest.to_sym] = "guest"
     end
   end
 end

data/lib/ohai/runner.rb

@@ -62,8 +62,8 @@ module Ohai
 
     def run_v7_plugin(plugin)
       return true if plugin.optional? &&
-          !Ohai.config[:run_all_plugins] &&
-          !Ohai.config[:optional_plugins].include?(plugin.name)
+        !Ohai.config[:run_all_plugins] &&
+        !Ohai.config[:optional_plugins].include?(plugin.name)
 
       visited = [ plugin ]
       until visited.empty?

data/lib/ohai/system.rb

@@ -140,23 +140,6 @@ module Ohai
       freeze_strings!
     end
 
-    # Re-runs plugins that provide the attributes specified by
-    # +attribute_filter+. If +attribute_filter+ is not given, re-runs all
-    # plugins.
-    #
-    # Note that dependencies will not be re-run, so you must specify all of the
-    # attributes you want refreshed in the +attribute_filter+
-    #
-    # This method takes a naive approach to v6 plugins: it simply re-runs all
-    # of them whenever called.
-    def refresh_plugins(attribute_filter = nil)
-      Ohai::Hints.refresh_hints
-      @provides_map.all_plugins(attribute_filter).each do |plugin|
-        plugin.reset!
-      end
-      run_plugins(true, attribute_filter)
-    end
-
     #
     # Serialize this object as a hash
     #

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "14.15.0".freeze
+  VERSION = "15.0.35".freeze
 end

data/ohai.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = "adam@chef.io"
   s.homepage = "https://github.com/chef/ohai/"
 
-  s.required_ruby_version = ">= 2.4"
+  s.required_ruby_version = ">= 2.5"
 
   s.add_dependency "systemu", "~> 2.6.4"
   s.add_dependency "ffi-yajl", "~> 2.2"
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "ipaddress"
   s.add_dependency "wmi-lite", "~> 1.0"
   s.add_dependency "ffi", "~> 1.9"
-  s.add_dependency "chef-config", ">= 12.8", "< 15"
+  s.add_dependency "chef-config", ">= 12.8", "< 16"
   # Note for ohai developers: If chef-config causes you grief, try:
   #     bundle install --with development
   # this should work as long as chef is a development dependency in Gemfile.

data/spec/data/plugins/rpmquery.output

@@ -3,5 +3,3 @@ tzdata	0	2016d	1.el7	1463486618	noarch
 nss-softokn-freebl	0	3.16.2.3	14.2.el7_2	1463486619	x86_64
 glibc	0	2.17	106.el7_2.6	1463486666	x86_64
 libstdc++	0	4.8.5	4.el7	1463486669	x86_64
-kernel  0       3.10.0  862.2.3.el7     1526310781      x86_64
-kernel  0       3.10.0  862.el7 1521745632      x86_64

data/spec/functional/application_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../spec_helper"
+require "spec_helper"
 require "ohai/application"
 
 RSpec.describe "Ohai::Application" do

data/spec/functional/loader_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../spec_helper"
+require "spec_helper"
 
 RSpec.describe "Ohai::Loader" do
   let(:loader) { Ohai::Loader.new(Ohai::System.new) }
@@ -32,7 +32,7 @@ RSpec.describe "Ohai::Loader" do
           Ohai.plugin(:Foo) do
             provides 'foo'
           end
-EOF
+        EOF
         File.open(File.join(plugin_directory, "foo.rb"), "w+") do |f|
           f.write(plugin_content)
         end

data/spec/functional/plugins/powershell_spec.rb

@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "languages plugin" do
-  VERSION_MATCHING_REGEX = /^(?:[\d]+\.)+[\d]+$/
+  VERSION_MATCHING_REGEX = /^(?:[\d]+\.)+[\d]+$/.freeze
   describe "powershell plugin", :windows_only do
     RSpec.shared_examples "a version looking thing" do
       it "should be present" do

data/spec/functional/plugins/root_group_spec.rb

@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require_relative "../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "root_group plugin" do
   let(:plugin) { get_plugin("root_group") }

data/spec/functional/plugins/windows/uptime_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../../../spec_helper.rb"
+require "spec_helper"
 
 describe Ohai::System, "Windows plugin uptime" do
 
@@ -28,7 +28,7 @@ describe Ohai::System, "Windows plugin uptime" do
     end
 
     let(:wmi) do
-      double("wmi", { first_of:         { "lastbootuptime" => "20160912103128.597219+0000" },
+      double("wmi", { first_of: { "lastbootuptime" => "20160912103128.597219+0000" },
       })
     end
 

data/spec/ohai_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "spec_helper.rb"
+require "spec_helper"
 
 describe Ohai do