ohai 17.7.5 → 17.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b09efb3e8a7318b9401b9faf1fb17a472544ec5c7f45e7be090bcaafac9d93
-  data.tar.gz: d6deeb673906082bda7ab8ac7b4b1b5fb8dc41c22720ab4f4d47dfa994479be6
+  metadata.gz: 9624a58f805a1092cf71a19d5cc1501104c297df8b5f5cb9dafc8f288a77a62b
+  data.tar.gz: fa2839c8ca0d39f53629fc186b77addb1ef02e8783dba59a10f94d94406388ce
 SHA512:
-  metadata.gz: a8aec83f05fb402a2cc08efa9ce6d6fc81a0c2133bc57f60c9cbedff90236812e30e65373b5bb4813590ea2c7d5ae6c763caa58bbf56ef10c4ac5362df1dbc59
-  data.tar.gz: 948e93dddd2a283f43350795e15b46d83fe31db12d9f988bbe594882295fb7c57e576bc18be0a4db1d22002a177a6dddcce49f041dbc24cd777c75b59e62bce4
+  metadata.gz: 4252161549ecd67b7bfd91c7b01673071b54d76179472ac2824965281147a5b40b14b2cc120fc8d2d1a41bc1956041c1c39bf820f3d538f2ee85b61771d11c66
+  data.tar.gz: 3f1be719448a8c6cb39be6b5cb2f1c9017e05abd223d3b2bc23aedb4891a8663e259f6a3f2828a8a7e5809f52dde821fcefaeeb534af80cc4729ba19bcc63514

data/Gemfile

@@ -9,7 +9,7 @@ gem "chef-utils", git: "https://github.com/chef/chef", branch: "main", glob: "ch
 
 # NOTE: do not submit PRs to add pry as a dep, add to your Gemfile.local
 group :development do
-  gem "chefstyle", "2.1.0"
+  gem "chefstyle", "2.1.2"
   gem "ipaddr_extensions"
   gem "rake", ">= 10.1.0"
   gem "rspec-collection_matchers", "~> 1.0"

data/lib/ohai/mixin/network_helper.rb

@@ -18,6 +18,8 @@
 # limitations under the License.
 #
 
+require "socket" unless defined?(Socket)
+
 module Ohai
   module Mixin
     module NetworkHelper
@@ -34,10 +36,16 @@ module Ohai
       end
 
       # This does a forward and reverse lookup on the hostname to return what should be
-      # the FQDN for the host determined by name lookup (generally DNS)
+      # the FQDN for the host determined by name lookup (generally DNS).  If the forward
+      # lookup fails this will throw.  If the reverse lookup fails this will return the
+      # hostname back.  The behavior on failure of the reverse lookup is both vitally important
+      # to this API, and completely untested, so changes to this method (not recommended) need
+      # to be manually validated by hand by setting up a DNS server with a broken A record to
+      # an IP without a PTR record (e.g. any RFC1918 space not served by the configured DNS
+      # server), and the method should return the hostname and not the IP address.
       #
       def canonicalize_hostname(hostname)
-        Addrinfo.getaddrinfo(hostname, nil).first.getnameinfo.first
+        Addrinfo.getaddrinfo(hostname, nil, nil, nil, nil, Socket::AI_CANONNAME).first.canonname
       end
 
       def canonicalize_hostname_with_retries(hostname)

data/lib/ohai/plugins/azure.rb

@@ -48,7 +48,7 @@ Ohai.plugin(:Azure) do
   # check for either the waagent or the unknown-245 DHCP option that Azure uses
   # http://blog.mszcool.com/index.php/2015/04/detecting-if-a-virtual-machine-runs-in-microsoft-azure-linux-windows-to-protect-your-software-when-distributed-via-the-azure-marketplace/
   def has_waagent?
-    if file_exist?("/usr/sbin/waagent") || dir_exist?('C:\WindowsAzure')
+    if file_exist?("/usr/sbin/waagent") || dir_exist?("C:\\WindowsAzure")
       logger.trace("Plugin Azure: Found waagent used by Azure.")
       true
     end

data/lib/ohai/version.rb

@@ -19,5 +19,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(__dir__)
-  VERSION = "17.7.5"
+  VERSION = "17.7.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 17.7.5
+  version: 17.7.8
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config