ohai 18.0.26 → 18.1.0

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

@@ -1,93 +1,90 @@
-# frozen_string_literal: true
-#
-# Author:: Pavel Yudin (<pyudin@parallels.com>)
-# Author:: Tim Smith (<tsmith@chef.io>)
-# Copyright:: Copyright (c) 2015 Pavel Yudin
-# Copyright:: Copyright (c) Chef Software Inc.
-# 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(:Virtualization) do
-  provides "virtualization"
-  depends "hardware"
-
-  def vboxmanage_exists?
-    which("VBoxManage")
-  end
-
-  def prlctl_exists?
-    which("prlctl")
-  end
-
-  def ioreg_exists?
-    which("ioreg")
-  end
-
-  def fusion_exists?
-    file_exist?("/Applications/VMware\ Fusion.app/")
-  end
-
-  def docker_exists?
-    which("docker")
-  end
-
-  collect_data(:darwin) do
-    virtualization Mash.new unless virtualization
-    virtualization[:systems] ||= Mash.new
-
-    if docker_exists?
-      virtualization[:system] = "docker"
-      virtualization[:role] = "host"
-      virtualization[:systems][:docker] = "host"
-    end
-
-    if vboxmanage_exists?
-      virtualization[:system] = "vbox"
-      virtualization[:role] = "host"
-      virtualization[:systems][:vbox] = "host"
-    end
-
-    if hardware[:boot_rom_version].match?(/VirtualBox/i)
-      virtualization[:system] = "vbox"
-      virtualization[:role] = "guest"
-      virtualization[:systems][:vbox] = "guest"
-    end
-
-    if fusion_exists?
-      virtualization[:system] = "vmware"
-      virtualization[:role] = "host"
-      virtualization[:systems][:vmware] = "host"
-    end
-
-    if hardware[:boot_rom_version].match?(/VMW/i)
-      virtualization[:system] = "vmware"
-      virtualization[:role] = "guest"
-      virtualization[:systems][:vmware] = "guest"
-    end
-
-    if prlctl_exists?
-      virtualization[:system] = "parallels"
-      virtualization[:role] = "host"
-      virtualization[:systems][:parallels] = "host"
-    elsif ioreg_exists?
-      so = shell_out("ioreg -l")
-      if /pci1ab8,4000/.match?(so.stdout)
-        virtualization[:system] = "parallels"
-        virtualization[:role] = "guest"
-        virtualization[:systems][:parallels] = "guest"
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Pavel Yudin (<pyudin@parallels.com>)
+# Author:: Tim Smith (<tsmith@chef.io>)
+# Copyright:: Copyright (c) 2015 Pavel Yudin
+# Copyright:: Copyright (c) Chef Software Inc.
+# 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(:Virtualization) do
+  provides "virtualization"
+  depends "hardware"
+
+  def vboxmanage_exists?
+    which("VBoxManage")
+  end
+
+  def prlctl_exists?
+    which("prlctl")
+  end
+
+  def ioreg_exists?
+    which("ioreg")
+  end
+
+  def fusion_exists?
+    file_exist?("/Applications/VMware\ Fusion.app/")
+  end
+
+  def docker_exists?
+    which("docker")
+  end
+
+  collect_data(:darwin) do
+    virtualization Mash.new unless virtualization
+    virtualization[:systems] ||= Mash.new
+
+    if docker_exists?
+      virtualization[:system] = "docker"
+      virtualization[:role] = "host"
+      virtualization[:systems][:docker] = "host"
+    end
+
+    if vboxmanage_exists?
+      virtualization[:system] = "vbox"
+      virtualization[:role] = "host"
+      virtualization[:systems][:vbox] = "host"
+    end
+
+    if hardware[:boot_rom_version].match?(/VirtualBox/i)
+      virtualization[:system] = "vbox"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:vbox] = "guest"
+    end
+
+    if fusion_exists?
+      virtualization[:system] = "vmware"
+      virtualization[:role] = "host"
+      virtualization[:systems][:vmware] = "host"
+    end
+
+    if hardware[:boot_rom_version].match?(/VMW/i)
+      virtualization[:system] = "vmware"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:vmware] = "guest"
+    end
+
+    if ioreg_exists? && shell_out("ioreg -l").stdout.include?("pci1ab8,4000")
+      virtualization[:system] = "parallels"
+      virtualization[:role] = "guest"
+      virtualization[:systems][:parallels] = "guest"
+    elsif prlctl_exists?
+      virtualization[:system] = "parallels"
+      virtualization[:role] = "host"
+      virtualization[:systems][:parallels] = "host"
+    end
+  end
+end

