ohai 17.6.0 → 17.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98c016d2839114bfe15deee549cf97ba8ff627ab2931207a105a42a154746cc7
-  data.tar.gz: '06687f5ca824b9489e3140b19415ae8c99e1afefc053d9c4519b4d7af9d85cf8'
+  metadata.gz: 19b09efb3e8a7318b9401b9faf1fb17a472544ec5c7f45e7be090bcaafac9d93
+  data.tar.gz: d6deeb673906082bda7ab8ac7b4b1b5fb8dc41c22720ab4f4d47dfa994479be6
 SHA512:
-  metadata.gz: 7a8b2890b42b09e33d01a67ff589f587029d052a7a55a2ba09d1f2dd482afce275201e06cf968492f0645b8273f9b69890c7f082af878883ee66bc615828a96a
-  data.tar.gz: 3de0474524e3e9825e74f645630fc9e721f2ddbecd2a16bb337a21a02fa25d25cab469a5a810e8e2461ed137aab78f03abde064887993f64c784399b0ab8bdd9
+  metadata.gz: a8aec83f05fb402a2cc08efa9ce6d6fc81a0c2133bc57f60c9cbedff90236812e30e65373b5bb4813590ea2c7d5ae6c763caa58bbf56ef10c4ac5362df1dbc59
+  data.tar.gz: 948e93dddd2a283f43350795e15b46d83fe31db12d9f988bbe594882295fb7c57e576bc18be0a4db1d22002a177a6dddcce49f041dbc24cd777c75b59e62bce4

data/lib/ohai/mixin/constant_helper.rb

@@ -23,7 +23,7 @@ module Ohai
     module ConstantHelper
 
       def remove_constants
-        new_object_constants = Object.constants - @object_pristine.constants
+        new_object_constants = Object.constants - @object_pristine.constants - [ :SortedSet ]
         new_object_constants.each do |constant|
           Object.send(:remove_const, constant) unless Object.const_get(constant).is_a?(Module)
         end

data/lib/ohai/mixin/network_helper.rb

@@ -32,6 +32,24 @@ module Ohai
         [2, 4, 6].each { |n| dec = dec + "." + netmask[n..n + 1].to_i(16).to_s(10) }
         dec
       end
+
+      # This does a forward and reverse lookup on the hostname to return what should be
+      # the FQDN for the host determined by name lookup (generally DNS)
+      #
+      def canonicalize_hostname(hostname)
+        Addrinfo.getaddrinfo(hostname, nil).first.getnameinfo.first
+      end
+
+      def canonicalize_hostname_with_retries(hostname)
+        retries = 3
+        begin
+          canonicalize_hostname(hostname)
+        rescue
+          retries -= 1
+          retry if retries > 0
+          nil
+        end
+      end
     end
   end
 end

data/lib/ohai/mixin/os.rb

@@ -82,13 +82,13 @@ module Ohai
         else
           # now we have something like an IPMI console that isn't Unix-like or Windows, presumably cannot run ruby, and
           # so we just trust the train O/S information.
-          transport_connection.os
+          transport_connection.os.name
         end
       end
 
       # @api private
       def nonruby_target?
-        transport_connection && !transport_connection.os.unix? && !transport_connection.os.windows
+        transport_connection && !transport_connection.os.unix? && !transport_connection.os.windows?
       end
 
       # @api private

data/lib/ohai/plugins/cpu.rb

@@ -499,7 +499,7 @@ Ohai.plugin(:CPU) do
 
     cpu[:total] = shell_out("pmcycles -m").stdout.lines.length
 
-    # The below is only relevent on an LPAR
+    # The below is only relevant on an LPAR
     if shell_out("uname -W").stdout.strip == "0"
 
       # At least one CPU will be available, but we'll wait to increment this later.

data/lib/ohai/plugins/hostname.rb

@@ -26,7 +26,11 @@
 # limitations under the License.
 #
 
+require_relative "../mixin/network_helper"
+
 Ohai.plugin(:Hostname) do
+  include Ohai::Mixin::NetworkHelper
+
   provides "domain", "hostname", "fqdn", "machinename"
 
   # hostname : short hostname
@@ -42,38 +46,8 @@ Ohai.plugin(:Hostname) do
   end
 
   # forward and reverse lookup to canonicalize FQDN (hostname -f equivalent)
-  # this is ipv6-safe, works on ruby 1.8.7+
   def resolve_fqdn
-    require "socket" unless defined?(Socket)
-    require "ipaddr" unless defined?(IPAddr)
-
-    hostname = from_cmd("hostname")
-    begin
-      addrinfo = Socket.getaddrinfo(hostname, nil).first
-    rescue SocketError
-      # In the event that we got an exception from Socket, it's possible
-      # that it will work if we restrict it to IPv4 only either because of
-      # IPv6 misconfiguration or other bugs.
-      #
-      # Specifically it's worth noting that on macOS, getaddrinfo() will choke
-      # if it gets back a link-local address (say if you have 'fe80::1 myhost'
-      # in /etc/hosts). This will raise:
-      #    SocketError (getnameinfo: Non-recoverable failure in name resolution)
-      #
-      # But general misconfiguration could cause similar issues, so attempt to
-      # fall back to v4-only
-      begin
-        addrinfo = Socket.getaddrinfo(hostname, nil, :INET).first
-      rescue
-        # and if *that* fails, then try v6-only, in case we're in a v6-only
-        # environment with v4 config issues
-        addrinfo = Socket.getaddrinfo(hostname, nil, :INET6).first
-      end
-    end
-    iaddr = IPAddr.new(addrinfo[3])
-    Socket.gethostbyaddr(iaddr.hton)[0]
-  rescue
-    nil
+    canonicalize_hostname_with_retries(from_cmd("hostname"))
   end
 
   def collect_domain
