ohai 16.3.2 → 16.5.6

data/lib/ohai/plugins/fips.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Matt Wrock (<matt@mattwrock.com>)
-# Copyright:: Copyright (c) 2016-2018 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -29,10 +29,6 @@ Ohai.plugin(:Fips) 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
+    fips["kernel"] = { "enabled" => OpenSSL::OPENSSL_FIPS }
   end
 end

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

@@ -20,10 +20,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:freebsd) do
-    so = shell_out("uname -s")
-    platform so.stdout.split($/)[0].downcase
-    so = shell_out("uname -r")
-    platform_version so.stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.split($/)[0].downcase
+    platform_version shell_out("uname -r").stdout.split($/)[0]
     platform_family "freebsd"
   end
 end

data/lib/ohai/plugins/gce.rb

@@ -49,7 +49,7 @@ Ohai.plugin(:GCE) do
   # @return [Boolean] Are the manufacturer and model Google?
   def has_gce_system_info?
     if RUBY_PLATFORM.match?(/mswin|mingw32|windows/)
-      require "wmi-lite/wmi"
+      require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
       wmi = WmiLite::Wmi.new
       computer_system = wmi.first_of("Win32_ComputerSystem")
       if computer_system["Manufacturer"] =~ /^Google/ && computer_system["Model"] =~ /^Google/

data/lib/ohai/plugins/hostname.rb

@@ -6,7 +6,7 @@
 # Author:: Doug MacEachern (<dougm@vmware.com>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
 # Author:: Isa Farnik (<isa@chef.io>)
-# Copyright:: Copyright (c) 2008-2018, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # Copyright:: Copyright (c) 2009 Daniel DeLeo
 # Copyright:: Copyright (c) 2010 VMware, Inc.
@@ -26,9 +26,6 @@
 #
 
 Ohai.plugin(:Hostname) do
-  require "socket" unless defined?(Socket)
-  require "ipaddr"
-
   provides "domain", "hostname", "fqdn", "machinename"
 
   # hostname : short hostname
@@ -47,6 +44,9 @@ Ohai.plugin(:Hostname) do
   # 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")
     addrinfo = Socket.getaddrinfo(hostname, nil).first
     iaddr = IPAddr.new(addrinfo[3])
@@ -161,7 +161,7 @@ Ohai.plugin(:Hostname) do
   end
 
   collect_data(:windows) do
-    require "wmi-lite/wmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
     require "socket" unless defined?(Socket)
 
     wmi = WmiLite::Wmi.new

data/lib/ohai/plugins/init_package.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Caleb Tennis (<caleb.tennis@gmail.com>)
-# Copyright:: Copyright (c) 2012-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/java.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Benjamin Black (<bb@chef.io>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/kernel.rb

@@ -4,7 +4,7 @@
 # Author:: Bryan McLellan (<btm@loftninjas.org>)
 # Author:: Claire McQuin (<claire@chef.io>)
 # Author:: James Gartrell (<jgartrel@gmail.com>)
-# Copyright:: Copyright (c) Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
@@ -42,7 +42,7 @@ Ohai.plugin(:Kernel) do
   # @return [Mash]
   def bsd_modules(path)
     modules = Mash.new
-    so = shell_out((Ohai.abs_path(path)).to_s)
+    so = shell_out(Ohai.abs_path(path).to_s)
     so.stdout.lines do |line|
       #  1    7 0xc0400000 97f830   kernel
       if line =~ /(\d+)\s+(\d+)\s+([0-9a-fx]+)\s+([0-9a-fx]+)\s+([a-zA-Z0-9\_]+)/
@@ -252,7 +252,7 @@ Ohai.plugin(:Kernel) do
 
   collect_data(:windows) do
     require "win32ole" unless defined?(WIN32OLE)
-    require "wmi-lite/wmi"
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
 
     WIN32OLE.codepage = WIN32OLE::CP_UTF8
 

