ohai 18.0.26 → 18.1.0

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

@@ -1,90 +1,90 @@
-# frozen_string_literal: true
-#
-# Author:: Sean Walbran (<seanwalbran@gmail.com>)
-# Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# 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(:Virtualization) do
-  require_relative "../../mixin/dmi_decode"
-  include Ohai::Mixin::DmiDecode
-  provides "virtualization"
-  depends "dmi"
-
-  def collect_solaris_guestid
-    shell_out("/usr/sbin/zoneadm list -p").stdout.split(":").first
-  end
-
-  collect_data(:solaris2) do
-    virtualization Mash.new
-    virtualization[:systems] = Mash.new
-
-    # Detect paravirt KVM/QEMU from cpuinfo, report as KVM
-    psrinfo_path = Ohai.abs_path( "/usr/sbin/psrinfo" )
-    if file_exist?(psrinfo_path)
-      so = shell_out("#{psrinfo_path} -pv")
-      if /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/.match?(so.stdout)
-        virtualization[:system] = "kvm"
-        virtualization[:role] = "guest"
-        virtualization[:systems][:kvm] = "guest"
-      end
-    end
-
-    # parse dmi to discover various virtualization guests
-    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version))
-    if guest
-      logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest")
-      virtualization[:system] = guest
-      virtualization[:role] = "guest"
-      virtualization[:systems][guest.to_sym] = "guest"
-    end
-
-    if File.executable?("/usr/sbin/zoneadm")
-      zones = Mash.new
-      shell_out("zoneadm list -pc").stdout.lines do |line|
-        info = line.chomp.split(":")
-        zones[info[1]] = {
-          "id" => info[0],
-          "state" => info[2],
-          "root" => info[3],
-          "uuid" => info[4],
-          "brand" => info[5],
-          "ip" => info[6],
-        }
-      end
-
-      if zones.length == 1
-        first_zone = zones.keys[0]
-        virtualization[:system] = "zone"
-        if first_zone == "global"
-          virtualization[:role] = "host"
-          virtualization[:systems][:zone] = "host"
-        else
-          virtualization[:role] = "guest"
-          virtualization[:systems][:zone] = "guest"
-          virtualization[:guest_uuid] = zones[first_zone]["uuid"]
-          virtualization[:guest_id] = collect_solaris_guestid
-        end
-      elsif zones.length > 1
-        virtualization[:system] = "zone"
-        virtualization[:role] = "host"
-        virtualization[:systems][:zone] = "host"
-        virtualization[:guests] = zones
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Sean Walbran (<seanwalbran@gmail.com>)
+# Author:: Kurt Yoder (<ktyopscode@yoderhome.com>)
+# Copyright:: Copyright (c) Chef Software Inc.
+# 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(:Virtualization) do
+  require_relative "../../mixin/dmi_decode"
+  include Ohai::Mixin::DmiDecode
+  provides "virtualization"
+  depends "dmi"
+
+  def collect_solaris_guestid
+    shell_out("/usr/sbin/zoneadm list -p").stdout.split(":").first
+  end
+
+  collect_data(:solaris2) do
+    virtualization Mash.new
+    virtualization[:systems] = Mash.new
+
+    # Detect paravirt KVM/QEMU from cpuinfo, report as KVM
+    psrinfo_path = Ohai.abs_path( "/usr/sbin/psrinfo" )
+    if file_exist?(psrinfo_path)
+      so = shell_out("#{psrinfo_path} -pv")
+      if /QEMU Virtual CPU|Common KVM processor|Common 32-bit KVM processor/.match?(so.stdout)
+        virtualization[:system] = "kvm"
+        virtualization[:role] = "guest"
+        virtualization[:systems][:kvm] = "guest"
+      end
+    end
+
+    # parse dmi to discover various virtualization guests
+    guest = guest_from_dmi_data(get_attribute(:dmi, :system, :manufacturer), get_attribute(:dmi, :system, :product), get_attribute(:dmi, :system, :version))
+    if guest
+      logger.trace("Plugin Virtualization: DMI data indicates #{guest} guest")
+      virtualization[:system] = guest
+      virtualization[:role] = "guest"
+      virtualization[:systems][guest.to_sym] = "guest"
+    end
+
+    if File.executable?("/usr/sbin/zoneadm")
+      zones = Mash.new
+      shell_out("zoneadm list -pc").stdout.lines do |line|
+        info = line.chomp.split(":")
+        zones[info[1]] = {
+          "id" => info[0],
+          "state" => info[2],
+          "root" => info[3],
+          "uuid" => info[4],
+          "brand" => info[5],
+          "ip" => info[6],
+        }
+      end
+
+      if zones.length == 1
+        first_zone = zones.keys[0]
+        virtualization[:system] = "zone"
+        if first_zone == "global"
+          virtualization[:role] = "host"
+          virtualization[:systems][:zone] = "host"
+        else
+          virtualization[:role] = "guest"
+          virtualization[:systems][:zone] = "guest"
+          virtualization[:guest_uuid] = zones[first_zone]["uuid"]
+          virtualization[:guest_id] = collect_solaris_guestid
+        end
+      elsif zones.length > 1
+        virtualization[:system] = "zone"
+        virtualization[:role] = "host"
+        virtualization[:systems][:zone] = "host"
+        virtualization[:guests] = zones
+      end
+    end
+  end
+end

