ohai 18.0.26 → 18.1.0

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

@@ -1,192 +1,192 @@
-# frozen_string_literal: true
-#
-# Author:: Benjamin Black (<nostromo@gmail.com>)
-# 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.
-#
-
-# EXAMPLE SOLARIS IFCONFIG OUTPUT; CURRENTLY, ONLY SIMPLE STUFF IS SUPPORTED (E.G., NO TUNNELS)
-# DEAR SUN: YOU GET AN F FOR YOUR IFCONFIG
-# lo0:3: flags=2001000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4,VIRTUAL> mtu 8232 index 1
-#         inet 127.0.0.1 netmask ff000000
-# e1000g0:3: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 index 3
-#         inet 72.2.115.28 netmask ffffff80 broadcast 72.2.115.127
-# e1000g2:1: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 index 4
-#         inet 10.2.115.28 netmask ffffff80 broadcast 10.2.115.127
-#         inet6 2001:0db8:3c4d:55:a00:20ff:fe8e:f3ad/64
-# ip.tun0: flags=2200851<UP,POINTOPOINT,RUNNING,MULTICAST,NONUD,IPv6> mtu 1480 index 3
-#        inet tunnel src 109.146.85.57   tunnel dst 109.146.85.212
-#        tunnel security settings  -->  use 'ipsecconf -ln -i ip.tun1'
-#        tunnel hop limit 60
-#        inet6 fe80::6d92:5539/10 --> fe80::6d92:55d4
-# ip.tun0:1: flags=2200851<UP,POINTOPOINT,RUNNING,MULTICAST,NONUD,IPv6> mtu 1480 index 3
-#        inet6 2::45/128 --> 2::46
-# lo0: flags=1000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4> mtu 8232 index 1
-#     inet 127.0.0.1 netmask ff000000
-# eri0: flags=1004843<UP,BROADCAST,RUNNING,MULTICAST,DHCP,IPv4> mtu 1500 \
-# index 2
-#     inet 172.17.128.208 netmask ffffff00 broadcast 172.17.128.255
-# ip6.tun0: flags=10008d1<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST,IPv4> \
-# mtu 1460
-#     index 3
-#     inet6 tunnel src fe80::1 tunnel dst fe80::2
-#     tunnel security settings  -->  use 'ipsecconf -ln -i ip.tun1'
-#     tunnel hop limit 60 tunnel encapsulation limit 4
-#     inet 10.0.0.208 --> 10.0.0.210 netmask ff000000
-# qfe1: flags=2000841<UP,RUNNING,MULTICAST,IPv6> mtu 1500 index 3
-#  usesrc vni0
-#  inet6 fe80::203:baff:fe17:4be0/10
-#  ether 0:3:ba:17:4b:e0
-# vni0: flags=2002210041<UP,RUNNING,NOXMIT,NONUD,IPv6,VIRTUAL> mtu 0
-#  index 5
-#  srcof qfe1
-#  inet6 fe80::203:baff:fe17:4444/128
-
-# Extracted from http://illumos.org/hcl/
-ETHERNET_ENCAPS ||= %w{ afe amd8111s arn atge ath bfe bge bnx bnxe ce cxgbe
-                        dmfe e1000g efe elxl emlxs eri hermon hme hxge igb
-                        iprb ipw iwh iwi iwk iwp ixgb ixgbe mwl mxfe myri10ge
-                        nge ntxn nxge pcn platform qfe qlc ral rge rtls rtw rwd
-                        rwn sfe tavor vr wpi xge yge aggr}.freeze
-
-Ohai.plugin(:Network) do
-  require_relative "../../mixin/network_helper"
-
-  provides "network", "network/interfaces"
-  provides "counters/network", "counters/network/interfaces"
-
-  include Ohai::Mixin::NetworkHelper
-
-  def solaris_encaps_lookup(ifname)
-    return "Ethernet" if ETHERNET_ENCAPS.include?(ifname)
-    return "Ethernet" if ifname.eql?("net")
-    return "Loopback" if ifname.eql?("lo")
-
-    "Unknown"
-  end
-
-  def arpname_to_ifname(iface, arpname)
-    iface.each_key do |ifn|
-      return ifn if ifn.split(":")[0].eql?(arpname)
-    end
-
-    nil
-  end
-
-  def full_interface_name(iface, part_name, index)
-    iface.each do |name, attrs|
-      next unless attrs.respond_to?(:[])
-      return name if /^#{part_name}($|:)/.match(name) && attrs[:index] == index
-    end
-
-    nil
-  end
-
-  collect_data(:solaris2) do
-    iface = Mash.new
-    network Mash.new unless network
-    network[:interfaces] ||= Mash.new
-    counters Mash.new unless counters
-    counters[:network] ||= Mash.new
-
-    cint = nil
-    shell_out("ifconfig -a").stdout.lines do |line|
-      # regex: https://rubular.com/r/ZiIHbsnfiWPW1p
-      if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+)(?: index (\d+))?/
-        cint = $1
-        iface[cint] ||= Mash.new
-        iface[cint][:mtu] = $2
-        iface[cint][:index] = $3
-        if line =~ / flags\=\d+\<((ADDRCONF|ANYCAST|BROADCAST|CoS|DEPRECATED|DHCP|DUPLICATE|FAILED|FIXEDMTU|INACTIVE|L3PROTECT|LOOPBACK|MIP|MULTI_BCAST|MULTICAST|NOARP|NOFAILOVER|NOLOCAL|NONUD|NORTEXCH|NOXMIT|OFFLINE|PHYSRUNNING|POINTOPOINT|PREFERRED|PRIVATE|ROUTER|RUNNING|STANDBY|TEMPORARY|UNNUMBERED|UP|VIRTUAL|XRESOLV|IPv4|IPv6|,)+)\>\s/
-          flags = $1.split(",")
-        else
-          flags = []
-        end
-        iface[cint][:flags] = flags.flatten
-        if cint =~ /^(\w+)(\d+.*)/
-          iface[cint][:type] = $1
-          iface[cint][:number] = $2
-          iface[cint][:encapsulation] = solaris_encaps_lookup($1)
-        end
-      end
-      if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8})\s*$/
-        iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2) }
-      end
-      if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8}) broadcast (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
-        iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2), "broadcast" => $4 }
-      end
-      if line =~ %r{\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*)/(\d+)\s*$}
-        iface[cint][:addresses] ||= Mash.new
-        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 }
-      end
-    end
-
-    # Device   IP Address               Mask      Flags      Phys Addr
-    # bge1   172.16.0.129         255.255.255.255 SPLA     00:03:ba:xx:xx:xx
-    so = shell_out("arp -an")
-    so.stdout.lines do |line|
-      if line =~ /([0-9a-zA-Z]+)\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\w+)?\s+([a-zA-Z0-9\.\:\-]+)/
-        next unless iface[arpname_to_ifname(iface, $1)] # this should never happen, except on solaris because sun hates you.
-
-        iface[arpname_to_ifname(iface, $1)][:arp] ||= Mash.new
-        iface[arpname_to_ifname(iface, $1)][:arp][$2] = $5
-      end
-    end
-
-    iface.each_key do |ifn|
-      iaddr = nil
-      if iface[ifn][:encapsulation].eql?("Ethernet")
-        iface[ifn][:addresses].each_key do |addr|
-          if iface[ifn][:addresses][addr]["family"].eql?("inet")
-            iaddr = addr
-            break
-          end
-        end
-        iface[ifn][:arp]&.each_key do |addr|
-          if addr.eql?(iaddr)
-            iface[ifn][:addresses][iface[ifn][:arp][iaddr]] = { "family" => "lladdr" }
-            break
-          end
-        end
-      end
-    end
-
-    network[:interfaces] = iface
-
-    so = shell_out("route -v -n get default")
-    so.stdout.lines do |line|
-      matches = /interface: (?<name>\S+)\s+index\s+(?<index>\d+)/.match(line)
-      if matches
-        network[:default_interface] =
-          case
-          when iface[matches[:name]]
-            matches[:name]
-          when int_name = full_interface_name(iface, matches[:name], matches[:index])
-            int_name
-          else
-            matches[:name]
-          end
-        logger.trace("Plugin Network: found interface device: #{network[:default_interface]} #{matches[:name]}")
-      end
-      matches = /gateway: (\S+)/.match(line)
-      if matches
-        logger.trace("Plugin Network: found gateway: #{matches[1]}")
-        network[:default_gateway] = matches[1]
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Benjamin Black (<nostromo@gmail.com>)
+# 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.
+#
+
+# EXAMPLE SOLARIS IFCONFIG OUTPUT; CURRENTLY, ONLY SIMPLE STUFF IS SUPPORTED (E.G., NO TUNNELS)
+# DEAR SUN: YOU GET AN F FOR YOUR IFCONFIG
+# lo0:3: flags=2001000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4,VIRTUAL> mtu 8232 index 1
+#         inet 127.0.0.1 netmask ff000000
+# e1000g0:3: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 index 3
+#         inet 72.2.115.28 netmask ffffff80 broadcast 72.2.115.127
+# e1000g2:1: flags=201000843<UP,BROADCAST,RUNNING,MULTICAST,IPv4,CoS> mtu 1500 index 4
+#         inet 10.2.115.28 netmask ffffff80 broadcast 10.2.115.127
+#         inet6 2001:0db8:3c4d:55:a00:20ff:fe8e:f3ad/64
+# ip.tun0: flags=2200851<UP,POINTOPOINT,RUNNING,MULTICAST,NONUD,IPv6> mtu 1480 index 3
+#        inet tunnel src 109.146.85.57   tunnel dst 109.146.85.212
+#        tunnel security settings  -->  use 'ipsecconf -ln -i ip.tun1'
+#        tunnel hop limit 60
+#        inet6 fe80::6d92:5539/10 --> fe80::6d92:55d4
+# ip.tun0:1: flags=2200851<UP,POINTOPOINT,RUNNING,MULTICAST,NONUD,IPv6> mtu 1480 index 3
+#        inet6 2::45/128 --> 2::46
+# lo0: flags=1000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4> mtu 8232 index 1
+#     inet 127.0.0.1 netmask ff000000
+# eri0: flags=1004843<UP,BROADCAST,RUNNING,MULTICAST,DHCP,IPv4> mtu 1500 \
+# index 2
+#     inet 172.17.128.208 netmask ffffff00 broadcast 172.17.128.255
+# ip6.tun0: flags=10008d1<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST,IPv4> \
+# mtu 1460
+#     index 3
+#     inet6 tunnel src fe80::1 tunnel dst fe80::2
+#     tunnel security settings  -->  use 'ipsecconf -ln -i ip.tun1'
+#     tunnel hop limit 60 tunnel encapsulation limit 4
+#     inet 10.0.0.208 --> 10.0.0.210 netmask ff000000
+# qfe1: flags=2000841<UP,RUNNING,MULTICAST,IPv6> mtu 1500 index 3
+#  usesrc vni0
+#  inet6 fe80::203:baff:fe17:4be0/10
+#  ether 0:3:ba:17:4b:e0
+# vni0: flags=2002210041<UP,RUNNING,NOXMIT,NONUD,IPv6,VIRTUAL> mtu 0
+#  index 5
+#  srcof qfe1
+#  inet6 fe80::203:baff:fe17:4444/128
+
+# Extracted from http://illumos.org/hcl/
+ETHERNET_ENCAPS ||= %w{ afe amd8111s arn atge ath bfe bge bnx bnxe ce cxgbe
+                        dmfe e1000g efe elxl emlxs eri hermon hme hxge igb
+                        iprb ipw iwh iwi iwk iwp ixgb ixgbe mwl mxfe myri10ge
+                        nge ntxn nxge pcn platform qfe qlc ral rge rtls rtw rwd
+                        rwn sfe tavor vr wpi xge yge aggr}.freeze
+
+Ohai.plugin(:Network) do
+  require_relative "../../mixin/network_helper"
+
+  provides "network", "network/interfaces"
+  provides "counters/network", "counters/network/interfaces"
+
+  include Ohai::Mixin::NetworkHelper
+
+  def solaris_encaps_lookup(ifname)
+    return "Ethernet" if ETHERNET_ENCAPS.include?(ifname)
+    return "Ethernet" if ifname.eql?("net")
+    return "Loopback" if ifname.eql?("lo")
+
+    "Unknown"
+  end
+
+  def arpname_to_ifname(iface, arpname)
+    iface.each_key do |ifn|
+      return ifn if ifn.split(":")[0].eql?(arpname)
+    end
+
+    nil
+  end
+
+  def full_interface_name(iface, part_name, index)
+    iface.each do |name, attrs|
+      next unless attrs.respond_to?(:[])
+      return name if /^#{part_name}($|:)/.match(name) && attrs[:index] == index
+    end
+
+    nil
+  end
+
+  collect_data(:solaris2) do
+    iface = Mash.new
+    network Mash.new unless network
+    network[:interfaces] ||= Mash.new
+    counters Mash.new unless counters
+    counters[:network] ||= Mash.new
+
+    cint = nil
+    shell_out("ifconfig -a").stdout.lines do |line|
+      # regex: https://rubular.com/r/ZiIHbsnfiWPW1p
+      if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+)(?: index (\d+))?/
+        cint = $1
+        iface[cint] ||= Mash.new
+        iface[cint][:mtu] = $2
+        iface[cint][:index] = $3
+        if line =~ / flags\=\d+\<((ADDRCONF|ANYCAST|BROADCAST|CoS|DEPRECATED|DHCP|DUPLICATE|FAILED|FIXEDMTU|INACTIVE|L3PROTECT|LOOPBACK|MIP|MULTI_BCAST|MULTICAST|NOARP|NOFAILOVER|NOLOCAL|NONUD|NORTEXCH|NOXMIT|OFFLINE|PHYSRUNNING|POINTOPOINT|PREFERRED|PRIVATE|ROUTER|RUNNING|STANDBY|TEMPORARY|UNNUMBERED|UP|VIRTUAL|XRESOLV|IPv4|IPv6|,)+)\>\s/
+          flags = $1.split(",")
+        else
+          flags = []
+        end
+        iface[cint][:flags] = flags.flatten
+        if cint =~ /^(\w+)(\d+.*)/
+          iface[cint][:type] = $1
+          iface[cint][:number] = $2
+          iface[cint][:encapsulation] = solaris_encaps_lookup($1)
+        end
+      end
+      if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8})\s*$/
+        iface[cint][:addresses] ||= Mash.new
+        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2) }
+      end
+      if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8}) broadcast (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
+        iface[cint][:addresses] ||= Mash.new
+        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => hex_to_dec_netmask($2), "broadcast" => $4 }
+      end
+      if line =~ %r{\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*)/(\d+)\s*$}
+        iface[cint][:addresses] ||= Mash.new
+        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 }
+      end
+    end
+
+    # Device   IP Address               Mask      Flags      Phys Addr
+    # bge1   172.16.0.129         255.255.255.255 SPLA     00:03:ba:xx:xx:xx
+    so = shell_out("arp -an")
+    so.stdout.lines do |line|
+      if line =~ /([0-9a-zA-Z]+)\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+(\w+)?\s+([a-zA-Z0-9\.\:\-]+)/
+        next unless iface[arpname_to_ifname(iface, $1)] # this should never happen, except on solaris because sun hates you.
+
+        iface[arpname_to_ifname(iface, $1)][:arp] ||= Mash.new
+        iface[arpname_to_ifname(iface, $1)][:arp][$2] = $5
+      end
+    end
+
+    iface.each_key do |ifn|
+      iaddr = nil
+      if iface[ifn][:encapsulation].eql?("Ethernet")
+        iface[ifn][:addresses].each_key do |addr|
+          if iface[ifn][:addresses][addr]["family"].eql?("inet")
+            iaddr = addr
+            break
+          end
+        end
+        iface[ifn][:arp]&.each_key do |addr|
+          if addr.eql?(iaddr)
+            iface[ifn][:addresses][iface[ifn][:arp][iaddr]] = { "family" => "lladdr" }
+            break
+          end
+        end
+      end
+    end
+
+    network[:interfaces] = iface
+
+    so = shell_out("route -v -n get default")
+    so.stdout.lines do |line|
+      matches = /interface: (?<name>\S+)\s+index\s+(?<index>\d+)/.match(line)
+      if matches
+        network[:default_interface] =
+          case
+          when iface[matches[:name]]
+            matches[:name]
+          when int_name = full_interface_name(iface, matches[:name], matches[:index])
+            int_name
+          else
+            matches[:name]
+          end
+        logger.trace("Plugin Network: found interface device: #{network[:default_interface]} #{matches[:name]}")
+      end
+      matches = /gateway: (\S+)/.match(line)
+      if matches
+        logger.trace("Plugin Network: found gateway: #{matches[1]}")
+        network[:default_gateway] = matches[1]
+      end
+    end
+  end
+end

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