data/lib/ohai/plugins/keys.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: apache2
 # Recipe:: default
 #
-# Copyright 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/ohai/plugins/languages.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/libvirt.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Benjamin Black (<bb@chef.io>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/ohai/plugins/linode.rb

@@ -25,7 +25,7 @@ Ohai.plugin(:Linode) do
   # Returns true or false
   def has_linode_kernel?
     if ( kernel_data = kernel )
-      kernel_data[:release].split("-").last =~ /linode/
+      kernel_data[:release].split("-").last.include?("linode")
     end
   end
 

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

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -24,8 +24,7 @@ Ohai.plugin(:Hostnamectl) do
 
     hostnamectl_path = which("hostnamectl")
     if hostnamectl_path
-      hostnamectl_cmd = shell_out(hostnamectl_path)
-      hostnamectl_cmd.stdout.split("\n").each do |line|
+      shell_out(hostnamectl_path).stdout.split("\n").each do |line|
         key, val = line.split(":")
         hostnamectl[key.chomp.lstrip.tr(" ", "_").downcase] = val.chomp.lstrip
       end

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

@@ -41,7 +41,7 @@ Ohai.plugin(:IPC) do
           "perms" => parts[3],
           "bytes" => parts[4].to_i,
           "nattch" => parts[5].to_i,
-          "status" => parts[6] ? parts[6] : "",
+          "status" => parts[6] || "",
         }
 
         ipc["shm"][parts[1].to_i] = segment

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

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,8 +24,7 @@ Ohai.plugin(:LSB) do
 
     if File.exist?("/usr/bin/lsb_release")
       # From package redhat-lsb on Fedora/Redhat, lsb-release on Debian/Ubuntu
-      so = shell_out("lsb_release -a")
-      so.stdout.lines do |line|
+      shell_out("lsb_release -a").stdout.lines do |line|
         case line
         when /^Distributor ID:\s+(.+)$/
           lsb[:id] = $1

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

@@ -24,7 +24,6 @@ Ohai.plugin(:Lspci) do
 
   collect_data(:linux) do
     devices = Mash.new
-    lspci = shell_out("lspci -vnnmk")
 
     h = /[0-9a-fA-F]/ # any hex digit
     hh = /#{h}#{h}/ # any 2 hex digits
@@ -46,7 +45,7 @@ Ohai.plugin(:Lspci) do
       end
     end
 
-    lspci.stdout.split("\n").each do |line|
+    shell_out("lspci -vnnmk").stdout.split("\n").each do |line|
       dev = line.scan(/^(.*):\s(.*)$/)[0]
       next if dev.nil?
 

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

@@ -20,12 +20,12 @@ Ohai.plugin(:Machineid) do
   provides "machine_id"
 
   collect_data(:linux) do
-    mid = nil
-
     if ::File.exist?("/etc/machine-id")
       mid = ::File.read("/etc/machine-id").chomp
     elsif ::File.exist?("/var/lib/dbus/machine-id")
       mid = ::File.read("/var/lib/dbus/machine-id").chomp
+    else
+      mid = nil
     end
 
     if mid

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

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2008-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Chris Read <chris.read@gmail.com>
-# Copyright:: Copyright (c) 2008-2017, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -141,12 +141,12 @@ Ohai.plugin(:Network) do
   # using a temporary var to hold routes and their interface name
   def parse_routes(family, iface)
     iface.collect do |i, iv|
-      if iv[:routes]
-        iv[:routes].collect do |r|
-          r.merge(dev: i) if r[:family] == family[:name]
-        end.compact
-      end
-    end.compact.flatten
+      next unless iv[:routes]
+
+      iv[:routes].collect do |r|
+        r.merge(dev: i) if r[:family] == family[:name]
+      end.compact # @todo: when we drop ruby 2.6 this should be a filter_map
+    end.compact.flatten # @todo: when we drop ruby 2.6 this should be a filter_map
   end
 
   # determine layer 1 details for the interface using ethtool
