ohai 18.1.3 → 18.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62cb983e4564cb9d15a8eb0b74bbdfdbf2c515fc2906a46718ad71f8e54fa663
-  data.tar.gz: 1b5157e0f291485d13ef5ee96d5b0aa90e274f19d259d1ac15897ea9a9a3bb33
+  metadata.gz: ba5e0cd23be58860dbaeaa8215628de72afb4ca181235acacd356064c8cdcdb6
+  data.tar.gz: 8059d2d3e7bf4c4a68b75f926165929446a3dbe280402438eba20be552c05fec
 SHA512:
-  metadata.gz: 815bce3ce6a1a8b83d0bdcd702581331632fc2239f7eea243261db411c951145bdbdc0c45802acae14ad514bcb390ce7f65fc8c2ef61d9e16b672cdb550e53fe
-  data.tar.gz: 98a13a200478051a2898b7d210f944bbdad9fecab0b39ecf7fa54ea0a3104027bcfcced0b22d9b17bf25383830a0386bd5a3cad5cf2ca202adf36a4fd19ffafb
+  metadata.gz: 5161f55dba454fff218dd4545a940cb0b324e3802930bf01b3b0d62730026d470961d4138259c4b6c8f76e3ed4059eb98e1a37b188823e02808d1e35817254e3
+  data.tar.gz: 27e98bd57c54192067a797a1303466becf7fa0eff0448665b35782613abbe238ae8c623192afd0ac6acd270a313212384e25c98373b0f101cd766dbece762358

data/Gemfile

@@ -16,7 +16,7 @@ group :development do
   gem "rspec-core", "~> 3.0"
   gem "rspec-expectations", "~> 3.0"
   gem "rspec-mocks", "~> 3.0"
-  gem "rubocop-performance", "1.16.0"
+  gem "rubocop-performance", "1.18.0"
   gem "rubocop-rspec"
 end
 

data/lib/ohai/mixin/alibaba_metadata.rb

@@ -41,23 +41,26 @@ module Ohai
         conn.get("/2016-01-01/#{uri}", { "User-Agent" => "chef-ohai/#{Ohai::VERSION}" })
       end
 
-      def fetch_metadata(id = "")
+      def fetch_metadata(id = "", is_directory = true)
         response = http_get(id)
         if response.code == "200"
-          json_data = parse_json(response.body)
-          if json_data.nil?
-            logger.warn("Mixin AlibabaMetadata: Metadata response is NOT valid JSON for id='#{id}'")
-            if response.body.include?("\n")
-              temp = {}
-              response.body.split("\n").each do |sub_attr|
-                temp[sanitize_key(sub_attr)] = fetch_metadata("#{id}/#{sub_attr}")
-              end
-              temp
-            else
+
+          if !is_directory
+            json_data = parse_json(response.body)
+            if json_data.nil?
               response.body
+            else
+              json_data
             end
-          else
-            json_data
+          elsif is_directory
+            temp = {}
+            response.body.split("\n").each do |sub_attr|
+              if "#{id}/#{sub_attr}" != "/user-data"
+                uri = id == "" ? "#{id}#{sub_attr}/" : "#{id}#{sub_attr}"
+                temp[sanitize_key(sub_attr).gsub(/_$/, "")] = fetch_metadata(uri, has_trailing_slash?(uri))
+              end
+            end
+            temp
           end
         else
           logger.warn("Mixin AlibabaMetadata: Received response code #{response.code} requesting metadata for id='#{id}'")
@@ -65,6 +68,13 @@ module Ohai
         end
       end
 
+      # @param data [String]
+      #
+      # @return [Boolean] is there a trailing /?
+      def has_trailing_slash?(data)
+        !!(data =~ %r{/$})
+      end
+
       def sanitize_key(key)
         key.gsub(%r{\-|/}, "_")
       end

data/lib/ohai/mixin/azure_metadata.rb

@@ -41,7 +41,8 @@ module Ohai
       AZURE_SUPPORTED_VERSIONS ||= %w{ 2018-10-01 2019-02-01 2019-03-11 2019-04-30 2019-06-01
                                        2019-06-04 2019-08-01 2019-08-15 2019-11-01 2020-06-01
                                        2020-07-15 2020-09-01 2020-10-01 2020-12-01 2021-01-01
-                                       2021-02-01 2021-03-01 2021-05-01 2021-10-01 }.freeze
+                                       2021-02-01 2021-03-01 2021-05-01 2021-10-01 2021-11-01
+                                       2021-11-15 2021-12-13 2023-07-01 }.freeze
 
       def best_api_version
         @api_version ||= begin

data/lib/ohai/mixin/gce_metadata.rb

@@ -26,7 +26,7 @@ module Ohai
 
       # Trailing dot to host is added to avoid DNS search path
       GCE_METADATA_ADDR ||= "metadata.google.internal."
-      GCE_METADATA_URL ||= "/computeMetadata/v1/?recursive=true"
+      GCE_METADATA_URL ||= "/computeMetadata/v1"
 
       # fetch the meta content with a timeout and the required header
       def http_get(uri)
@@ -39,7 +39,9 @@ module Ohai
       end
 
       def fetch_metadata(id = "")
-        response = http_get("#{GCE_METADATA_URL}/#{id}")
+        url = "#{GCE_METADATA_URL}/#{id}"
+        url = "#{url}?recursive=true" if url.end_with?("/")
+        response = http_get(url)
         if response.code == "200"
           json_data = parse_json(response.body)
           if json_data.nil?

data/lib/ohai/mixin/network_helper.rb

@@ -19,6 +19,7 @@
 #
 
 require "socket" unless defined?(Socket)