@@ -119,58 +93,21 @@ Ohai.plugin(:Hostname) do
   collect_data(:darwin) do
     hostname from_cmd("hostname -s")
     machinename from_cmd("hostname")
-    begin
-      our_fqdn = resolve_fqdn
-      # Sometimes... very rarely, but sometimes, 'hostname --fqdn' falsely
-      # returns a blank string. WTF.
-      if our_fqdn.nil? || our_fqdn.empty?
-        logger.trace("Plugin Hostname: hostname returned an empty string, retrying once.")
-        our_fqdn = resolve_fqdn
-      end
-
-      if our_fqdn.nil? || our_fqdn.empty?
-        logger.trace("Plugin Hostname: hostname returned an empty string twice and will" +
-                        "not be set.")
-      else
-        fqdn our_fqdn
-      end
-    rescue
-      logger.trace(
-        "Plugin Hostname: hostname returned an error, probably no domain set"
-      )
-    end
+    fqdn resolve_fqdn
     domain collect_domain
   end
 
   collect_data(:freebsd) do
     hostname from_cmd("hostname -s")
     machinename from_cmd("hostname")
-    fqdn from_cmd("hostname -f")
+    fqdn resolve_fqdn
     collect_domain
   end
 
   collect_data(:linux) do
     hostname from_cmd("hostname -s")
     machinename from_cmd("hostname")
-    begin
-      our_fqdn = from_cmd("hostname --fqdn")
-      # Sometimes... very rarely, but sometimes, 'hostname --fqdn' falsely
-      # returns a blank string. WTF.
-      if our_fqdn.nil? || our_fqdn.empty?
-        logger.trace("Plugin Hostname: hostname --fqdn returned an empty string, retrying " +
-                        "once.")
-        our_fqdn = from_cmd("hostname --fqdn")
-      end
-
-      if our_fqdn.nil? || our_fqdn.empty?
-        logger.trace("Plugin Hostname: hostname --fqdn returned an empty string twice and " +
-                        "will not be set.")
-      else
-        fqdn our_fqdn
-      end
-    rescue
-      logger.trace("Plugin Hostname: hostname --fqdn returned an error, probably no domain set")
-    end
+    fqdn resolve_fqdn
     domain collect_domain
   end
 
@@ -190,22 +127,7 @@ Ohai.plugin(:Hostname) do
 
     hostname host["dnshostname"].to_s
     machinename host["name"].to_s
-
-    info = Socket.gethostbyname(Socket.gethostname)
-    if /.+?\.(.*)/.match?(info.first)
-      fqdn info.first
-    else
-      # host is not in dns. optionally use:
-      # C:\WINDOWS\system32\drivers\etc\hosts
-      info[3..info.length].reverse_each do |addr|
-        hostent = Socket.gethostbyaddr(addr)
-        if /.+?\.(.*)/.match?(hostent.first)
-          fqdn hostent.first
-          break
-        end
-      end
-      fqdn info.first unless fqdn
-    end
+    fqdn canonicalize_hostname_with_retries(Socket.gethostname)
     domain collect_domain
   end
 end

data/lib/ohai/plugins/os.rb

@@ -40,6 +40,12 @@ Ohai.plugin(:OS) do
 
   collect_data(:target) do
     os collect_os
+    os_version "unknown"
+  end
+
+  collect_data(:api) do
+    os collect_os
+    os_version "unknown"
   end
 
   collect_data do

data/lib/ohai/plugins/packages.rb

@@ -134,9 +134,9 @@ Ohai.plugin(:Packages) do
     require "win32/registry" unless defined?(Win32::Registry)
     packages Mash.new
     collect_programs_from_registry_key(Win32::Registry::HKEY_LOCAL_MACHINE, 'Software\Microsoft\Windows\CurrentVersion\Uninstall')
-    collect_programs_from_registry_key(Win32::Registry::HKEY_CURRENT_USER, 'Software\Microsoft\Windows\CurrentVersion\Uninstall')
+    # on 64 bit systems, 32 bit programs are stored here moved before HKEY_CURRENT_USER otherwise it is not collected (impacts both ohai 16 & 17)
     collect_programs_from_registry_key(Win32::Registry::HKEY_LOCAL_MACHINE, 'Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall')
-    # on 64 bit systems, 32 bit programs are stored here
+    collect_programs_from_registry_key(Win32::Registry::HKEY_CURRENT_USER, 'Software\Microsoft\Windows\CurrentVersion\Uninstall') rescue nil
   end
 
   collect_data(:aix) do

data/lib/ohai/version.rb

@@ -19,5 +19,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "17.6.0"
+  VERSION = "17.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 17.6.0
+  version: 17.7.5
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-30 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config