ohai 8.14.0 → 8.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 880a68c3c0a321e516f4ebd6fe4d8ea96dc4bd81
-  data.tar.gz: e6f7e6019d46c47e58cc642ba8104624bd5cfdd3
+  metadata.gz: 7df39abb86c4a5e8f6936d8f0707ae4ff7de75ed
+  data.tar.gz: 16f9c140d9b23470add7d01886bfd6221b58300f
 SHA512:
-  metadata.gz: 79c39d1fc907eda3130f429f3ca5f0b7511e5448e83188ef6d59148b36d8e661bcc550a8e61eb194259c32fe42e015e5ef49236cde4636af68f1ad6d744326c1
-  data.tar.gz: 967a82e37972b3d947c81612d983e52124479c419d4a1161a9bf8e825d61b40fbeea720ff9658981daa2a228d87d04eec2048dc44ec64752c4b763dba795abd1
+  metadata.gz: 4f2e803ef3895622aafedf24da387c4b95afebd0bd09b7442eee279ad2b6a974145c1c3cbc1ff8eee8465a37366afdbfad5e85cb88048271c4b03004fd7598ca
+  data.tar.gz: 12ae394e37c107d5cc10a162928aabc9dba06685d578b7cd188141a8ad91f2dbb66deb966501965880eec9d10e7bc49e7239bf6ecf64d88aa7fba21ba6fc263d

data/lib/ohai/hints.rb

@@ -22,28 +22,30 @@ require "ffi_yajl"
 module Ohai
   module Hints
     def self.refresh_hints
-      @hints = Hash.new
+      @hints = {}
+    end
+
+    def self.parse_hint_file(filename)
+      json_parser = FFI_Yajl::Parser.new
+      hash = json_parser.parse(File.read(filename))
+      hash || {} # hint
+      # should exist because the file did, even if it didn't
+      # contain anything
+    rescue FFI_Yajl::ParseError => e
+      Ohai::Log.error("Could not parse hint file at #{filename}: #{e.message}")
     end
 
     def self.hint?(name)
-      @hints ||= Hash.new
+      @hints ||= {}
       return @hints[name] if @hints[name]
-
       Ohai.config[:hints_path].each do |path|
         filename = File.join(path, "#{name}.json")
-        if File.exist?(filename)
-          begin
-            json_parser = FFI_Yajl::Parser.new
-            hash = json_parser.parse(File.read(filename))
-            @hints[name] = hash || Hash.new # hint
-            # should exist because the file did, even if it didn't
-            # contain anything
-          rescue FFI_Yajl::ParseError => e
-            Ohai::Log.error("Could not parse hint file at #{filename}: #{e.message}")
-          end
-        end
+        next unless File.exist?(filename)
+        Ohai::Log.debug("Found hint #{name}.json at #{filename}")
+        @hints[name] = parse_hint_file(filename)
       end
 
+      Ohai::Log.debug("Did not find hint #{name}.json in the hint path(s): #{Ohai.config[:hints_path].join(', ')} ") unless @hints.key?(name)
       @hints[name]
     end
   end

data/lib/ohai/plugins/c.rb

@@ -53,7 +53,7 @@ Ohai.plugin(:C) do
           c[:glibc][:version] = $1
           c[:glibc][:description] = description
         end
-      end unless c[:glibc]
+      end unless c[:glibc] || ::RbConfig::CONFIG["host_os"] =~ /mswin|mingw32|windows/
     end
 
     #ms cl

data/lib/ohai/plugins/elixir.rb

@@ -15,18 +15,24 @@
 
 Ohai.plugin(:Elixir) do
   provides "languages/elixir"
-
   depends "languages"
 
   collect_data do