+require "resolv" unless defined?(Resolv)
 
 module Ohai
   module Mixin
@@ -37,6 +38,12 @@ module Ohai
         dec
       end
 
+      # Addrinfo#ip*? methods return true on AI_CANONNAME Addrinfo records that match
+      # the ipv* scheme and #ip? always returns true unless a non tcp Addrinfo
+      def ip?(hostname)
+        Resolv::IPv4::Regex.match?(hostname) || Resolv::IPv6::Regex.match?(hostname)
+      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
@@ -47,7 +54,27 @@ module Ohai
       # 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
+        ai = Addrinfo
+          .getaddrinfo(hostname, nil, nil, nil, nil, Socket::AI_CANONNAME)
+          .first
+
+        canonname = ai&.canonname
+        # use canonname if it's an FQDN
+        # This API is preferred as it never gives us an IP address for broken DNS
+        # (see https://github.com/chef/ohai/pull/1705)
+        # However, we have found that Windows hosts that are not joined to a domain
+        # can return a non-qualified hostname).
+        # Use a '.' in the canonname as indicator of FQDN
+        return canonname if canonname.include?(".")
+
+        # If we got a non-qualified name, then we do a standard reverse resolve
+        # which, assuming DNS is working, will work around that windows bug
+        # (and maybe others)
+        canonname = ai&.getnameinfo&.first
+        return canonname unless ip?(canonname)
+
+        # if all else fails, return the name we were given as a safety
+        hostname
       end
 
       def canonicalize_hostname_with_retries(hostname)

data/lib/ohai/plugins/darwin/platform.rb

@@ -18,7 +18,7 @@
 #
 
 Ohai.plugin(:Platform) do
-  provides "platform", "platform_version", "platform_build", "platform_family"
+  provides "platform", "platform_version", "platform_version_extra", "platform_build", "platform_family"
 
   collect_data(:darwin) do
     so = shell_out(Ohai.abs_path( "/usr/bin/sw_vers" ).to_s)
@@ -26,6 +26,8 @@ Ohai.plugin(:Platform) do
       case line
       when /^ProductVersion:\s+(.+)$/
         platform_version $1
+      when /^ProductVersionExtra:\s+(.+)$/
+        platform_version_extra $1
       when /^BuildVersion:\s+(.+)$/
         platform_build $1
       end

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

@@ -43,6 +43,10 @@ Ohai.plugin(:Virtualization) do
     which("docker")
   end
 
+  def sysctl_exists?
+    which("sysctl")
+  end
+
   collect_data(:darwin) do
     virtualization Mash.new unless virtualization
     virtualization[:systems] ||= Mash.new
@@ -77,6 +81,11 @@ Ohai.plugin(:Virtualization) do
       virtualization[:systems][:vmware] = "guest"
     end
 
+    if sysctl_exists? && shell_out("sysctl -in kern.hv_vmm_present").stdout.strip.to_i == 1
+      virtualization[:system] = "qemu"
+      virtualization[:role] = "guest"
+    end
+
     if ioreg_exists? && shell_out("ioreg -l").stdout.include?("pci1ab8,4000")
       virtualization[:system] = "parallels"
       virtualization[:role] = "guest"
@@ -86,5 +95,10 @@ Ohai.plugin(:Virtualization) do
       virtualization[:role] = "host"
       virtualization[:systems][:parallels] = "host"
     end
+
+    if hardware["machine_model"].include? "VirtualMac"
+      virtualization[:system] = "apple"
+      virtualization[:role] = "guest"
+    end
   end
-end
+end

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

@@ -51,10 +51,14 @@ Ohai.plugin(:Lspci) do
 
       case dev[0]
       when "Device" # There are two different Device tags
-        if ( tmp = dev[1].match(/(#{hh}:#{hh}.#{h})/) )
+        if ( tmp = dev[1].match(/(#{hhhh}:)?(#{hh}:#{hh}\.#{h})/) )
           # We have a device id
           d_id = tmp[0] # From now on we will need this id
           devices[d_id] = Mash.new
+          if tmp[1]
+            # We have a root complex
+            devices[d_id]["root_port"] = tmp[1][0..-2]
+          end
         else
           standard_form(devices, d_id, hhhh, "device", dev[1])
         end

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

@@ -700,7 +700,7 @@ Ohai.plugin(:Network) do
     # Match the lead line for an interface from iproute2
     # 3: eth0.11@eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP
     # The '@eth0:' portion doesn't exist on primary interfaces and thus is optional in the regex
-    IPROUTE_INT_REGEX ||= /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z]+|):\s/.freeze
+    IPROUTE_INT_REGEX ||= /^(\d+): ([0-9a-zA-Z@:\.\-_]*?)(@[0-9a-zA-Z\-_]+|):\s/.freeze
 
     if which("ip")
       # families to get default routes from

data/lib/ohai/plugins/packages.rb

@@ -33,13 +33,13 @@ Ohai.plugin(:Packages) do
     packages Mash.new
     case platform_family
     when "debian"
-      format = '${Package}\t${Version}\t${Architecture}\n'
+      format = '${Package}\t${Version}\t${Architecture}\t${db:Status-Status}\n'
       so = shell_out("dpkg-query -W -f='#{format}'")
       pkgs = so.stdout.lines
 
       pkgs.each do |pkg|
-        name, version, arch = pkg.split
-        packages[name] = { "version" => version, "arch" => arch }
+        name, version, arch, status = pkg.split
+        packages[name] = { "version" => version, "arch" => arch, "status" => status }
       end
 
     when "rhel", "fedora", "suse", "pld", "amazon"

data/lib/ohai/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 18.1.3
+  version: 18.1.18
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -401,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON