ohai 17.5.2 → 17.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afaf1b3332e2a31c5d045ea50e9315bd9fcf64fcd21e120982974c5b9d167d76
-  data.tar.gz: ed90edfe09e2bf83fea9018b7f16d3fd16caf28aa998e75e44c9980789df6d30
+  metadata.gz: 152ee2a1456b0508eeb740837c37169e101f860d4398ed71dc2be86207aa9e75
+  data.tar.gz: ff72078f7fb2e6eab1207659eb0a66b4bfed98cbf66ca82778830ecfe545e5f4
 SHA512:
-  metadata.gz: e4693d375412563df16856fe88ccdfd83ba5279a9b33fb3856ea9a7299bc599c943d7360d7135d28a59543420456a250300ad416a5e93bb7b09f7041750c336c
-  data.tar.gz: ee963b18a46ea9b8a2d3292be0f82a2aaa7ef90cb629a71eb1fe51a661b5ded47d8da4c9b44f35614d169b6e0922dba3aa5e966ceab7055dcef8e57b50fc7afa
+  metadata.gz: e0bd1cc8142814db7d670a19cb6c49d7ccbfa7e029ae33ec79d194f27c03abdf07c215e155e50cc052893f9b3aef15a1c4de414e40e370753595fb877fa2c574
+  data.tar.gz: 23424895d514fe8ca3384e1155a75cbaba60a684aac6f4e53c924bb34733194691642a3b877f09c8e377b8a0fe59075bb2380d0bba9c8ed0c8abb59eea758aa2

data/Gemfile

@@ -9,14 +9,14 @@ gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "ch
 
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
-  gem "chefstyle", "2.0.9"
+  gem "chefstyle", "2.1.3"
   gem "ipaddr_extensions"
   gem "rake", ">= 10.1.0"
   gem "rspec-collection_matchers", "~> 1.0"
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
   gem "rspec-mocks", "~> 3.0"
-  gem "rubocop-performance", "1.11.5"
+  gem "rubocop-performance", "1.12.0"
   gem "rubocop-rspec"
 end
 

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

@@ -18,6 +18,8 @@
 # limitations under the License.
 #
 
+require "socket" unless defined?(Socket)
+
 module Ohai
   module Mixin
     module NetworkHelper
@@ -32,6 +34,30 @@ 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).  If the forward
+      # lookup fails this will throw.  If the reverse lookup fails this will return the
+      # hostname back.  The behavior on failure of the reverse lookup is both vitally important
+      # to this API, and completely untested, so changes to this method (not recommended) need
+      # to be manually validated by hand by setting up a DNS server with a broken A record to
+      # an IP without a PTR record (e.g. any RFC1918 space not served by the configured DNS
+      # server), and the method should return the hostname and not the IP address.
+      #
+      def canonicalize_hostname(hostname)
+        Addrinfo.getaddrinfo(hostname, nil, nil, nil, nil, Socket::AI_CANONNAME).first.canonname
+      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/azure.rb

@@ -48,7 +48,7 @@ Ohai.plugin(:Azure) do
   # check for either the waagent or the unknown-245 DHCP option that Azure uses
   # http://blog.mszcool.com/index.php/2015/04/detecting-if-a-virtual-machine-runs-in-microsoft-azure-linux-windows-to-protect-your-software-when-distributed-via-the-azure-marketplace/
   def has_waagent?
-    if file_exist?("/usr/sbin/waagent") || dir_exist?('C:\WindowsAzure')
+    if file_exist?("/usr/sbin/waagent") || dir_exist?("C:\\WindowsAzure")
       logger.trace("Plugin Azure: Found waagent used by Azure.")
       true
     end

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/linux/tc.rb

@@ -0,0 +1,61 @@
+#
+# Author:: Matthew Massey <matthewmassey@fb.com>
+# Copyright:: Copyright (c) 2021 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(:Tc) do
+  provides "tc"
+  optional true
+
+  collect_data(:linux) do
+    tc_path = which("tc")
+    if tc_path
+      cmd = "#{tc_path} qdisc show"
+      tc_output = shell_out(cmd)
+
+      tc_data = Mash.new
+      tc_data[:qdisc] = Mash.new
+
+      tc_output.stdout.split("\n").each do |line|
+        line = line.strip
+        if /dev (\w+)/ =~ line
+          dev = $1
+          tc_data[:qdisc][dev] ||= Mash.new
+        else
+          next
+        end
+        if /qdisc (\w+)/ =~ line
+          qdisc = $1
+          tc_data[:qdisc][dev][:qdiscs] ||= []
+          tc_data[:qdisc][dev][:qdiscs] << Mash.new
+          qdisc_idx = tc_data[:qdisc][dev][:qdiscs].length - 1
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx] ||= Mash.new
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx][:type] = qdisc
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx][:parms] ||= Mash.new
+        else
+          next
+        end
+        if qdisc == "fq" && /buckets (\d+)/ =~ line
+          buckets = $1.to_i
+          tc_data[:qdisc][dev][:qdiscs][qdisc_idx][:parms][:buckets] = buckets
+        end
+      end
+      tc tc_data
+    else
+      logger.trace("Plugin Tc: Could not find tc. Skipping plugin.")
+    end
+  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/plugins/rpm.rb