-    output = nil
-
-    elixir = Mash.new
-    so = shell_out("elixir -v")
-    if so.exitstatus == 0
-      output = so.stdout.split
-      elixir[:version] = output[1]
-      languages[:elixir] = elixir if elixir[:version]
+    begin
+      so = shell_out("elixir -v")
+      # Sample output:
+      # Erlang/OTP 18 [erts-7.3] [source] [64-bit] [smp:8:8] [async-threads:10] [hipe] [kernel-poll:false] [dtrace]
+      #
+      # Elixir 1.2.4
+      if so.exitstatus == 0
+        elixir = Mash.new
+        if so.stdout =~ /^Elixir (\S*)/
+          elixir[:version] = $1
+          languages[:elixir] = elixir
+        end
+      end
+    rescue Ohai::Exceptions::Exec
+      Ohai::Log.debug('Elixir plugin: Could not shell_out "elixir -v". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/erlang.rb

@@ -18,26 +18,44 @@
 
 Ohai.plugin(:Erlang) do
   provides "languages/erlang"
-
   depends "languages"
 
   collect_data do
-    output = nil
-
     erlang = Mash.new
-    so = shell_out("erl +V")
-    if so.exitstatus == 0
-      output = so.stderr.split
-      if output.length >= 6
-        options = output[1]
-        options.gsub!(/(\(|\))/, "")
-        erlang[:version] = output[5]
-        erlang[:options] = options.split(",")
-        erlang[:emulator] = output[2].gsub!(/(\(|\))/, "")
-        if erlang[:version] && erlang[:options] && erlang[:emulator]
-          languages[:erlang] = erlang
+
+    begin
+      so = shell_out("erl -eval 'erlang:display(erlang:system_info(otp_release)), erlang:display(erlang:system_info(version)), erlang:display(erlang:system_info(nif_version)), halt().'  -noshell")
+      # Sample output:
+      # "18"
+      # "7.3"
+      # "2.10"
+      if so.exitstatus == 0
+        output = so.stdout.split(/\r\n/).map! { |x| x.delete('\\"') }
+        erlang[:version] = output[0]
+        erlang[:erts_version] = output[1]
+        erlang[:nif_version] = output[2]
+      end
+    rescue Ohai::Exceptions::Exec
+      Ohai::Log.debug('Erlang plugin: Could not shell_out "erl -eval \'erlang:display(erlang:system_info(otp_release)), erlang:display(erlang:system_info(version)), erlang:display(erlang:system_info(nif_version)), halt().\'  -noshell". Skipping data')
+    end
+
+    begin
+      so = shell_out("erl +V")
+      # Sample output:
+      # Erlang (SMP,ASYNC_THREADS,HIPE) (BEAM) emulator version 7.3
+      if so.exitstatus == 0
+        output = so.stderr.split
+        if output.length >= 6
+          options = output[1]
+          options.gsub!(/(\(|\))/, "")
+          erlang[:options] = options.split(",")
+          erlang[:emulator] = output[2].gsub!(/(\(|\))/, "")
         end
       end
+    rescue Ohai::Exceptions::Exec
+      Ohai::Log.debug('Erlang plugin: Could not shell_out "erl +V". Skipping data')
     end
+
+    languages[:erlang] = erlang unless erlang.empty?
   end
 end

data/lib/ohai/plugins/linux/fips.rb

@@ -0,0 +1,38 @@
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+# Copyright:: Copyright (c) 2016 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.
+#
+
+# After long discussion in IRC the "powers that be" have come to a concensus
+# that there is no other Windows platforms exist that were not based on the
+# Windows_NT kernel, so we herby decree that "windows" will refer to all
+# platforms built upon the Windows_NT kernel and have access to win32 or win64
+# subsystems.
+
+Ohai.plugin(:Fips) do
+  provides "fips"
+
+  collect_data(:linux) do
+    fips Mash.new
+
+    begin
+      enabled = File.read("/proc/sys/crypto/fips_enabled").chomp
+      fips["kernel"] = { "enabled" => enabled == "0" ? false : true }
+    rescue Errno::ENOENT
+      fips["kernel"] = { "enabled" => false }
+    end
+  end
+end

data/lib/ohai/plugins/mono.rb

@@ -18,24 +18,33 @@
 
 Ohai.plugin(:Mono) do
   provides "languages/mono"
-
   depends "languages"
 
   collect_data do
-    output = nil
-
-    mono = Mash.new
 
-    so = shell_out("mono -V")
-    if so.exitstatus == 0
-      output = so.stdout.split
-      if output.length >= 4
-        mono[:version] = output[4]
-      end
-      if output.length >= 11
-        mono[:builddate] = "%s %s %s %s" % [output[6], output[7], output[8], output[11].delete!(")")]
+    begin
+      # Mono JIT compiler version 4.2.3 (Stable 4.2.3.4/832de4b Wed Mar 30 13:57:48 PDT 2016)
+      # Copyright (C) 2002-2014 Novell, Inc, Xamarin Inc and Contributors. www.mono-project.com
+      # 	TLS:           normal
+      # 	SIGSEGV:       altstack
+      # 	Notification:  kqueue
+      # 	Architecture:  amd64
+      # 	Disabled:      none
+      # 	Misc:          softdebug
+      # 	LLVM:          supported, not enabled.
+      # 	GC:            sgen
+      so = shell_out("mono -V")
+      if so.exitstatus == 0
+        mono = Mash.new
+        output = so.stdout.split
+        mono[:version] = output[4] unless output[4].nil?
+        if output.length >= 12
+          mono[:builddate] = "%s %s %s %s %s %s" % [output[7], output[8], output[9], output[10], output[11], output[12].delete!(")")]
+        end
+        languages[:mono] = mono unless mono.empty?
       end
-      languages[:mono] = mono if mono[:version]
+    rescue Ohai::Exceptions::Exec
+      Ohai::Log.debug('Mono plugin: Could not shell_out "mono -V". Skipping plugin')
     end
   end
 end

data/lib/ohai/plugins/scala.rb

@@ -20,24 +20,31 @@ Ohai.plugin(:Scala) do
   depends "languages"
 
   collect_data(:default) do
-    # Check for scala
-    output = nil
-
     scala = Mash.new
-    so = shell_out("scala -version")
-    if so.exitstatus == 0
-      output = so.stdout.split
-      scala[:version] = output[4]
-      languages[:scala] = scala if scala[:version]
+
+    # Check for scala
+    begin
+      # Scala code runner version 2.11.8 -- Copyright 2002-2016, LAMP/EPFL
+      so = shell_out("scala -version")
+      if so.exitstatus == 0
+        scala[:version] = so.stderr.split[4]
+      end
+    rescue Ohai::Exceptions::Exec
+      # ignore shell_out failures
     end
 
     # Check for sbt
-    output = nil
-
-    so = shell_out("sbt --version")
-    if so.exitstatus == 0
-      output = so.stdout.split
-      scala[:sbt] = output[3] if scala[:version]
+    begin
+      # sbt launcher version 0.13.7
+      so = shell_out("sbt --version")
+      if so.exitstatus == 0
+        scala[:sbt] = Mash.new
+        scala[:sbt][:version] = so.stdout.split[3]
+      end
+    rescue Ohai::Exceptions::Exec
+      # ignore shell_out failures
     end
+
+    languages[:scala] = scala unless scala.empty?
   end
 end

data/lib/ohai/plugins/windows/fips.rb

@@ -0,0 +1,50 @@
+#
+# Author:: Matt Wrock (<matt@mattwrock.com>)
+# Copyright:: Copyright (c) 2016 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.
+#
+
+# After long discussion in IRC the "powers that be" have come to a concensus
+# that there is no other Windows platforms exist that were not based on the
+# Windows_NT kernel, so we herby decree that "windows" will refer to all
+# platforms built upon the Windows_NT kernel and have access to win32 or win64
+# subsystems.
+
+Ohai.plugin(:Fips) do
+  provides "fips"
+
+  collect_data(:windows) do
+    require "win32/registry"
+    fips Mash.new
+
+    # from http://msdn.microsoft.com/en-us/library/windows/desktop/aa384129(v=vs.85).aspx
+    if ::RbConfig::CONFIG["target_cpu"] == "i386"
+      reg_type = Win32::Registry::KEY_READ | 0x100
+    elsif ::RbConfig::CONFIG["target_cpu"] == "x86_64"
+      reg_type = Win32::Registry::KEY_READ | 0x200
+    else
+      reg_type = Win32::Registry::KEY_READ
+    end
+
+    begin
+      Win32::Registry::HKEY_LOCAL_MACHINE.open('System\CurrentControlSet\Control\Lsa\FIPSAlgorithmPolicy', reg_type) do |policy|
+        enabled = policy["Enabled"]
+        fips["kernel"] = { "enabled" => enabled == 0 ? false : true }
+      end
+    rescue Win32::Registry::Error
+      fips["kernel"] = { "enabled" => false }
+    end
+  end
+end

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "8.14.0"
+  VERSION = "8.15.0"
 end

data/spec/unit/plugins/azure_spec.rb

@@ -20,34 +20,50 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb")
 require "open-uri"
 
 describe Ohai::System, "plugin azure" do
-  before(:each) do
-    @plugin = get_plugin("azure")
+  let(:plugin) { get_plugin("azure") }
+  let(:hint) {
+    {
+      "public_ip" => "137.135.46.202",
+      "vm_name" => "test-vm",
+      "public_fqdn" => "service.cloudapp.net",
+      "public_ssh_port" => "22",
+      "public_winrm_port" => "5985",
+    }
+  }
+
+  shared_examples_for "!azure" do
+    it "does not set the azure attribute" do
+      plugin.run
+      expect(plugin[:azure]).to be_nil
+    end
+  end
+
+  shared_examples_for "azure" do
+    it "sets the azure attribute" do
+      plugin.run
+      expect(plugin[:azure]).to be_truthy
+    end
   end
 
   describe "with azure hint file" do
     before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(true)
-      allow(File).to receive(:read).with("/etc/chef/ohai/hints/azure.json").and_return('{"public_ip":"137.135.46.202","vm_name":"test-vm","public_fqdn":"service.cloudapp.net","public_ssh_port":"22", "public_winrm_port":"5985"}')
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(true)
-      allow(File).to receive(:read).with('C:\chef\ohai\hints/azure.json').and_return('{"public_ip":"137.135.46.202","vm_name":"test-vm","public_fqdn":"service.cloudapp.net","public_ssh_port":"22", "public_winrm_port":"5985"}')
-      @plugin.run
+      allow(plugin).to receive(:hint?).with("azure").and_return(hint)
     end
 
-    it "should set the azure cloud attributes" do
-      expect(@plugin[:azure]).not_to be_nil
-      expect(@plugin[:azure]["public_ip"]).to eq("137.135.46.202")
-      expect(@plugin[:azure]["vm_name"]).to eq("test-vm")
-      expect(@plugin[:azure]["public_fqdn"]).to eq("service.cloudapp.net")
-      expect(@plugin[:azure]["public_ssh_port"]).to eq("22")
-      expect(@plugin[:azure]["public_winrm_port"]).to eq("5985")
+    it "sets the azure cloud attributes" do
+      plugin.run
+      expect(plugin[:azure]["public_ip"]).to eq("137.135.46.202")
+      expect(plugin[:azure]["vm_name"]).to eq("test-vm")
+      expect(plugin[:azure]["public_fqdn"]).to eq("service.cloudapp.net")
+      expect(plugin[:azure]["public_ssh_port"]).to eq("22")
+      expect(plugin[:azure]["public_winrm_port"]).to eq("5985")
     end
 
   end
 
   describe "without azure hint file or agent or dhcp options" do
     before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(false)
+      allow(plugin).to receive(:hint?).with("azure").and_return(false)
       allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
       allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(false)
       allow(File).to receive(:exist?).with("/var/lib/dhcp/dhclient.eth0.leases").and_return(true)
@@ -73,66 +89,46 @@ describe Ohai::System, "plugin azure" do
         and_yield("  expire 2 2016/03/01 16:40:56;").
         and_yield("}")
       allow(File).to receive(:open).with("/var/lib/dhcp/dhclient.eth0.leases").and_return(@double_file)
-      @plugin.run
     end
 
-    it "should not behave like azure" do
-      expect(@plugin[:azure]).to be_nil
-    end
+    it_behaves_like "!azure"
   end
 
-  describe "with rackspace hint file no agent and no dhcp lease" do
+  describe "with rackspace hint file, no agent, and no dhcp lease" do
     before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/rackspace.json").and_return(true)
-      allow(File).to receive(:read).with("/etc/chef/ohai/hints/rackspace.json").and_return("")
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/rackspace.json').and_return(true)
-      allow(File).to receive(:read).with('C:\chef\ohai\hints/rackspace.json').and_return("")
+      allow(plugin).to receive(:hint?).with("rackspace").and_return(true)
+      allow(plugin).to receive(:hint?).with("azure").and_return(false)
       allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(false)
       allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(false)
       allow(File).to receive(:exist?).with("/var/lib/dhcp/dhclient.eth0.leases").and_return(false)
-      @plugin.run
     end
 
-    it "should not behave like azure" do
-      expect(@plugin[:azure]).to be_nil
-    end
+    it_behaves_like "!azure"
   end
 
   describe "without azure hint file but with agent on linux" do
     before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(false)
+      allow(plugin).to receive(:hint?).with("azure").and_return(false)
       allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(true)
       allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(false)
-      @plugin.run
     end
 
-    it "should create empty azure mash" do
-      expect(@plugin[:azure]).to be_empty
-    end
+    it_behaves_like "azure"
   end
 
   describe "without azure hint file but with agent on windows" do
     before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(false)
+      allow(plugin).to receive(:hint?).with("azure").and_return(false)
       allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
       allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(true)
-      @plugin.run
     end
 
-    it "should create empty azure mash" do
-      puts "The dir exists?:" + "#{Dir.exist?('C:\WindowsAzure')}"
-      expect(@plugin[:azure]).to be_empty
-    end
+    it_behaves_like "azure"
   end
 
   describe "without azure hint or agent but with dhcp option" do
     before(:each) do
-      allow(File).to receive(:exist?).with("/etc/chef/ohai/hints/azure.json").and_return(false)
-      allow(File).to receive(:exist?).with('C:\chef\ohai\hints/azure.json').and_return(false)
+      allow(plugin).to receive(:hint?).with("azure").and_return(false)
       allow(File).to receive(:exist?).with("/usr/sbin/waagent").and_return(false)
       allow(Dir).to receive(:exist?).with('C:\WindowsAzure').and_return(false)
       allow(File).to receive(:exist?).with("/var/lib/dhcp/dhclient.eth0.leases").and_return(true)
@@ -158,13 +154,9 @@ describe Ohai::System, "plugin azure" do
         and_yield("  expire 5 2152/03/10 09:03:39;").
         and_yield("}")
       allow(File).to receive(:open).with("/var/lib/dhcp/dhclient.eth0.leases").and_return(@double_file)
-      @plugin.run
     end
 
-    it "should create empty azure mash" do
-      puts "The dir exists?:" + "#{Dir.exist?('C:\WindowsAzure')}"
-      expect(@plugin[:azure]).to be_empty
-    end
+    it_behaves_like "azure"
   end
 
 end