ohai 16.6.5 → 16.10.6

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<bb@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -26,7 +27,7 @@ Ohai.plugin(:Network) do
 
   def parse_media(media_string)
     media = {}
-    line_array = media_string.split(" ")
+    line_array = media_string.split
 
     0.upto(line_array.length - 1) do |i|
       unless line_array[i].eql?("none")
@@ -40,11 +41,9 @@ Ohai.plugin(:Network) do
           else
             media[line_array[i]]["options"] = $1.split(",")
           end
-        else
-          if line_array[i].eql?("autoselect")
-            media["autoselect"] = {} unless media.key?("autoselect")
-            media["autoselect"]["options"] = []
-          end
+        elsif line_array[i].eql?("autoselect")
+          media["autoselect"] = {} unless media.key?("autoselect")
+          media["autoselect"]["options"] = []
         end
       else
         media["none"] = { "options" => [] }
@@ -144,15 +143,15 @@ Ohai.plugin(:Network) do
       end
       if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask 0x(([0-9a-f]){1,8}) broadcast (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
         iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2) , "broadcast" => $4 }
+        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2), "broadcast" => $4 }
       end
       if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+)\s*/
         iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => scope_lookup($1) }
+        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4, "scope" => scope_lookup($1) }
       end
       if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+) scopeid 0x([a-f0-9]+)/
         iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => scope_lookup($1) }
+        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4, "scope" => scope_lookup($1) }
       end
       if line =~ /^\s+media: ((\w+)|(\w+ [a-zA-Z0-9\-\<\>]+)) status: (\w+)/
         iface[cint][:media] ||= Mash.new

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Pavel Yudin (<pyudin@parallels.com>)
 # Author:: Tim Smith (<tsmith@chef.io>)

data/lib/ohai/plugins/digital_ocean.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Dylan Page (<dpage@digitalocean.com>)
 # Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
@@ -48,7 +49,8 @@ Ohai.plugin(:DigitalOcean) do
     false
   end
 
-  collect_data do
+  # linux and freebsd is all digitalocean supports
+  collect_data(:linux, :freebsd) do
     if looks_like_digital_ocean?
       logger.trace("Plugin Digitalocean: looks_like_digital_ocean? == true")
       digital_ocean Mash.new

data/lib/ohai/plugins/dmi.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Kurt Yoder (ktyopscode@yoderhome.com)
 # Copyright:: Copyright (c) 2010 Kurt Yoder
@@ -92,14 +93,14 @@ Ohai.plugin(:DMI) do
           field = nil
 
         elsif ( type = type_line.match(line) )
-          if dmi_record .nil?
+          if dmi_record.nil?
             logger.trace("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
             next
           end
           dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:application_identifier] = type[1]
 
         elsif ( data = data_line.match(line) )
-          if dmi_record .nil?
+          if dmi_record.nil?
             logger.trace("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
             next
           end
@@ -107,11 +108,11 @@ Ohai.plugin(:DMI) do
           field = data[1]
 
         elsif ( extended_data = extended_data_line.match(line) )
-          if dmi_record .nil?
+          if dmi_record.nil?
             logger.trace("Plugin DMI: unexpected extended data line found before header; discarding:\n#{line}")
             next
           end
-          if field .nil?
+          if field.nil?
             logger.trace("Plugin DMI: unexpected extended data line found outside data section; discarding:\n#{line}")
             next
           end

data/lib/ohai/plugins/docker.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
@@ -47,7 +48,7 @@ Ohai.plugin(:Docker) do
     docker[:swarm] = shellout_data["Swarm"]
   end
 
-  collect_data do
+  collect_data(:linux, :windows, :darwin) do
     require "json" unless defined?(JSON)
 
     if virtualization[:systems][:docker]

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
@@ -25,22 +26,22 @@ Ohai.plugin(:Memory) do
 
     # /usr/src/sys/sys/vmmeter.h
     so = shell_out("sysctl -n vm.stats.vm.v_page_size")
-    memory[:page_size] = so.stdout.split($/)[0]
+    memory[:page_size] = so.stdout.strip
     so = shell_out("sysctl -n vm.stats.vm.v_page_count")
-    memory[:page_count] = so.stdout.split($/)[0]
+    memory[:page_count] = so.stdout.strip
     memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
     so = shell_out("sysctl -n vm.stats.vm.v_free_count")
-    memory[:free] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:free] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.status.vm.v_active_count")
-    memory[:active] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:active] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.status.vm.v_inactive_count")
-    memory[:inactive] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:inactive] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.stats.vm.v_cache_count")
-    memory[:cache] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:cache] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.stats.vm.v_wire_count")
-    memory[:wired] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:wired] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vfs.bufspace")
-    memory[:buffers] = so.stdout.split($/)[0]
+    memory[:buffers] = so.stdout.strip
 
     so = shell_out("swapinfo")
     so.stdout.lines do |line|

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
@@ -20,8 +21,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:dragonflybsd) do
-    platform shell_out("uname -s").stdout.split($/)[0].downcase
-    platform_version shell_out("uname -r").stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.strip.downcase
+    platform_version shell_out("uname -r").stdout.strip
     platform_family "dragonflybsd"
   end
 end