@@ -264,7 +264,7 @@ Ohai.plugin(:Network) do
         end
         key, val = line.split(/:\s+/)
         if val
-          coalesce_key = "#{key.downcase.tr(" ", "_")}"
+          coalesce_key = key.downcase.tr(" ", "_").to_s
           iface[tmp_int]["coalesce_params"][coalesce_key] = val.to_i
         end
       end
@@ -289,7 +289,7 @@ Ohai.plugin(:Network) do
         if val.nil?
           val = ""
         end
-        driver_key = "#{key.downcase.tr(" ", "_")}"
+        driver_key = key.downcase.tr(" ", "_").to_s
         iface[tmp_int]["driver_info"][driver_key] = val.chomp
       end
     end
@@ -478,7 +478,7 @@ Ohai.plugin(:Network) do
 
   # returns the macaddress for interface from a hash of interfaces (iface elsewhere in this file)
   def get_mac_for_interface(interfaces, interface)
-    interfaces[interface][:addresses].select { |k, v| v["family"] == "lladdr" }.first.first unless interfaces[interface][:addresses].nil? || interfaces[interface][:flags].include?("NOARP")
+    interfaces[interface][:addresses].find { |k, v| v["family"] == "lladdr" }.first unless interfaces[interface][:addresses].nil? || interfaces[interface][:flags].include?("NOARP")
   end
 
   # returns the default route with the lowest metric (unspecified metric is 0)
@@ -516,8 +516,16 @@ Ohai.plugin(:Network) do
     # if the route destination is a default route, it's good
     return true if route[:destination] == "default"
 
+    return false if default_route[:via].nil?
+
+    dest_ipaddr = IPAddr.new(route[:destination])
+    default_route_via = IPAddr.new(default_route[:via])
+
+    # check if nexthop is the same address family
+    return false if dest_ipaddr.ipv4? != default_route_via.ipv4?
+
     # the default route has a gateway and the route matches the gateway
-    !default_route[:via].nil? && IPAddress(route[:destination]).include?(IPAddress(default_route[:via]))
+    dest_ipaddr.include?(default_route_via)
   end
 
   # ipv4/ipv6 routes are different enough that having a single algorithm to select the favored route for both creates unnecessary complexity
@@ -569,7 +577,7 @@ Ohai.plugin(:Network) do
   # If the 'ip' binary is available, this plugin may set {ip,mac,ip6}address. The network plugin should not overwrite these.
   # The older code section below that relies on the deprecated net-tools, e.g. netstat and ifconfig, provides less functionality.
   collect_data(:linux) do
-    require "ipaddr"
+    require "ipaddr" unless defined?(IPAddr)
 
     iface = Mash.new
     net_counters = Mash.new
@@ -638,7 +646,7 @@ Ohai.plugin(:Network) do
           logger.trace("Plugin Network: #{default_prefix}_interface set to #{default_route[:dev]}")
 
           # setting gateway to 0.0.0.0 or :: if the default route is a link level one
-          network["#{default_prefix}_gateway"] = default_route[:via] ? default_route[:via] : family[:default_route].chomp("/0")
+          network["#{default_prefix}_gateway"] = default_route[:via] || family[:default_route].chomp("/0")
           logger.trace("Plugin Network: #{default_prefix}_gateway set to #{network["#{default_prefix}_gateway"]}")
 
           # deduce the default route the user most likely cares about to pick {ip,mac,ip6}address below

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

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) 2015-2017, Chef Software Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,21 +20,6 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
   depends "lsb"
 