@@ -1,58 +1,58 @@
-# frozen_string_literal: true
-#
-# Author:: Benjamin Black (<nostromo@gmail.com>)
-# 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(:Platform) do
-  provides "platform", "platform_version", "platform_build", "platform_family"
-
-  collect_data(:solaris2) do
-    if file_exist?("/sbin/uname")
-      uname_exec = "/sbin/uname"
-    else
-      uname_exec = "uname"
-    end
-
-    shell_out("#{uname_exec} -X").stdout.lines do |line|
-      case line
-      when /^Release =\s+(.+)$/
-        platform_version $1
-      when /^KernelID =\s+(.+)$/
-        platform_build $1
-      end
-    end
-
-    file_open("/etc/release") do |file|
-      while ( line = file.gets )
-        case line
-        when /.*SmartOS.*/
-          platform "smartos"
-        when /^\s*OmniOS.*r(\d+).*$/
-          platform "omnios"
-          platform_version $1
-        when /^\s*OpenIndiana.*(Development oi_|Hipster )(\d\S*)/ # https://rubular.com/r/iMtOBwbnyqDz7u
-          platform "openindiana"
-          platform_version $2
-        when /^\s*(Oracle Solaris|Solaris)/
-          platform "solaris2"
-        end
-      end
-    end
-
-    platform_family platform
-  end
-end
+# frozen_string_literal: true
+#
+# Author:: Benjamin Black (<nostromo@gmail.com>)
+# 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(:Platform) do
+  provides "platform", "platform_version", "platform_build", "platform_family"
+
+  collect_data(:solaris2) do
+    if file_exist?("/sbin/uname")
+      uname_exec = "/sbin/uname"
+    else
+      uname_exec = "uname"
+    end
+
+    shell_out("#{uname_exec} -X").stdout.lines do |line|
+      case line
+      when /^Release =\s+(.+)$/
+        platform_version $1
+      when /^KernelID =\s+(.+)$/
+        platform_build $1
+      end
+    end
+
+    file_open("/etc/release") do |file|
+      while ( line = file.gets )
+        case line
+        when /.*SmartOS.*/
+          platform "smartos"
+        when /^\s*OmniOS.*r(\d+).*$/
+          platform "omnios"
+          platform_version $1
+        when /^\s*OpenIndiana.*(Development oi_|Hipster )(\d\S*)/ # https://rubular.com/r/iMtOBwbnyqDz7u
+          platform "openindiana"
+          platform_version $2
+        when /^\s*(Oracle Solaris|Solaris)/
+          platform "solaris2"
+        end
+      end
+    end
+
+    platform_family platform
+  end
+end