data/lib/ohai/plugins/ec2.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Dysinger (<tim@dysinger.net>)
 # Author:: Benjamin Black (<bb@chef.io>)
@@ -120,6 +121,9 @@ Ohai.plugin(:EC2) do
       logger.trace("Plugin EC2: looks_like_ec2? == true")
       ec2 Mash.new
       fetch_metadata.each do |k, v|
+        # this includes sensitive data we don't want to store on the node
+        next if k == "identity_credentials_ec2_security_credentials_ec2_instance"
+
         # fetch_metadata returns IAM security credentials, including the IAM user's
         # secret access key. We'd rather not have ohai send this information
         # to the server. If the instance is associated with an IAM role we grab

data/lib/ohai/plugins/elixir.rb

@@ -15,7 +15,7 @@
 
 Ohai.plugin(:Elixir) do
   provides "languages/elixir"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/erlang.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Joe Williams (<joe@joetify.com>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/eucalyptus.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Tim Dysinger (<tim@dysinger.net>)
 # Author:: Benjamin Black (<bb@chef.io>)
@@ -28,6 +29,8 @@ Ohai.plugin(:Eucalyptus) do
   provides "eucalyptus"
   depends "network/interfaces"
 
+  MAC_MATCH = /^[dD]0:0[dD]:/.freeze
+
   # returns the mac address from the collection of all address types
   def get_mac_address(addresses)
     detected_addresses = addresses.detect { |address, keypair| keypair == { "family" => "lladdr" } }
@@ -42,7 +45,7 @@ Ohai.plugin(:Eucalyptus) do
   def has_euca_mac?
     network[:interfaces].each_value do |iface|
       mac = get_mac_address(iface[:addresses])
-      if /^[dD]0:0[dD]:/.match?(mac)
+      if MAC_MATCH.match?(mac)
         logger.trace("Plugin Eucalyptus: has_euca_mac? == true (#{mac})")
         return true
       end

data/lib/ohai/plugins/filesystem.rb

@@ -24,7 +24,7 @@
 #
 
 Ohai.plugin(:Filesystem) do
-  provides "filesystem"
+  provides "filesystem".freeze
 
   def find_device(name)
     %w{/dev /dev/mapper}.each do |dir|

data/lib/ohai/plugins/fips.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Matt Wrock (<matt@mattwrock.com>)
 # Copyright:: Copyright (c) Chef Software Inc.

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
@@ -25,22 +26,22 @@ Ohai.plugin(:Memory) do
 
     # /usr/src/sys/sys/vmmeter.h
     so = shell_out("sysctl -n vm.stats.vm.v_page_size")
-    memory[:page_size] = so.stdout.split($/)[0]
+    memory[:page_size] = so.stdout.strip
     so = shell_out("sysctl -n vm.stats.vm.v_page_count")
-    memory[:page_count] = so.stdout.split($/)[0]
+    memory[:page_count] = so.stdout.strip
     memory[:total] = memory[:page_size].to_i * memory[:page_count].to_i
     so = shell_out("sysctl -n vm.stats.vm.v_free_count")
-    memory[:free] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:free] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.status.vm.v_active_count")
-    memory[:active] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:active] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.status.vm.v_inactive_count")
-    memory[:inactive] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:inactive] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.stats.vm.v_cache_count")
-    memory[:cache] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:cache] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vm.stats.vm.v_wire_count")
-    memory[:wired] = memory[:page_size].to_i * so.stdout.split($/)[0].to_i
+    memory[:wired] = memory[:page_size].to_i * so.stdout.strip.to_i
     so = shell_out("sysctl -n vfs.bufspace")
-    memory[:buffers] = so.stdout.split($/)[0]
+    memory[:buffers] = so.stdout.strip
 
     so = shell_out("swapinfo")
     so.stdout.lines do |line|

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan

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

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
@@ -20,8 +21,8 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_family"
 
   collect_data(:freebsd) do
-    platform shell_out("uname -s").stdout.split($/)[0].downcase
-    platform_version shell_out("uname -r").stdout.split($/)[0]
+    platform shell_out("uname -s").stdout.strip.downcase
+    platform_version shell_out("uname -r").stdout.strip
     platform_family "freebsd"
   end
 end

data/lib/ohai/plugins/gce.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Ranjib Dey (<dey.ranjib@google.com>)
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/go.rb

@@ -15,7 +15,7 @@
 
 Ohai.plugin(:Go) do
   provides "languages/go"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/groovy.rb

@@ -18,7 +18,7 @@
 
 Ohai.plugin(:Groovy) do
   provides "languages/groovy"
-  depends "languages"
+  depends "languages".freeze
 
   collect_data do
 