-  # the platform mappings between the 'ID' field in /etc/os-release and the value
-  # ohai uses. If you're adding a new platform here and you want to change the name
-  # you'll want to add it here and then add a spec for the platform_id_remap method
-  PLATFORM_MAPPINGS ||= {
-      "rhel" => "redhat",
-      "amzn" => "amazon",
-      "ol" => "oracle",
-      "sles" => "suse",
-      "sles_sap" => "suse",
-      "opensuse-leap" => "opensuseleap",
-      "xenenterprise" => "xenserver",
-      "cumulus-linux" => "cumulus",
-      "archarm" => "arch",
-    }.freeze
-
   # @deprecated
   def get_redhatish_platform(contents)
     contents[/^Red Hat/i] ? "redhat" : contents[/(\w+)/i, 1].downcase
@@ -122,8 +107,20 @@ Ohai.plugin(:Platform) do
     # this catches the centos guest shell in the nexus switch which identifies itself as centos
     return "nexus_centos" if id == "centos" && os_release_file_is_cisco?
 
-    # remap based on the hash of platforms
-    PLATFORM_MAPPINGS[id] || id
+    # the platform mappings between the 'ID' field in /etc/os-release and the value
+    # ohai uses. If you're adding a new platform here and you want to change the name
+    # you'll want to add it here and then add a spec for the platform_id_remap method
+    {
+      "rhel" => "redhat",
+      "amzn" => "amazon",
+      "ol" => "oracle",
+      "sles" => "suse",
+      "sles_sap" => "suse",
+      "opensuse-leap" => "opensuseleap",
+      "xenenterprise" => "xenserver",
+      "cumulus-linux" => "cumulus",
+      "archarm" => "arch",
+    }[id] || id
   end
 
   #

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

@@ -1,6 +1,6 @@
 #
 # Author:: Thom May (<thom@clearairturbulence.org>)
-# Copyright:: Copyright (c) 2009-2016 Chef Software, Inc.
+# Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

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

@@ -26,8 +26,7 @@ Ohai.plugin(:Network) do
     counters Mash.new unless counters
     counters[:network] ||= Mash.new
 
-    so = shell_out("route -n get default")
-    so.stdout.lines do |line|
+    shell_out("route -n get default").stdout.lines do |line|
       if line =~ /(\w+): ([\w\.]+)/
         case $1
         when "gateway"
@@ -39,9 +38,8 @@ Ohai.plugin(:Network) do
     end
 
     iface = Mash.new
-    so = shell_out("#{Ohai.abs_path( "/sbin/ifconfig" )} -a")
     cint = nil
-    so.stdout.lines do |line|
+    shell_out("#{Ohai.abs_path( "/sbin/ifconfig" )} -a").stdout.lines do |line|
       if line =~ /^([0-9a-zA-Z\.]+):\s+/
         cint = $1
         iface[cint] = Mash.new
@@ -85,8 +83,7 @@ Ohai.plugin(:Network) do
       end
     end
 
-    so = shell_out("arp -an")
-    so.stdout.lines do |line|
+    shell_out("arp -an").stdout.lines do |line|
       if line =~ /\((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([0-9a-zA-Z\.\:\-]+)/
         next unless iface[$3] # this should never happen
 
@@ -102,8 +99,7 @@ Ohai.plugin(:Network) do
     # Show the state of all network interfaces or a single interface
     # which have been auto-configured (interfaces statically configured
     # into a system, but not located at boot time are not shown).
-    so = shell_out("netstat -idn")
-    so.stdout.lines do |line|
+    shell_out("netstat -idn").stdout.lines do |line|
       # Name    Mtu Network       Address              Ipkts Ierrs    Opkts Oerrs  Coll Drop
       # em0     1500  <Link>      00:11:25:2d:90:be  3719557     0  3369969     0     0    0
       # $1                        $2                      $3    $4    $5       $6    $7   $8

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

@@ -20,10 +20,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:netbsd) do
-    so = shell_out("uname -s")
-    platform so.stdout.split($/)[0].downcase
-    so = shell_out("uname -r")
-    platform_version so.stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.split($/)[0].downcase
+    platform_version shell_out("uname -r").stdout.split($/)[0]
     platform_family "netbsd"
   end
 end