data/lib/ohai/plugins/ssh_host_key.rb

@@ -1,84 +1,84 @@
-# frozen_string_literal: true
-#
-# Author:: Bryan McLellan <btm@chef.io>
-# 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(:SSHHostKey) do
-  provides "keys/ssh"
-  depends "keys"
-
-  def extract_keytype?(content)
-    case content[0]
-    when "ssh-dss"
-      [ "dsa", nil ]
-    when "ssh-rsa"
-      [ "rsa", nil ]
-    when /^ecdsa/
-      [ "ecdsa", content[0] ]
-    when "ssh-ed25519"
-      [ "ed25519", nil ]
-    else
-      [ nil, nil ]
-    end
-  end
-
-  collect_data do
-    keys[:ssh] = Mash.new
-
-    sshd_config = if file_exist?("/etc/ssh/sshd_config")
-                    "/etc/ssh/sshd_config"
-                  elsif file_exist?("/etc/sshd_config")
-                    # Darwin
-                    "/etc/sshd_config"
-                  else
-                    logger.trace("Plugin SSHHostKey: Failed to find sshd configuration file")
-                    nil
-                  end
-
-    if sshd_config
-      file_open(sshd_config) do |conf|
-        conf.each_line do |line|
-          if /^hostkey\s/i.match?(line)
-            pub_file = "#{line.split[1]}.pub"
-            content = file_read(pub_file).split
-            key_type, key_subtype = extract_keytype?(content)
-            keys[:ssh]["host_#{key_type}_public"] = content[1] unless key_type.nil?
-            keys[:ssh]["host_#{key_type}_type"] = key_subtype unless key_subtype.nil?
-          end
-        end
-      end
-    end
-
-    if keys[:ssh][:host_dsa_public].nil? && file_exist?("/etc/ssh/ssh_host_dsa_key.pub")
-      keys[:ssh][:host_dsa_public] = file_read("/etc/ssh/ssh_host_dsa_key.pub").split[1]
-    end
-
-    if keys[:ssh][:host_rsa_public].nil? && file_exist?("/etc/ssh/ssh_host_rsa_key.pub")
-      keys[:ssh][:host_rsa_public] = file_read("/etc/ssh/ssh_host_rsa_key.pub").split[1]
-    end
-
-    if keys[:ssh][:host_ecdsa_public].nil? && file_exist?("/etc/ssh/ssh_host_ecdsa_key.pub")
-      content = file_read("/etc/ssh/ssh_host_ecdsa_key.pub")
-      keys[:ssh][:host_ecdsa_public] = content.split[1]
-      keys[:ssh][:host_ecdsa_type] = content.split[0]
-    end
-
-    if keys[:ssh][:host_ed25519_public].nil? && file_exist?("/etc/ssh/ssh_host_ed25519_key.pub")
-      keys[:ssh][:host_ed25519_public] = file_read("/etc/ssh/ssh_host_ed25519_key.pub").split[1]
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Bryan McLellan <btm@chef.io>
+# 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(:SSHHostKey) do
+  provides "keys/ssh"
+  depends "keys"
+
+  def extract_keytype?(content)
+    case content[0]
+    when "ssh-dss"
+      [ "dsa", nil ]
+    when "ssh-rsa"
+      [ "rsa", nil ]
+    when /^ecdsa/
+      [ "ecdsa", content[0] ]
+    when "ssh-ed25519"
+      [ "ed25519", nil ]
+    else
+      [ nil, nil ]
+    end
+  end
+
+  collect_data do
+    keys[:ssh] = Mash.new
+
+    sshd_config = if file_exist?("/etc/ssh/sshd_config")
+                    "/etc/ssh/sshd_config"
+                  elsif file_exist?("/etc/sshd_config")
+                    # Darwin
+                    "/etc/sshd_config"
+                  else
+                    logger.trace("Plugin SSHHostKey: Failed to find sshd configuration file")
+                    nil
+                  end
+
+    if sshd_config
+      file_open(sshd_config) do |conf|
+        conf.each_line do |line|
+          if /^hostkey\s/i.match?(line)
+            pub_file = "#{line.split[1]}.pub"
+            content = file_read(pub_file).split
+            key_type, key_subtype = extract_keytype?(content)
+            keys[:ssh]["host_#{key_type}_public"] = content[1] unless key_type.nil?
+            keys[:ssh]["host_#{key_type}_type"] = key_subtype unless key_subtype.nil?
+          end
+        end
+      end
+    end
+
+    if keys[:ssh][:host_dsa_public].nil? && file_exist?("/etc/ssh/ssh_host_dsa_key.pub")
+      keys[:ssh][:host_dsa_public] = file_read("/etc/ssh/ssh_host_dsa_key.pub").split[1]
+    end
+
+    if keys[:ssh][:host_rsa_public].nil? && file_exist?("/etc/ssh/ssh_host_rsa_key.pub")
+      keys[:ssh][:host_rsa_public] = file_read("/etc/ssh/ssh_host_rsa_key.pub").split[1]
+    end
+
+    if keys[:ssh][:host_ecdsa_public].nil? && file_exist?("/etc/ssh/ssh_host_ecdsa_key.pub")
+      content = file_read("/etc/ssh/ssh_host_ecdsa_key.pub")
+      keys[:ssh][:host_ecdsa_public] = content.split[1]
+      keys[:ssh][:host_ecdsa_type] = content.split[0]
+    end
+
+    if keys[:ssh][:host_ed25519_public].nil? && file_exist?("/etc/ssh/ssh_host_ed25519_key.pub")
+      keys[:ssh][:host_ed25519_public] = file_read("/etc/ssh/ssh_host_ed25519_key.pub").split[1]
+    end
+  end
+end

