ohai 16.5.6 → 16.6.5

data/lib/ohai/plugins/ohai_time.rb

@@ -19,7 +19,7 @@
 Ohai.plugin(:OhaiTime) do
   provides "ohai_time"
 
-  collect_data do
+  collect_data(:default, :target) do
     ohai_time Time.now.to_f
   end
 end

data/lib/ohai/plugins/os.rb

@@ -37,6 +37,10 @@ Ohai.plugin(:OS) do
     os_version shell_out("sysctl -n kern.osreldate").stdout.split($/)[0]
   end
 
+  collect_data(:target) do
+    os collect_os
+  end
+
   collect_data do
     os collect_os
     os_version kernel[:release]

data/lib/ohai/plugins/passwd.rb

@@ -42,6 +42,62 @@ Ohai.plugin(:Passwd) do
   end
 
   collect_data(:windows) do
-    # Etc returns nil on Windows
+    require "wmi-lite/wmi" unless defined?(WmiLite::Wmi)
+
+    unless etc
+      etc Mash.new
+
+      wmi = WmiLite::Wmi.new
+
+      etc[:passwd] = Mash.new
+      users = wmi.query("SELECT * FROM Win32_UserAccount WHERE LocalAccount = True")
+      users.each do |user|
+        uname = user["Name"].strip.downcase
+        Ohai::Log.debug("processing user #{uname}")
+        etc[:passwd][uname] = Mash.new
+        wmi_obj = user.wmi_ole_object
+        wmi_obj.properties_.each do |key|
+          etc[:passwd][uname][key.name.downcase] = user[key.name]
+        end
+      end
+
+      etc[:group] = Mash.new
+      groups = wmi.query("SELECT * FROM Win32_Group WHERE LocalAccount = True")
+      groups.each do |group|
+        gname = group["Name"].strip.downcase
+        Ohai::Log.debug("processing group #{gname}")
+        etc[:group][gname] = Mash.new
+        wmi_obj = group.wmi_ole_object
+        wmi_obj.properties_.each do |key|
+          etc[:group][gname][key.name.downcase] = group[key.name]
+        end
+
+        # This is the primary reason that we're using WMI instead of powershell
+        # cmdlets - the powershell start up cost is huge, and you *must* do this
+        # query for every. single. group. individually.
+
+        # The query returns nothing unless you specify domain *and* name, it's
+        # a path, not a set of queries.
+        subq = "Win32_Group.Domain='#{group["Domain"]}',Name='#{group["Name"]}'"
+        members = wmi.query(
+          "SELECT * FROM Win32_GroupUser WHERE GroupComponent=\"#{subq}\""
+        )
+        etc[:group][gname]["members"] = members.map do |member|
+          mi = {}
+          info = Hash[
+            member["partcomponent"].split(",").map { |x| x.split("=") }.map { |a, b| [a, b.undump] }
+          ]
+          if info.keys.any? { |x| x.match?("Win32_UserAccount") }
+            mi["type"] = :user
+          else
+            # Note: the type here is actually Win32_SystemAccount, because,
+            # that's what groups are in the Windows universe.
+            mi["type"] = :group
+          end
+          mi["name"] = info["Name"]
+          mi
+        end
+      end
+    end
   end
 end

data/lib/ohai/plugins/scaleway.rb

@@ -26,7 +26,7 @@ Ohai.plugin(:Scaleway) do
   # looks for `scaleway` keyword in kernel command line
   # @return [Boolean] do we have the keyword or not?
   def has_scaleway_cmdline?
-    if ::File.exist?("/proc/cmdline") && /scaleway/.match?(::File.read("/proc/cmdline"))
+    if file_exist?("/proc/cmdline") && /scaleway/.match?(file_read("/proc/cmdline"))
       logger.trace("Plugin Scaleway: has_scaleway_cmdline? == true")
       return true
     end

data/lib/ohai/plugins/shells.rb

@@ -20,9 +20,9 @@ Ohai.plugin(:Shells) do
   provides "shells"
 
   collect_data do
-    if ::File.exist?("/etc/shells")
+    if file_exist?("/etc/shells")
       shells []
-      ::File.readlines("/etc/shells").each do |line|
+      file_open("/etc/shells").readlines.each do |line|
         # remove carriage returns and skip over comments / empty lines
         shells << line.chomp if line[0] == "/"
       end

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

@@ -128,7 +128,7 @@ Ohai.plugin(:DMI) do
           id = smb_to_id[header_information[3]]
 
           # Don't overcapture for now (OHAI-260)
-          unless Ohai::Common::DMI.whitelisted_ids.include?(id)
+          unless Ohai::Common::DMI.allowlisted_ids.include?(id)
             dmi_record = nil
             next
           end

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

@@ -20,7 +20,7 @@ Ohai.plugin(:Platform) do
   provides "platform", "platform_version", "platform_build", "platform_family"
 
   collect_data(:solaris2) do
