ohai 14.8.12 → 14.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61eb9faf51ec7576615a1e2008efcbb3e38e2cf111f014485a47ecb92fa98129
-  data.tar.gz: 35427a353fea6bef1a6153a75f587544937acc190a16bc8939cff499f98ae0d7
+  metadata.gz: 442b21d4ae9ca4922c53910eed1b2257dbd582082c2030b9f13cacd397ff6d93
+  data.tar.gz: 986f3a7dcdaace61f03781f22b574cada206b5b412d5bfcc22c70feaa76139e6
 SHA512:
-  metadata.gz: 39242900794bc6d92287b27e2f79b2dd0e66a2ef2efe09c49090b72b03e5911a4a6769bb8e1acb824a5d17bc2c0b88295e53426221768edc563b9d2887ed14e3
-  data.tar.gz: 8ec9786918e6817b1c548ad5c2a803dd0c6f4f226c5904e00184e1245bfcbbe27ecf33cfa4839fbbeb34177c2cc8823fe0325446045cb3ad055adaf85ab780d9
+  metadata.gz: f214b2ed18dac602b3584e357be8df031c68877453c03d6d7622b278b8b7c10b054c756e905075ebbee1bfc72161e29867f5259ce37945b5bb1a673e4c7274d5
+  data.tar.gz: 24cd4341f70257b239d38187c490ce60a0ced05e7a574c0f4cec1f697d535d5cea55a48f21f6901b966bffe3ba3a495a192f853c9c96c462f6c79ac107bdc7f3

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

@@ -249,7 +249,7 @@ Ohai.plugin(:Platform) do
       # the gentoo release version is the base version used to bootstrap
       # a node and doesn't have a lot of meaning in a rolling release distro
       # kernel release will be used - ex. 3.18.7-gentoo
-      platform_version `uname -r`.strip
+      platform_version shell_out("/bin/uname -r").stdout.strip
     elsif File.exist?("/etc/slackware-version")
       platform "slackware"
       platform_version File.read("/etc/slackware-version").scan(/(\d+|\.+)/).join
@@ -257,16 +257,17 @@ Ohai.plugin(:Platform) do
       platform "arch"
       # no way to determine platform_version in a rolling release distribution
       # kernel release will be used - ex. 2.6.32-ARCH
-      platform_version `uname -r`.strip
+      platform_version shell_out("/bin/uname -r").stdout.strip
     elsif File.exist?("/etc/exherbo-release")
       platform "exherbo"
       # no way to determine platform_version in a rolling release distribution
       # kernel release will be used - ex. 3.13
-      platform_version `uname -r`.strip
+      platform_version shell_out("/bin/uname -r").stdout.strip
     elsif File.exist?("/etc/alpine-release")
       platform "alpine"
       platform_version File.read("/etc/alpine-release").strip
-    elsif File.exist?("/usr/lib/os-release")
+    # If /etc/os-release file exists, we take that as source of truth
+    elsif File.exist?("/usr/lib/os-release") && !File.exist?("/etc/os-release")
       contents = File.read("/usr/lib/os-release")
       if /Clear Linux/ =~ contents
         platform "clearlinux"
@@ -300,6 +301,8 @@ Ohai.plugin(:Platform) do
         platform "suse" # SLES is wrong. We call it SUSE
       when "opensuse-leap"
         platform "opensuseleap"
+      when "clear-linux-os"
+        platform "clearlinux"
       else
         platform os_release_info["ID"]
       end

data/lib/ohai/plugins/packages.rb

@@ -50,7 +50,34 @@ Ohai.plugin(:Packages) do
 
       pkgs.each do |pkg|
         name, epoch, version, release, installdate, arch = pkg.split
-        packages[name] = { "epoch" => epoch, "version" => version, "release" => release, "installdate" => installdate, "arch" => arch }
+        if packages[name]
+          # We have more than one package with this exact name!
+          # Create an "versions" array for tracking all versions of packages with this name.
+          # The top-level package information will be the first one returned by rpm -qa,
+          # all versions go in this list, with the same information they'd normally have.
+          if packages[name]["versions"].nil?
+            # add the data of the first package to the list, so that all versions are in the list.
+            packages[name]["versions"] = []
+            packages[name]["versions"] << Mash.new({ "epoch" => packages[name]["epoch"],
+                                                     "version" => packages[name]["version"],
+                                                     "release" => packages[name]["release"],
+                                                     "installdate" => packages[name]["installdate"],
+                                                     "arch" => packages[name]["arch"] })
+          end
+          packages[name]["versions"] << Mash.new({ "epoch" => epoch, "version" => version, "release" => release, "installdate" => installdate, "arch" => arch }) # Add this package version to the list
+          # When this was originally written, it didn't account for multiple versions of the same package
+          # so it just kept clobbering the package data if it encountered multiple versions
+          # of the same package. As a result, the last duplicate returned by rpm -qa was what was present;
+          # here we clobber that data for compatibility. Note that we can't overwrite the entire hash
+          # without losing the versions array.
+          packages[name]["epoch"] = epoch
+          packages[name]["version"] = version
+          packages[name]["release"] = release
+          packages[name]["installdate"] = installdate
+          packages[name]["arch"] = arch
+        else
+          packages[name] = { "epoch" => epoch, "version" => version, "release" => release, "installdate" => installdate, "arch" => arch }
+        end
       end
 
     when "arch"

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