data/lib/ohai/plugins/sysconf.rb

@@ -1,46 +1,46 @@
-# frozen_string_literal: true
-#
-# Author:: Davide Cavalca <dcavalca@fb.com>
-# Copyright:: Copyright (c) 2016 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(:Sysconf) do
-  provides "sysconf"
-
-  collect_data(:aix, :linux, :solaris2) do
-    getconf_path = which("getconf")
-    if getconf_path
-      getconf = shell_out("#{getconf_path} -a")
-
-      if getconf.exitstatus == 0
-        sysconf Mash.new unless sysconf
-
-        getconf.stdout.split("\n").each do |line|
-          key, val = /^(\S+)\s*(.*)?$/.match(line).captures
-          if val && !val.empty?
-            begin
-              sysconf[key] = Integer(val)
-            rescue
-              sysconf[key] = val
-            end
-          else
-            sysconf[key] = nil
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Davide Cavalca <dcavalca@fb.com>
+# Copyright:: Copyright (c) 2016 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(:Sysconf) do
+  provides "sysconf"
+
+  collect_data(:aix, :linux, :solaris2) do
+    getconf_path = which("getconf")
+    if getconf_path
+      getconf = shell_out("#{getconf_path} -a")
+
+      if getconf.exitstatus == 0
+        sysconf Mash.new unless sysconf
+
+        getconf.stdout.split("\n").each do |line|
+          key, val = /^(\S+)\s*(.*)?$/.match(line).captures
+          if val && !val.empty?
+            begin
+              sysconf[key] = Integer(val)
+            rescue
+              sysconf[key] = val
+            end
+          else
+            sysconf[key] = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ohai/plugins/timezone.rb

