ohai 15.8.0 → 16.2.1

data/lib/ohai/plugins/linux/selinux.rb

@@ -0,0 +1,68 @@
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2020 Facebook
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:Selinux) do
+  provides "selinux/status", "selinux/policy_booleans", "selinux/process_contexts", "selinux/file_contexts"
+  optional true
+
+  collect_data(:linux) do
+    sestatus_path = which("sestatus")
+    if sestatus_path
+      sestatus = shell_out("#{sestatus_path} -v -b")
+
+      selinux Mash.new unless selinux
+      selinux[:status] ||= Mash.new
+      selinux[:policy_booleans] ||= Mash.new
+      selinux[:process_contexts] ||= Mash.new
+      selinux[:file_contexts] ||= Mash.new
+      section = nil
+
+      sestatus.stdout.split("\n").each do |line|
+        line.chomp!
+
+        case line
+        when "Policy booleans:"
+          section = :policy_booleans
+          next
+        when "Process contexts:"
+          section = :process_contexts
+          next
+        when "File contexts:"
+          section = :file_contexts
+          next
+        else
+          if section.nil?
+            section = :status
+          end
+        end
+
+        key, val = line.split(/:?\s\s+/, 2)
+        next if key.nil?
+
+        unless key.start_with?("/")
+          key.downcase!
+          key.tr!(" ", "_")
+        end
+
+        selinux[section][key] = val
+      end
+    else
+      logger.debug("Plugin Selinux: Could not find sestatus. Skipping plugin.")
+    end
+  end
+end

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

@@ -118,8 +118,8 @@ Ohai.plugin(:Virtualization) do
 
     # parse dmi to discover various virtualization guests
     # we do this *after* the kvm detection so that OpenStack isn't detected as KVM
-    logger.trace("Looking up DMI data manufacturer: '#{get_attribute(:dmi, :system, :manufacturer)}' product: '#{get_attribute(:dmi, :system, :product)}' version: '#{get_attribute(:dmi, :system, :version)}'")
-    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version))
+    logger.trace("Looking up DMI data manufacturer: '#{get_attribute(:dmi, :system, :manufacturer)}' product_name: '#{get_attribute(:dmi, :system, :product_name)}' version: '#{get_attribute(:dmi, :system, :version)}'")
+    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product_name), get_attribute(:dmi, :system, :version))
     if guest
       logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest")
       virtualization[:system] = guest

data/lib/ohai/plugins/packages.rb

@@ -191,7 +191,7 @@ Ohai.plugin(:Packages) do
     chunked_lines = so.stdout.lines.map(&:strip).chunk do |line|
       !line.empty? || nil
     end
-    chunked_lines.each do |_, lines| # rubocop: disable Performance/HashEachMethods
+    chunked_lines.each do |_, lines| # rubocop: disable Style/HashEachMethods
       package = {}
       lines.each do |line|
         key, value = line.split(":", 2)

data/lib/ohai/plugins/rackspace.rb

@@ -54,7 +54,7 @@ Ohai.plugin(:Rackspace) do
     wmi = WmiLite::Wmi.new
     if wmi.first_of("Win32_ComputerSystem")["PrimaryOwnerName"] == "Rackspace"
       logger.trace("Plugin Rackspace: has_rackspace_manufacturer? == true")
-      return true
+      true
     end
   end
 

data/lib/ohai/plugins/shard.rb

@@ -22,10 +22,12 @@ Ohai.plugin(:ShardSeed) do
 
   def get_dmi_property(dmi, thing)
     %w{system base_board chassis}.each do |section|
-      unless dmi[section][thing].strip.empty?
+      if dmi[section] && dmi[section][thing] && !dmi[section][thing].strip.empty?
         return dmi[section][thing]
       end
     end
+    Ohai::Log.error("shard_seed: Failed to get dmi property #{thing}: is dmidecode installed?")
+    raise "Failed to generate shard_seed"
   end
 
   def default_sources
@@ -77,11 +79,16 @@ Ohai.plugin(:ShardSeed) do
                 yield(src)
               end
     end
+    if data.empty?
+      Ohai::Log.error("shard_seed: Unable to generate seed! Either ensure 'dmidecode' is installed, or use 'Ohai.config[:plugin][:shard_seed][:sources]' to set different sources.")
+      raise "Failed to generate shard_seed"
+    end
     shard_seed digest_algorithm.hexdigest(data)[0...7].to_i(16)
   end
 
   collect_data do
     create_seed do |src|