-    if File.exist?("/sbin/uname")
+    if file_exist?("/sbin/uname")
       uname_exec = "/sbin/uname"
     else
       uname_exec = "uname"
@@ -35,7 +35,7 @@ Ohai.plugin(:Platform) do
       end
     end
 
-    File.open("/etc/release") do |file|
+    file_open("/etc/release") do |file|
       while ( line = file.gets )
         case line
         when /^.*(SmartOS).*$/

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

@@ -34,7 +34,7 @@ Ohai.plugin(:Virtualization) do
 
     # Detect paravirt KVM/QEMU from cpuinfo, report as KVM
     psrinfo_path = Ohai.abs_path( "/usr/sbin/psrinfo" )
-    if File.exist?(psrinfo_path)
+    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"

data/lib/ohai/plugins/ssh_host_key.rb

@@ -38,9 +38,9 @@ Ohai.plugin(:SSHHostKey) do
   collect_data do
     keys[:ssh] = Mash.new
 
-    sshd_config = if File.exist?("/etc/ssh/sshd_config")
+    sshd_config = if file_exist?("/etc/ssh/sshd_config")
                     "/etc/ssh/sshd_config"
-                  elsif File.exist?("/etc/sshd_config")
+                  elsif file_exist?("/etc/sshd_config")
                     # Darwin
                     "/etc/sshd_config"
                   else
@@ -49,11 +49,11 @@ Ohai.plugin(:SSHHostKey) do
                   end
 
     if sshd_config
-      File.open(sshd_config) do |conf|
+      file_open(sshd_config) do |conf|
         conf.each_line do |line|
           if /^hostkey\s/i.match?(line)
             pub_file = "#{line.split[1]}.pub"
-            content = IO.read(pub_file).split
+            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?
@@ -62,22 +62,22 @@ Ohai.plugin(:SSHHostKey) do
       end
     end
 
-    if keys[:ssh][:host_dsa_public].nil? && File.exist?("/etc/ssh/ssh_host_dsa_key.pub")
-      keys[:ssh][:host_dsa_public] = IO.read("/etc/ssh/ssh_host_dsa_key.pub").split[1]
+    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] = IO.read("/etc/ssh/ssh_host_rsa_key.pub").split[1]
+    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 = IO.read("/etc/ssh/ssh_host_ecdsa_key.pub")
+    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] = IO.read("/etc/ssh/ssh_host_ed25519_key.pub").split[1]
+    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/train.rb

@@ -0,0 +1,35 @@
+#
+# 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
+      else
+      end
+    end
+  end
+end

data/lib/ohai/plugins/uptime.rb

@@ -54,7 +54,7 @@ Ohai.plugin(:Uptime) do
   end
 
   collect_data(:linux) do
-    uptime, idletime = File.open("/proc/uptime").gets.split(" ")
+    uptime, idletime = file_open("/proc/uptime").gets.split(" ")
     uptime_seconds uptime.to_i
     uptime seconds_to_human(uptime.to_i)
     idletime_seconds idletime.to_i

data/lib/ohai/plugins/vmware.rb

@@ -41,7 +41,7 @@ Ohai.plugin(:VMware) do
   end
 
   def get_vm_attributes(vmtools_path)
-    if !File.exist?(vmtools_path)
+    if !file_exist?(vmtools_path)
       logger.trace("Plugin VMware: #{vmtools_path} not found")
     else
       vmware Mash.new

data/lib/ohai/runner.rb

@@ -24,6 +24,9 @@ module Ohai
   class Runner
 
     attr_reader :failed_plugins, :logger
+
+    attr_accessor :transport_connection
+
     # safe_run: set to true if this runner will run plugins in
     # safe-mode. default false.
     def initialize(controller, safe_run = false)
@@ -93,6 +96,7 @@ module Ohai
         end
 
         if dependency_providers.empty?
+          next_plugin.transport_connection = transport_connection
           @safe_run ? next_plugin.safe_run : next_plugin.run
           if next_plugin.failed
             @failed_plugins << next_plugin.name

data/lib/ohai/system.rb

@@ -29,7 +29,9 @@ require_relative "mixin/constant_helper"
 require_relative "provides_map"
 require_relative "hints"
 require_relative "config"
+require_relative "train_transport"
 require "ffi_yajl" unless defined?(FFI_Yajl)
+require "cgi" unless defined?(CGI)
 
 module Ohai
   # The class used by Ohai::Application and Chef to actually collect data
@@ -40,6 +42,7 @@ module Ohai
     attr_reader :config
     attr_reader :provides_map
     attr_reader :logger
+    attr_writer :transport_connection
 
     # the cli flag is used to determine if we're being constructed by
     # something like chef-client (which doesn't set this flag) and
@@ -67,7 +70,6 @@ module Ohai
       configure_logging if @cli
 
       @loader = Ohai::Loader.new(self)
-      @runner = Ohai::Runner.new(self, true)
 
       Ohai::Hints.refresh_hints
 