@@ -1,25 +1,45 @@
-# frozen_string_literal: true
-#
-# Author:: John Bellone (<jbellone@bloomberg.net>)
-# 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(:Timezone) do
-  provides "time/timezone"
-
-  collect_data(:default) do
-    time Mash.new unless time
-    time[:timezone] = Time.now.getlocal.zone
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: John Bellone (<jbellone@bloomberg.net>)
+# 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(:Timezone) do
+  provides "time/timezone"
+
+  collect_data(:default) do
+    time Mash.new unless time
+    time[:timezone] = Time.now.getlocal.zone
+
+    # Windows in German display language outputs LATIN1 bytes for .zone, but marks them as
+    # IBM437, which somehow fails any attempt at conversion to other encodings when
+    # ä is present, as in the timezone name "Mitteleuropäische Zeit" (Central Europe Time)
+    #
+    # Windows-1252 is the legacy encoding for Windows for German that actually
+    # translates (ISO-8859-1 works as well), but going with the more correct
+    # encoding name for Windows' implementation of Latin-1
+    #
+    # References
+    # * [Code Page 437/IBM437](https://en.wikipedia.org/wiki/Code_page_437)
+    # * [ISO/IEC 8859-1](https://en.wikipedia.org/wiki/ISO/IEC_8859-1)
+    # * [Windows-1252](https://en.wikipedia.org/wiki/Windows-1252)
+    if time[:timezone].encoding == Encoding::IBM437
+      # Assume encoding is WINDOWS_1252
+      time[:timezone] = time[:timezone].force_encoding(Encoding::WINDOWS_1252)
+      # Re-encode in UTF_8. Note: If other encodings have problems converting
+      # it might be worth re-encode everything in UTF_8.
+      time[:timezone] = time[:timezone].encode(Encoding::UTF_8)
+    end
+  end
+end

data/lib/ohai/plugins/train.rb

@@ -1,35 +1,35 @@
-# frozen_string_literal: true
-#
-# 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(:Train) do
-  provides "train"
-
-  collect_data do
-    if transport_connection
-      train Mash.new
-      train["family_hierarchy"] = transport_connection.platform.family_hierarchy
-      train["family"] = transport_connection.platform.family
-      train["platform"] = transport_connection.platform.platform
-      train["backend"] = transport_connection.backend_type
-      if transport_connection.respond_to?(:uri)
-        train["scheme"] = URI.parse(transport_connection.uri).scheme
-        train["uri"] = transport_connection.uri
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# 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(:Train) do
+  provides "train"
+
+  collect_data do
+    if transport_connection
+      train Mash.new
+      train["family_hierarchy"] = transport_connection.platform.family_hierarchy
+      train["family"] = transport_connection.platform.family
+      train["platform"] = transport_connection.platform.platform
+      train["backend"] = transport_connection.backend_type
+      if transport_connection.respond_to?(:uri)
+        train["scheme"] = URI.parse(transport_connection.uri).scheme
+        train["uri"] = transport_connection.uri
+      end
+    end
+  end
+end