data/lib/ohai/plugins/digital_ocean.rb

@@ -1,67 +1,67 @@
-# frozen_string_literal: true
-#
-# Author:: Dylan Page (<dpage@digitalocean.com>)
-# Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
-# 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(:DigitalOcean) do
-  require_relative "../mixin/do_metadata"
-  require_relative "../mixin/http_helper"
-
-  include Ohai::Mixin::DOMetadata
-  include Ohai::Mixin::HttpHelper
-
-  provides "digital_ocean"
-
-  depends "dmi"
-
-  # look for digitalocean string in dmi bios data
-  def has_do_dmi?
-    begin
-      # detect a vendor of "DigitalOcean"
-      if dmi[:bios][:all_records][0][:Vendor] == "DigitalOcean"
-        logger.trace("Plugin DigitalOcean: has_do_dmi? == true")
-        return true
-      end
-    rescue NoMethodError
-      # dmi[:bios][:all_records][0][:Vendor] may not exist
-    end
-    logger.trace("Plugin DigitalOcean: has_do_dmi? == false")
-    false
-  end
-
-  def looks_like_digital_ocean?
-    return true if hint?("digital_ocean")
-    return true if has_do_dmi? && can_socket_connect?(Ohai::Mixin::DOMetadata::DO_METADATA_ADDR, 80)
-
-    false
-  end
-
-  # 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
-      fetch_metadata.each do |k, v|
-        next if k == "vendor_data" # this may have sensitive data we shouldn't store
-
-        digital_ocean[k] = v
-      end
-    else
-      logger.trace("Plugin Digitalocean: No hints present for and doesn't look like digitalocean")
-      false
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Dylan Page (<dpage@digitalocean.com>)
+# Author:: Stafford Brunk (<stafford.brunk@gmail.com>)
+# 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(:DigitalOcean) do
+  require_relative "../mixin/do_metadata"
+  require_relative "../mixin/http_helper"
+
+  include Ohai::Mixin::DOMetadata
+  include Ohai::Mixin::HttpHelper
+
+  provides "digital_ocean"
+
+  depends "dmi"
+
+  # look for digitalocean string in dmi bios data
+  def has_do_dmi?
+    begin
+      # detect a vendor of "DigitalOcean"
+      if dmi[:bios][:all_records][0][:Vendor] == "DigitalOcean"
+        logger.trace("Plugin DigitalOcean: has_do_dmi? == true")
+        return true
+      end
+    rescue NoMethodError
+      # dmi[:bios][:all_records][0][:Vendor] may not exist
+    end
+    logger.trace("Plugin DigitalOcean: has_do_dmi? == false")
+    false
+  end
+
+  def looks_like_digital_ocean?
+    return true if hint?("digital_ocean")
+    return true if has_do_dmi? && can_socket_connect?(Ohai::Mixin::DOMetadata::DO_METADATA_ADDR, 80)
+
+    false
+  end
+
+  # 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
+      fetch_metadata.each do |k, v|
+        next if k == "vendor_data" # this may have sensitive data we shouldn't store
+
+        digital_ocean[k] = v
+      end
+    else
+      logger.trace("Plugin Digitalocean: No hints present for and doesn't look like digitalocean")
+      false
+    end
+  end
+end

data/lib/ohai/plugins/dmi.rb