+      Ohai::Log.error("shard_seed: No such source #{src}")
       raise "No such shard_seed source: #{src}"
     end
   end
@@ -99,6 +106,7 @@ Ohai.plugin(:ShardSeed) do
       when :uuid
         wmi.first_of("Win32_ComputerSystemProduct")["UUID"]
       else
+        Ohai::Log.error("shard_seed: No such source #{src}")
         raise "No such shard_seed source: #{src}"
       end
     end
@@ -112,6 +120,7 @@ Ohai.plugin(:ShardSeed) do
       when :uuid
         hardware["platform_UUID"]
       else
+        Ohai::Log.error("shard_seed: No such source #{src}")
         raise "No such shard_seed source: #{src}"
       end
     end
@@ -125,6 +134,7 @@ Ohai.plugin(:ShardSeed) do
       when :uuid
         get_dmi_property(dmi, :uuid)
       else
+        Ohai::Log.error("shard_seed: No such source #{src}")
         raise "No such shard_seed source: #{src}"
       end
     end

data/lib/ohai/plugins/virtualbox.rb

@@ -93,8 +93,8 @@ Ohai.plugin(:Virtualbox) do
     so_cmd = "VBoxManage list --sorted #{query_type}"
     logger.trace(so_cmd)
     so = shell_out(so_cmd)
-      # raise an exception if the command fails
-      # so.error!
+    # raise an exception if the command fails
+    # so.error!
 
     if so.exitstatus == 0
       # break the result into paragraph blocks, on successive newlines

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

@@ -0,0 +1,94 @@
+#
+# Author:: Pete Higgins (pete@peterhiggins.org)
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+Ohai.plugin(:DMI) do
+  provides "dmi"
+
+  # Map the linux component types to their rough Windows API equivalents
+  DMI_TO_WIN32OLE ||= {
+    chassis: "SystemEnclosure",
+    processor: "Processor",
+    bios: "Bios",
+    system: "ComputerSystemProduct",
+    base_board: "BaseBoard",
+  }.freeze
+
+  # This regex is in 3 parts for the different supported patterns in camel
+  # case names coming from the Windows API:
+  # * Typical camelcase, eg Depth, PartNumber, NumberOfPowerCords
+  # * Acronyms preceding camelcase, eg SMBIOSAssetTag
+  # * Acronyms that occur at the end of the name, eg SKU, DeviceID
+  #
+  # This cannot handle some property names, eg SMBIOSBIOSVersion.
+  # https://rubular.com/r/FBNtXod4wkZGAG
+  SPLIT_REGEX ||= /[A-Z][a-z0-9]+|[A-Z]{2,}(?=[A-Z][a-z0-9])|[A-Z]{2,}/.freeze
+
+  WINDOWS_TO_UNIX_KEYS ||= [
+    %w{vendor manufacturer},
+    %w{identifying_number serial_number},
+    %w{name family},
+  ].freeze
+
+  collect_data(:windows) do
+    require "ohai/common/dmi"
+    require "wmi-lite/wmi"
+    wmi = WmiLite::Wmi.new
+
+    dmi Mash.new
+
+    # The Windows API returns property names in camel case, eg "SerialNumber",
+    # while `dmi` returns them as space separated strings, eg "Serial Number".
+    # `Ohai::Common::DMI.convenience_keys` expects property names in `dmi`'s
+    # format, so build two parallel hashes with the keys as they come from the
+    # Windows API and in a faked-out `dmi` version. After the call to
+    # `Ohai::Common::DMI.convenience_keys` replace the faked-out `dmi`
+    # collection with the one with the original property names.
+    DMI_TO_WIN32OLE.each do |dmi_key, ole_key|
+      wmi_objects = wmi.instances_of("Win32_#{ole_key}").map(&:wmi_ole_object)
+
+      split_name_properties = []
+      properties = []
+
+      wmi_objects.each do |wmi_object|
+        split_name_properties << Mash.new
+        properties << Mash.new
+
+        wmi_object.properties_.each do |property|
+          property_name = property.name
+          value = wmi_object.invoke(property_name)
+
+          split_name = property_name.scan(SPLIT_REGEX).join(" ")
+          split_name_properties.last[split_name] = value
+          properties.last[property_name] = value
+        end
+      end
+
+      dmi[dmi_key] = Mash.new(all_records: split_name_properties, _all_records: properties)
+    end
+
+    Ohai::Common::DMI.convenience_keys(dmi)
+
+    dmi.each_value do |records|
+      records[:all_records] = records.delete(:_all_records)
+
+      WINDOWS_TO_UNIX_KEYS.each do |windows_key, unix_key|
+        records[unix_key] = records.delete(windows_key) if records.key?(windows_key)
+      end
+    end
+  end
+end

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