@@ -0,0 +1,109 @@
+# frozen_string_literal: true
+
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2021 Meta Platforms, Inc. and affiliates.
+# 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(:Rpm) do
+  provides "rpm"
+  optional "true"
+
+  MACROS_MARKER = /========================/.freeze
+
+  DO_NOT_SPLIT = %w{
+    build_arch
+    build_os
+    install_arch
+    install_os
+    archcolor
+    optflags
+  }.freeze
+
+  collect_data(:aix, :darwin, :dragonflybsd, :freebsd, :linux, :netbsd, :openbsd, :solaris2) do
+    rpm_path = which("rpm")
+    if rpm_path
+      rpm_version_out = shell_out("#{rpm_path} --version")
+      rpm_showrc_out = shell_out("#{rpm_path} --showrc")
+
+      rpm Mash.new unless rpm
+      rpm[:macros] ||= Mash.new
+
+      m = rpm_version_out.stdout.match(/\w+ (\d.*)/)
+      if m
+        rpm[:version] = m[1]
+      end
+
+      lines = rpm_showrc_out.stdout.split("\n")
+      # there's a marker to separate the beginning and end of the macros list
+      macros_start_idx = lines.index { |x| x.match(MACROS_MARKER) }
+      macros_end_idx = lines.rindex { |x| x.match(MACROS_MARKER) }
+      section = nil
+      lines[0..macros_start_idx - 1].each do |line|
+        if line.start_with?("ARCHITECTURE AND OS")
+          section = :arch_os
+          rpm[section] ||= Mash.new
+        elsif line.start_with?("RPMRC VALUES")
+          section = :rpmrc
+          rpm[section] ||= Mash.new
+        elsif line.start_with?("Features supported by rpmlib")
+          section = :features
+          rpm[section] ||= Mash.new
+        elsif line.start_with?("Macro path")
+          fields = line.split(":", 2)
+          if fields
+            rpm[:macro_path] = fields[1].strip.split(":")
+          end
+          section = nil
+        elsif %i{arch_os rpmrc}.include?(section)
+          fields = line.split(":")
+          if fields && fields[0] && fields[1]
+            key = fields[0].strip.sub("'s", "es").tr(" ", "_")
+            if DO_NOT_SPLIT.include?(key)
+              values = fields[1].strip
+            else
+              values = fields[1].strip.split(" ")
+            end
+            rpm[section][key] = values
+          end
+        elsif section == :features
+          fields = line.split("=")
+          if fields && fields[0] && fields[1]
+            rpm[section][fields[0].strip] = fields[1].strip
+          end
+        end
+      end
+
+      name = nil
+      value = ""
+      lines[macros_start_idx + 1..macros_end_idx - 1].each do |line|
+        if line.start_with?("-")
+          if name
+            rpm[:macros][name] = value
+            name = nil
+            value = ""
+          else
+            _prefix, name, value = line.split(" ", 3)
+          end
+        else
+          value += "\n#{line}"
+        end
+      end
+    else
+      logger.trace("Plugin RPM: Could not find rpm. Skipping plugin.")
+    end
+  end
+end

data/lib/ohai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 17.5.2
+  version: 17.7.12
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
+date: 2021-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -315,6 +315,7 @@ files:
 - lib/ohai/plugins/linux/sessions.rb
 - lib/ohai/plugins/linux/sysctl.rb
 - lib/ohai/plugins/linux/systemd_paths.rb
+- lib/ohai/plugins/linux/tc.rb
 - lib/ohai/plugins/linux/virtualization.rb
 - lib/ohai/plugins/lua.rb
 - lib/ohai/plugins/mono.rb
@@ -340,6 +341,7 @@ files:
 - lib/ohai/plugins/python.rb
 - lib/ohai/plugins/rackspace.rb
 - lib/ohai/plugins/root_group.rb
+- lib/ohai/plugins/rpm.rb
 - lib/ohai/plugins/ruby.rb
 - lib/ohai/plugins/rust.rb
 - lib/ohai/plugins/scala.rb