@@ -1,134 +1,134 @@
-# frozen_string_literal: true
-#
-# Author:: Kurt Yoder (ktyopscode@yoderhome.com)
-# Copyright:: Copyright (c) 2010 Kurt Yoder
-# 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(:DMI) do
-  provides "dmi"
-
-  # dmidecode does not return data without access to /dev/mem (or its equivalent)
-
-  collect_data do
-    require_relative "../common/dmi"
-    dmi Mash.new
-
-    # all output lines should fall within one of these patterns
-    handle_line = /^Handle (0x[0-9A-F]{4}), DMI type (\d+), (\d+) bytes/
-    type_line = /^([A-Z][a-zA-Z ]+)( Information)?/
-    blank_line = /^\s*$/
-    data_line = /^\t([^:]+):(?: (.*))?/
-    extended_data_line = /^\t\t(.+)/
-    # first lines may contain some interesting information:
-    # # dmidecode 2.10
-    # SMBIOS 2.5 present.
-    # 5 structures occupying 352 bytes.
-    # Table at 0x000E1000.
-    dmidecode_version_line = /^# dmidecode (\d+\.\d+)/
-    smbios_version_line = /^SMBIOS (\d+\.\d+) present\./
-    structures_line = /^(\d+) structures occupying (\d+) bytes\./
-    table_location_line = /^Table at (0x[0-9A-E]+)\./
-
-    dmi_record = nil
-    field = nil
-
-    begin
-      so = shell_out("dmidecode")
-      # ==== EXAMPLE RECORD: ====
-      # Handle 0x0000, DMI type 0, 24 bytes
-      # BIOS Information
-      #        Vendor: American Megatrends Inc.
-      #        Version: 080012
-      # ... similar lines trimmed
-      #        Characteristics:
-      #                ISA is supported
-      #                PCI is supported
-      # ... similar lines trimmed
-      so.stdout.lines do |line|
-        next if blank_line.match(line)
-
-        line = line.encode(line.encoding, universal_newline: true)
-
-        if ( dmidecode_version = dmidecode_version_line.match(line) )
-          dmi[:dmidecode_version] = dmidecode_version[1]
-
-        elsif ( smbios_version = smbios_version_line.match(line) )
-          dmi[:smbios_version] = smbios_version[1]
-
-        elsif ( structures = structures_line.match(line) )
-          dmi[:structures] = Mash.new
-          dmi[:structures][:count] = structures[1]
-          dmi[:structures][:size] = structures[2]
-
-        elsif ( table_location = table_location_line.match(line) )
-          dmi[:table_location] = table_location[1]
-
-        elsif ( handle = handle_line.match(line) )
-          unless Ohai::Common::DMI.allowlisted_ids.include?(handle[2].to_i)
-            dmi_record = nil
-            next
-          end
-
-          dmi_record = { type: Ohai::Common::DMI.id_lookup(handle[2]) }
-
-          dmi[dmi_record[:type]] ||= Mash.new
-          dmi[dmi_record[:type]][:all_records] ||= []
-          dmi_record[:position] = dmi[dmi_record[:type]][:all_records].length
-          dmi[dmi_record[:type]][:all_records].push(Mash.new)
-          dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:record_id] = handle[1]
-          dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:size] = handle[2]
-          field = nil
-
-        elsif ( type = type_line.match(line) )
-          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?
-            logger.trace("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
-            next
-          end
-          dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = data[2]
-          field = data[1]
-
-        elsif ( extended_data = extended_data_line.match(line) )
-          if dmi_record.nil?
-            logger.trace("Plugin DMI: unexpected extended data line found before header; discarding:\n#{line}")
-            next
-          end
-          if field.nil?
-            logger.trace("Plugin DMI: unexpected extended data line found outside data section; discarding:\n#{line}")
-            next
-          end
-          # overwrite "raw" value with a new Mash
-          dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].class.to_s == "Mash"
-          dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = nil
-
-        else
-          logger.trace("Plugin DMI: unrecognized output line; discarding:\n#{line}")
-
-        end
-      end
-
-      Ohai::Common::DMI.convenience_keys(dmi)
-    rescue Ohai::Exceptions::Exec
-      logger.trace('Plugin DMI: Could not shell_out "dmidecode". Skipping data')
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Kurt Yoder (ktyopscode@yoderhome.com)
+# Copyright:: Copyright (c) 2010 Kurt Yoder
+# 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(:DMI) do
+  provides "dmi"
+
+  # dmidecode does not return data without access to /dev/mem (or its equivalent)
+
+  collect_data do
+    require_relative "../common/dmi"
+    dmi Mash.new
+
+    # all output lines should fall within one of these patterns
+    handle_line = /^Handle (0x[0-9A-F]{4}), DMI type (\d+), (\d+) bytes/
+    type_line = /^([A-Z][a-zA-Z ]+)( Information)?/
+    blank_line = /^\s*$/
+    data_line = /^\t([^:]+):(?: (.*))?/
+    extended_data_line = /^\t\t(.+)/
+    # first lines may contain some interesting information:
+    # # dmidecode 2.10
+    # SMBIOS 2.5 present.
+    # 5 structures occupying 352 bytes.
+    # Table at 0x000E1000.
+    dmidecode_version_line = /^# dmidecode (\d+\.\d+)/
+    smbios_version_line = /^SMBIOS (\d+\.\d+) present\./
+    structures_line = /^(\d+) structures occupying (\d+) bytes\./
+    table_location_line = /^Table at (0x[0-9A-E]+)\./
+
+    dmi_record = nil
+    field = nil
+
+    begin
+      so = shell_out("dmidecode")
+      # ==== EXAMPLE RECORD: ====
+      # Handle 0x0000, DMI type 0, 24 bytes
+      # BIOS Information
+      #        Vendor: American Megatrends Inc.
+      #        Version: 080012
+      # ... similar lines trimmed
+      #        Characteristics:
+      #                ISA is supported
+      #                PCI is supported
+      # ... similar lines trimmed
+      so.stdout.lines do |line|
+        next if blank_line.match(line)
+
+        line = line.encode(line.encoding, universal_newline: true)
+
+        if ( dmidecode_version = dmidecode_version_line.match(line) )
+          dmi[:dmidecode_version] = dmidecode_version[1]
+
+        elsif ( smbios_version = smbios_version_line.match(line) )
+          dmi[:smbios_version] = smbios_version[1]
+
+        elsif ( structures = structures_line.match(line) )
+          dmi[:structures] = Mash.new
+          dmi[:structures][:count] = structures[1]
+          dmi[:structures][:size] = structures[2]
+
+        elsif ( table_location = table_location_line.match(line) )
+          dmi[:table_location] = table_location[1]
+
+        elsif ( handle = handle_line.match(line) )
+          unless Ohai::Common::DMI.allowlisted_ids.include?(handle[2].to_i)
+            dmi_record = nil
+            next
+          end
+
+          dmi_record = { type: Ohai::Common::DMI.id_lookup(handle[2]) }
+
+          dmi[dmi_record[:type]] ||= Mash.new
+          dmi[dmi_record[:type]][:all_records] ||= []
+          dmi_record[:position] = dmi[dmi_record[:type]][:all_records].length
+          dmi[dmi_record[:type]][:all_records].push(Mash.new)
+          dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:record_id] = handle[1]
+          dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:size] = handle[2]
+          field = nil
+
+        elsif ( type = type_line.match(line) )
+          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?
+            logger.trace("Plugin DMI: unexpected data line found before header; discarding:\n#{line}")
+            next
+          end
+          dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = data[2]
+          field = data[1]
+
+        elsif ( extended_data = extended_data_line.match(line) )
+          if dmi_record.nil?
+            logger.trace("Plugin DMI: unexpected extended data line found before header; discarding:\n#{line}")
+            next
+          end
+          if field.nil?
+            logger.trace("Plugin DMI: unexpected extended data line found outside data section; discarding:\n#{line}")
+            next
+          end
+          # overwrite "raw" value with a new Mash
+          dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].class.to_s == "Mash"
+          dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = nil
+
+        else
+          logger.trace("Plugin DMI: unrecognized output line; discarding:\n#{line}")
+
+        end
+      end
+
+      Ohai::Common::DMI.convenience_keys(dmi)
+    rescue Ohai::Exceptions::Exec
+      logger.trace('Plugin DMI: Could not shell_out "dmidecode". Skipping data')
+    end
+  end
+end