@@ -18,13 +18,11 @@
 
 Ohai.plugin :SystemEnclosure do
   provides "system_enclosure"
+  depends "dmi"
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
     system_enclosure Mash.new
-    wmi = WmiLite::Wmi.new
-    wmi_object = wmi.first_of("Win32_SystemEnclosure").wmi_ole_object
-    system_enclosure[:manufacturer] = wmi_object.invoke("manufacturer")
-    system_enclosure[:serialnumber] = wmi_object.invoke("serialnumber")
+    system_enclosure[:manufacturer] = get_attribute(:dmi, :chassis, :manufacturer)
+    system_enclosure[:serialnumber] = get_attribute(:dmi, :chassis, :serial_number)
   end
 end

data/lib/ohai/version.rb

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

data/ohai.gemspec

@@ -24,7 +24,8 @@ 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", "< 16"
+  s.add_dependency "chef-config", ">= 12.8", "< 17"
+  s.add_dependency "chef-utils", ">= 16.0", "< 17"
   # 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.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 15.8.0
+  version: 16.2.1
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -177,7 +177,7 @@ dependencies:
         version: '12.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '16'
+        version: '17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -187,7 +187,27 @@ dependencies:
         version: '12.8'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '16'
+        version: '17'
+- !ruby/object:Gem::Dependency
+  name: chef-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '16.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '17'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '16.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '17'
 description: Ohai profiles your system and emits JSON
 email: adam@chef.io
 executables:
@@ -254,6 +274,7 @@ files:
 - lib/ohai/plugins/erlang.rb
 - lib/ohai/plugins/eucalyptus.rb
 - lib/ohai/plugins/filesystem.rb
+- lib/ohai/plugins/fips.rb
 - lib/ohai/plugins/freebsd/memory.rb
 - lib/ohai/plugins/freebsd/network.rb
 - lib/ohai/plugins/freebsd/platform.rb
@@ -271,8 +292,9 @@ files:
 - lib/ohai/plugins/libvirt.rb
 - lib/ohai/plugins/linode.rb
 - lib/ohai/plugins/linux/block_device.rb
-- lib/ohai/plugins/linux/fips.rb
 - lib/ohai/plugins/linux/hostnamectl.rb
+- lib/ohai/plugins/linux/interrupts.rb
+- lib/ohai/plugins/linux/ipc.rb
 - lib/ohai/plugins/linux/lsb.rb
 - lib/ohai/plugins/linux/lspci.rb
 - lib/ohai/plugins/linux/machineid.rb
@@ -280,6 +302,7 @@ files:
 - lib/ohai/plugins/linux/memory.rb
 - lib/ohai/plugins/linux/network.rb
 - lib/ohai/plugins/linux/platform.rb
+- lib/ohai/plugins/linux/selinux.rb
 - lib/ohai/plugins/linux/sessions.rb
 - lib/ohai/plugins/linux/sysctl.rb
 - lib/ohai/plugins/linux/systemd_paths.rb
@@ -327,8 +350,8 @@ files:
 - lib/ohai/plugins/uptime.rb
 - lib/ohai/plugins/virtualbox.rb
 - lib/ohai/plugins/vmware.rb
+- lib/ohai/plugins/windows/dmi.rb
 - lib/ohai/plugins/windows/drivers.rb
-- lib/ohai/plugins/windows/fips.rb
 - lib/ohai/plugins/windows/memory.rb
 - lib/ohai/plugins/windows/network.rb
 - lib/ohai/plugins/windows/platform.rb

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

@@ -1,38 +0,0 @@
-#
-# Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright (c) 2016-2018 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# After long discussion in IRC the "powers that be" have come to a concensus
-# that there is no other Windows platforms exist that were not based on the
-# Windows_NT kernel, so we herby decree that "windows" will refer to all
-# platforms built upon the Windows_NT kernel and have access to win32 or win64
-# subsystems.
-
-Ohai.plugin(:Fips) do
-  provides "fips"
-
-  collect_data(:windows) do
-    fips Mash.new
-
-    require "openssl" unless defined?(OpenSSL)
-    if defined?(OpenSSL.fips_mode) && OpenSSL.fips_mode && !$FIPS_TEST_MODE
-      fips["kernel"] = { "enabled" => true }
-    else
-      fips["kernel"] = { "enabled" => false }
-    end
-  end
-end