@@ -75,6 +77,13 @@ module Ohai
       recursive_remove_constants(Ohai::NamedPlugin)
     end
 
+    def runner
+      @runner ||=
+        Ohai::Runner.new(self, true).tap do |runner|
+          runner.transport_connection = transport_connection unless transport_connection.nil?
+        end
+    end
+
     def [](key)
       @data[key]
     end
@@ -102,6 +111,13 @@ module Ohai
       @loader.load_all
     end
 
+    # get backend parameters for target mode
+    #
+    # @return [Train::Transport]
+    def transport_connection
+      @transport_connection ||= Ohai::TrainTransport.new(logger).build_transport&.connection
+    end
+
     # run all plugins or those that match the attribute filter is provided
     #
     # @param safe [Boolean]
@@ -111,13 +127,14 @@ module Ohai
     def run_plugins(safe = false, attribute_filter = nil)
       begin
         @provides_map.all_plugins(attribute_filter).each do |plugin|
-          @runner.run_plugin(plugin)
+          runner.run_plugin(plugin)
         end
+        transport_connection.close unless transport_connection.nil?
       rescue Ohai::Exceptions::AttributeNotFound, Ohai::Exceptions::DependencyCycle => e
         logger.error("Encountered error while running plugins: #{e.inspect}")
         raise
       end
-      critical_failed = Ohai::Config.ohai[:critical_plugins] & @runner.failed_plugins
+      critical_failed = Ohai::Config.ohai[:critical_plugins] & runner.failed_plugins
       unless critical_failed.empty?
         msg = "The following Ohai plugins marked as critical failed: #{critical_failed}"
         if @cli
@@ -139,7 +156,7 @@ module Ohai
     def run_additional_plugins(plugin_path)
       @loader.load_additional(plugin_path).each do |plugin|
         logger.trace "Running plugin #{plugin}"
-        @runner.run_plugin(plugin)
+        runner.run_plugin(plugin)
       end
 
       freeze_strings!
@@ -225,5 +242,16 @@ module Ohai
       end
       visitor.call(@data)
     end
+
+    # Extract additional backend parameters from Target Mode URL.
+    #
+    # @api private
+    # @return [Hash]
+    def backend_parameters
+      uri = URI.parse(config[:target])
+      return {} unless uri.query
+
+      CGI.parse(uri.query).map { |k, v| [k.to_sym, v.first] }.to_h
+    end
   end
 end

data/lib/ohai/train_transport.rb

@@ -0,0 +1,28 @@
+# Author:: Bryan McLellan <btm@loftninjas.org>
+# 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.
+#
+
+require "chef-config/mixin/train_transport" unless defined?(ChefConfig::Mixin::TrainTransport)
+
+module Ohai
+  class TrainTransport
+    include ChefConfig::Mixin::TrainTransport
+
+    def config
+      Ohai::Config
+    end
+  end
+end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "16.5.6".freeze
+  VERSION = "16.6.5".freeze
 end

data/ohai.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.email = "adam@chef.io"
   s.homepage = "https://github.com/chef/ohai/"
 
-  s.required_ruby_version = ">= 2.5"
+  s.required_ruby_version = ">= 2.6"
 
   s.add_dependency "chef-config", ">= 12.8", "< 17"
   s.add_dependency "chef-utils", ">= 16.0", "< 17"
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
   s.add_dependency "plist", "~> 3.1"
   s.add_dependency "wmi-lite", "~> 1.0"
+  s.add_dependency "train-core"
   # Note for ohai developers: If chef-config causes you grief, try:
   #     bundle install --with development
   # this should work as long as chef is a development dependency in Gemfile.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 16.5.6
+  version: 16.6.5
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-21 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -194,6 +194,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: train-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ohai profiles your system and emits JSON
 email: adam@chef.io
 executables:
@@ -232,6 +246,7 @@ files:
 - lib/ohai/mixin/shell_out.rb
 - lib/ohai/mixin/softlayer_metadata.rb
 - lib/ohai/mixin/string.rb
+- lib/ohai/mixin/train_helpers.rb
 - lib/ohai/mixin/which.rb
 - lib/ohai/plugin_config.rb
 - lib/ohai/plugins/aix/kernel.rb
@@ -336,6 +351,7 @@ files:
 - lib/ohai/plugins/ssh_host_key.rb
 - lib/ohai/plugins/sysconf.rb
 - lib/ohai/plugins/timezone.rb
+- lib/ohai/plugins/train.rb
 - lib/ohai/plugins/uptime.rb
 - lib/ohai/plugins/virtualbox.rb
 - lib/ohai/plugins/vmware.rb
@@ -350,6 +366,7 @@ files:
 - lib/ohai/provides_map.rb
 - lib/ohai/runner.rb
 - lib/ohai/system.rb
+- lib/ohai/train_transport.rb
 - lib/ohai/util/file_helper.rb
 - lib/ohai/util/ip_helper.rb
 - lib/ohai/util/win32.rb
@@ -367,7 +384,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="