data/lib/ohai/plugins/grub2.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+#
+# 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(:Grub2) do
+  provides "grub2/environment"
+  optional true
+
+  collect_data(:dragonflybsd, :freebsd, :linux, :netbsd) do
+    editenv_path = which("grub2-editenv")
+    if editenv_path
+      editenv_out = shell_out("#{editenv_path} list")
+
+      grub2 Mash.new unless grub2
+      grub2[:environment] ||= Mash.new
+
+      editenv_out.stdout.each_line do |line|
+        key, val = line.split("=", 2)
+        grub2[:environment][key] = val.strip
+      end
+    else
+      logger.trace("Plugin Grub2: Could not find grub2-editenv. Skipping plugin.")
+    end
+  end
+end

data/lib/ohai/plugins/haskell.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # Author:: Chris Dituri (<csdituri@gmail.com>)
 # Copyright:: Copyright (c) 2016 Chris Dituri
 # License:: Apache License, Version 2.0

data/lib/ohai/plugins/hostname.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Benjamin Black (<nostromo@gmail.com>)
@@ -37,8 +38,7 @@ Ohai.plugin(:Hostname) do
   # fqdn and domain may be broken if DNS is broken on the host
 
   def from_cmd(cmd)
-    so = shell_out(cmd)
-    so.stdout.split($/)[0]
+    shell_out(cmd).stdout.strip
   end
 
   # forward and reverse lookup to canonicalize FQDN (hostname -f equivalent)

data/lib/ohai/plugins/init_package.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Caleb Tennis (<caleb.tennis@gmail.com>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/java.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Benjamin Black (<bb@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.

data/lib/ohai/plugins/kernel.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Benjamin Black (<nostromo@gmail.com>)
@@ -33,7 +34,7 @@ Ohai.plugin(:Kernel) do
      ["uname -v", :version], ["uname -m", :machine],
      ["uname -p", :processor]].each do |cmd, property|
        so = shell_out(cmd)
-       kernel[property] = so.stdout.split($/)[0]
+       kernel[property] = so.stdout.strip
      end
     kernel
   end
@@ -114,7 +115,6 @@ Ohai.plugin(:Kernel) do
     when 16 then "WIN95"
     when 17 then "WIN98"
     when 19 then "WINCE"
-    else nil
     end
   end
 
@@ -133,7 +133,6 @@ Ohai.plugin(:Kernel) do
     when 6 then "Appliance PC"
     when 7 then "Performance Server"
     when 8 then "Maximum"
-    else nil
     end
   end
 
@@ -169,7 +168,7 @@ Ohai.plugin(:Kernel) do
     kernel[:os] = kernel[:name]
 
     so = shell_out("sysctl -n hw.optional.x86_64")
-    if so.stdout.split($/)[0].to_i == 1
+    if so.stdout.strip.to_i == 1
       kernel[:machine] = "x86_64"
     end
 
@@ -189,7 +188,7 @@ Ohai.plugin(:Kernel) do
     kernel[:os] = kernel[:name]
 
     so = shell_out("uname -i")
-    kernel[:ident] = so.stdout.split($/)[0]
+    kernel[:ident] = so.stdout.strip
     so = shell_out("sysctl kern.securelevel")
     kernel[:securelevel] = so.stdout.split($/).select { |e| e =~ /kern.securelevel: (.+)$/ }
 
@@ -200,7 +199,7 @@ Ohai.plugin(:Kernel) do
     kernel init_kernel
 
     so = shell_out("uname -o")
-    kernel[:os] = so.stdout.split($/)[0]
+    kernel[:os] = so.stdout.strip
 
     modules = Mash.new
     so = shell_out("env lsmod")
@@ -232,7 +231,7 @@ Ohai.plugin(:Kernel) do
     kernel init_kernel
 
     so = shell_out("uname -s")
-    kernel[:os] = so.stdout.split($/)[0]
+    kernel[:os] = so.stdout.strip
 
     so = file_open("/etc/release", &:gets)
     md = /(?<update>\d.*\d)/.match(so)
@@ -244,7 +243,7 @@ Ohai.plugin(:Kernel) do
     # EXAMPLE:
     # Id Loadaddr   Size Info Rev Module Name
     #  6  1180000   4623   1   1  specfs (filesystem for specfs)
-    module_description = /[\s]*([\d]+)[\s]+([a-f\d]+)[\s]+([a-f\d]+)[\s]+(?:[\-\d]+)[\s]+(?:[\d]+)[\s]+([\S]+)[\s]+\((.+)\)$/
+    module_description = /\s*(\d+)\s+([a-f\d]+)\s+([a-f\d]+)\s+(?:[\-\d]+)\s+(?:\d+)\s+(\S+)\s+\((.+)\)$/
     so.stdout.lines do |line|
       if ( mod = module_description.match(line) )
         modules[mod[4]] = { id: mod[1].to_i, loadaddr: mod[2], size: mod[3].to_i(16), description: mod[5] }