@@ -23,8 +23,8 @@ Ohai.plugin(:Filesystem) do
   #
   # @see https://docs.microsoft.com/en-us/windows/desktop/SecProv/getconversionstatus-win32-encryptablevolume#parameters
   #
-  CONVERSION_STATUS = %w{FullyDecrypted FullyEncrypted EncryptionInProgress
-                         DecryptionInProgress EncryptionPaused DecryptionPaused}.freeze
+  CONVERSION_STATUS ||= %w{FullyDecrypted FullyEncrypted EncryptionInProgress
+                           DecryptionInProgress EncryptionPaused DecryptionPaused}.freeze
 
   # Returns a Mash loaded with logical details
   #

data/lib/ohai/version.rb

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

data/spec/data/plugins/rpmquery.output

@@ -3,3 +3,5 @@ tzdata	0	2016d	1.el7	1463486618	noarch
 nss-softokn-freebl	0	3.16.2.3	14.2.el7_2	1463486619	x86_64
 glibc	0	2.17	106.el7_2.6	1463486666	x86_64
 libstdc++	0	4.8.5	4.el7	1463486669	x86_64
+kernel  0       3.10.0  862.2.3.el7     1526310781      x86_64
+kernel  0       3.10.0  862.el7 1521745632      x86_64

data/spec/unit/plugins/linux/platform_spec.rb

@@ -250,7 +250,7 @@ OS_RELEASE
     end
 
     it "should set platform_version to kernel release" do
-      expect(@plugin).to receive(:`).with("uname -r").and_return("3.18.2-2-ARCH")
+      expect(@plugin).to receive(:shell_out).with("/bin/uname -r").and_return(mock_shell_out(0, "3.18.2-2-ARCH\n", ""))
       @plugin.run
       expect(@plugin[:platform_version]).to eq("3.18.2-2-ARCH")
     end
@@ -271,7 +271,7 @@ OS_RELEASE
     end
 
     it "should set platform_version to kernel release" do
-      expect(@plugin).to receive(:`).with("uname -r").and_return("3.18.7-gentoo")
+      expect(@plugin).to receive(:shell_out).with("/bin/uname -r").and_return(mock_shell_out(0, "3.18.7-gentoo\n", ""))
       @plugin.run
       expect(@plugin[:platform_version]).to eq("3.18.7-gentoo")
     end
@@ -345,7 +345,7 @@ OS_RELEASE
     end
 
     it "should set platform_version to kernel release" do
