ohai 16.5.6 → 16.10.4

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>)
@@ -97,8 +98,8 @@ Ohai.plugin(:EC2) do
   # @param path[String] abs path to the file
   # @return [String] contents of the file if it exists
   def file_val_if_exists(path)
-    if ::File.exist?(path)
-      ::File.read(path)
+    if file_exist?(path)
+      file_read(path)
     end
   end
 
@@ -120,13 +121,22 @@ 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.
-        # http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/AESDG-chapter-instancedata.html#instancedata-data-categories
-        next if k == "iam" && !hint?("iam")
-
-        ec2[k] = v
+        # to the server. If the instance is associated with an IAM role we grab
+        # only the "info" key and the IAM role name.
+        # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/instancedata-data-categories.html
+        if k == "iam" && !hint?("iam")
+          ec2[:iam] = v.select { |key, value| key == "info" }
+          if v["security-credentials"] && v["security-credentials"].keys.length == 1
+            ec2[:iam]["role_name"] = v["security-credentials"].keys[0]
+          end
+        else
+          ec2[k] = v
+        end
       end
       ec2[:userdata] = fetch_userdata
       ec2[:account_id] = fetch_dynamic_data["accountId"]

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,12 +24,12 @@
 #
 
 Ohai.plugin(:Filesystem) do
-  provides "filesystem"
+  provides "filesystem".freeze
 
   def find_device(name)
     %w{/dev /dev/mapper}.each do |dir|
       path = File.join(dir, name)
-      return path if File.exist?(path)
+      return path if file_exist?(path)
     end
     name
   end
@@ -371,11 +371,11 @@ Ohai.plugin(:Filesystem) do
     end
 
     # Grab any missing mount information from /proc/mounts
-    if File.exist?("/proc/mounts")
+    if file_exist?("/proc/mounts")
       mounts = ""
       # Due to https://tickets.opscode.com/browse/OHAI-196
       # we have to non-block read dev files. Ew.
-      f = File.open("/proc/mounts")
+      f = file_open("/proc/mounts")
       loop do
         data = f.read_nonblock(4096)
         mounts << data

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
@@ -40,8 +41,8 @@ Ohai.plugin(:GCE) do
   # @param path[String] abs path to the file
   # @return [String] contents of the file if it exists
   def file_val_if_exists(path)
-    if ::File.exist?(path)
-      ::File.read(path)
+    if file_exist?(path)
+      file_read(path)
     end
   end
 

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.
@@ -20,6 +21,6 @@ Ohai.plugin(:InitPackage) do
   provides "init_package"
 
   collect_data(:linux) do
-    init_package File.exist?("/proc/1/comm") ? File.open("/proc/1/comm").gets.chomp : "init"
+    init_package file_exist?("/proc/1/comm") ? file_open("/proc/1/comm").gets.chomp : "init"
   end
 end

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
 
@@ -156,6 +155,10 @@ Ohai.plugin(:Kernel) do
     ].include?(name)
   end
 
+  collect_data(:target) do
+    # intentionally left blank
+  end
+
   collect_data(:default) do
     kernel init_kernel
   end
@@ -165,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
 
@@ -185,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: (.+)$/ }
 
@@ -196,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")
@@ -204,8 +207,8 @@ Ohai.plugin(:Kernel) do
       if line =~ /([a-zA-Z0-9\_]+)\s+(\d+)\s+(\d+)/
         modules[$1] = { size: $2, refcount: $3 }
         # Making sure to get the module version that has been loaded
-        if File.exist?("/sys/module/#{$1}/version")
-          version = File.read("/sys/module/#{$1}/version").chomp.strip
+        if file_exist?("/sys/module/#{$1}/version")
+          version = file_read("/sys/module/#{$1}/version").chomp.strip
           modules[$1]["version"] = version unless version.empty?
         end
       end
@@ -228,9 +231,9 @@ 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)
+    so = file_open("/etc/release", &:gets)
     md = /(?<update>\d.*\d)/.match(so)
     kernel[:update] = md[:update] if md
 
@@ -240,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] }