-      expect(@plugin).to receive(:`).with("uname -r").and_return("3.18.2-2-ARCH")
+      expect(@plugin).to receive(:shell_out).with("/bin/uname -r").and_return(mock_shell_out(0, "3.18.2-2-ARCH", ""))
       @plugin.run
       expect(@plugin[:platform_version]).to eq("3.18.2-2-ARCH")
     end
@@ -705,6 +705,7 @@ CISCO_RELEASE
   describe "on suse" do
     context "on openSUSE 15+" do
 
+      let(:have_usr_lib_os_release) { true }
       let(:have_suse_release) { false }
       let(:have_os_release) { true }
 
@@ -992,33 +993,69 @@ OS_RELEASE
   end
 
   describe "on clearlinux" do
-    let(:have_usr_lib_os_release) { true }
-    let(:usr_lib_os_release_content) do
-      <<~CLEARLINUX_RELEASE
-        NAME="Clear Linux Software for Intel Architecture"
-        VERSION=1
-        ID=clear-linux-os
-        VERSION_ID=16140
-        PRETTY_NAME="Clear Linux OS for Intel Architecture"
-        ANSI_COLOR="1;35"
-        HOME_URL="https://clearlinux.org"
-        SUPPORT_URL="https://clearlinux.org"
-        BUG_REPORT_URL="mailto:dev@lists.clearlinux.org"
-        PRIVACY_POLICY_URL="http://www.intel.com/privacy"
-CLEARLINUX_RELEASE
-    end
+    context "without /etc/os-release file" do
+      let(:have_os_release) { false }
+      let(:have_usr_lib_os_release) { true }
+      let(:usr_lib_os_release_content) do
+        <<~CLEARLINUX_RELEASE
+          NAME="Clear Linux Software for Intel Architecture"
+          VERSION=1
+          ID=clear-linux-os
+          VERSION_ID=16140
+          PRETTY_NAME="Clear Linux OS for Intel Architecture"
+          ANSI_COLOR="1;35"
+          HOME_URL="https://clearlinux.org"
+          SUPPORT_URL="https://clearlinux.org"
+          BUG_REPORT_URL="mailto:dev@lists.clearlinux.org"
+          PRIVACY_POLICY_URL="http://www.intel.com/privacy"
+  CLEARLINUX_RELEASE
+      end
+
+      before do
+        expect(File).to receive(:read).with("/usr/lib/os-release").and_return(usr_lib_os_release_content)
+      end
 
-    before do
-      expect(File).to receive(:read).with("/usr/lib/os-release").and_return(usr_lib_os_release_content)
+      it "should set platform to clearlinux and platform_family to clearlinux" do
+        @plugin.lsb = nil
+        @plugin.run
+
+        expect(@plugin[:platform]).to eq("clearlinux")
+        expect(@plugin[:platform_family]).to eq("clearlinux")
+        expect(@plugin[:platform_version]).to eq("16140")
+      end
     end
 
-    it "should set platform to clearlinux and platform_family to clearlinux" do
-      @plugin.lsb = nil
-      @plugin.run
+    context "with /etc/os-release file" do
+      let(:have_os_release) { true }
+      let(:have_usr_lib_os_release) { true }
+      let(:os_release_content) do
+        <<~CLEARLINUX_RELEASE
+          NAME="Clear Linux Software for Intel Architecture"
+          VERSION=1
+          ID=clear-linux-os
+          VERSION_ID=16140
+          PRETTY_NAME="Clear Linux OS for Intel Architecture"
+          ANSI_COLOR="1;35"
+          HOME_URL="https://clearlinux.org"
+          SUPPORT_URL="https://clearlinux.org"
+          BUG_REPORT_URL="mailto:dev@lists.clearlinux.org"
+          PRIVACY_POLICY_URL="http://www.intel.com/privacy"
+  CLEARLINUX_RELEASE
+      end
 
-      expect(@plugin[:platform]).to eq("clearlinux")
-      expect(@plugin[:platform_family]).to eq("clearlinux")
-      expect(@plugin[:platform_version]).to eq("16140")
+      before do
+        expect(File).to receive(:read).with("/etc/os-release").and_return(os_release_content)
+        expect(File).not_to receive(:read).with("/usr/lib/os-release")
+      end
+
+      it "should set platform to clearlinux and platform_family to clearlinux" do
+        @plugin.lsb = nil
+        @plugin.run
+
+        expect(@plugin[:platform]).to eq("clearlinux")
+        expect(@plugin[:platform_family]).to eq("clearlinux")
+        expect(@plugin[:platform_version]).to eq("16140")
+      end
     end
   end
 end

data/spec/unit/plugins/packages_spec.rb

@@ -100,6 +100,26 @@ describe Ohai::System, "plugin packages" do
       expect(plugin[:packages]["tzdata"][:installdate]).to eq("1463486618")
       expect(plugin[:packages]["tzdata"][:arch]).to eq("noarch")
     end
+
+    it "handles multiple packages with the same name" do
+      expect(plugin[:packages]["kernel"][:version]).to eq("3.10.0")
+      expect(plugin[:packages]["kernel"][:release]).to eq("862.el7")
+      expect(plugin[:packages]["kernel"][:epoch]).to eq("0")
+      expect(plugin[:packages]["kernel"][:installdate]).to eq("1521745632")
+      expect(plugin[:packages]["kernel"][:arch]).to eq("x86_64")
+      # and now the version list:
+      expect(plugin[:packages]["kernel"]["versions"].first[:version]).to eq("3.10.0")
+      expect(plugin[:packages]["kernel"]["versions"].first[:release]).to eq("862.2.3.el7")
+      expect(plugin[:packages]["kernel"]["versions"].first[:epoch]).to eq("0")
+      expect(plugin[:packages]["kernel"]["versions"].first[:installdate]).to eq("1526310781")
+      expect(plugin[:packages]["kernel"]["versions"].first[:arch]).to eq("x86_64")
+      expect(plugin[:packages]["kernel"]["versions"].last[:version]).to eq("3.10.0")
+      expect(plugin[:packages]["kernel"]["versions"].last[:release]).to eq("862.el7")
+      expect(plugin[:packages]["kernel"]["versions"].last[:epoch]).to eq("0")
+      expect(plugin[:packages]["kernel"]["versions"].last[:installdate]).to eq("1521745632")
+      expect(plugin[:packages]["kernel"]["versions"].last[:arch]).to eq("x86_64")
+
+    end
   end
 
   context "on arch" do

data/spec/unit/plugins/windows/fips_spec.rb

@@ -98,6 +98,7 @@ describe Ohai::System, "plugin fips", :windows_only do
   end
 
   context "with Ruby 2.5 or newer", if: defined?(OpenSSL.fips_mode) do
+    let(:arch) { Win32::Registry::KEY_READ }
     let(:openssl_test_mode) { false }
 
     context "with OpenSSL.fips_mode == false" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 14.8.12
+  version: 14.14.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-10 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu