facter 4.0.29 → 4.0.30

data/lib/{resolvers → facter/resolvers}/bsd/processors.rb

@@ -15,7 +15,7 @@ module Facter
           end
 
           def collect_processors_info(fact_name)
-            require "#{ROOT_DIR}/lib/resolvers/bsd/ffi/ffi_helper"
+            require 'facter/resolvers/bsd/ffi/ffi_helper'
 
             @fact_list[:logical_count] = logical_count
             @fact_list[:models] = Array.new(logical_count, model) if logical_count && model

data/lib/{resolvers/docker_lxc.rb → facter/resolvers/containers.rb}

@@ -2,7 +2,7 @@
 
 module Facter
   module Resolvers
-    class DockerLxc < BaseResolver
+    class Containers < BaseResolver
       # :virtual
       # :hypervisor
 
@@ -20,13 +20,14 @@ module Facter
         def read_cgroup(fact_name)
           output_cgroup = Util::FileHelper.safe_read('/proc/1/cgroup', nil)
           output_environ = Util::FileHelper.safe_read('/proc/1/environ', nil)
-          return if output_cgroup.nil? || output_environ.nil?
+          return unless output_cgroup && output_environ
 
           output_docker = %r{docker/(.+)}.match(output_cgroup)
           output_lxc = %r{^/lxc/([^/]+)}.match(output_cgroup)
           lxc_from_environ = /container=lxc/ =~ output_environ
 
           info, vm = extract_vm_and_info(output_docker, output_lxc, lxc_from_environ)
+          info, vm = extract_for_nspawn(output_environ) unless vm
           @fact_list[:vm] = vm
           @fact_list[:hypervisor] = { vm.to_sym => info } if vm
           @fact_list[fact_name]
@@ -43,6 +44,15 @@ module Facter
 
           [info ? { INFO[vm] => info } : {}, vm]
         end
+
+        def extract_for_nspawn(output_environ)
+          nspawn = /container=systemd-nspawn/ =~ output_environ
+          if nspawn
+            vm = 'systemd_nspawn'
+            info = Util::FileHelper.safe_read('/etc/machine-id', nil)
+          end
+          [info ? { 'id' => info.strip } : {}, vm]
+        end
       end
     end
   end

data/lib/facter/resolvers/dmi_decode.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    class DmiDecode < BaseResolver
+      @semaphore = Mutex.new
+      @fact_list ||= {}
+
+      ADDRESS_TO_VERSION = {
+        0xe8480 => 'ESXi 2.5',
+        0xe7c70 => 'ESXi 3.0',
+        0xe66c0 => 'ESXi 3.5',
+        0xe7910 => 'ESXi 3.5',
+        0xea550 => 'ESXi 4.0',
+        0xea6c0 => 'ESXi 4.0',
+        0xea2e0 => 'ESXi 4.1',
+        0xe72c0 => 'ESXi 5.0',
+        0xea0c0 => 'ESXi 5.1',
+        0xea050 => 'ESXi 5.5',
+        0xe99e0 => 'ESXi 6.0',
+        0xE9A40 => 'ESXi 6.0',
+        0xea580 => 'ESXi 6.5',
+        0xEA520 => 'ESXi 6.7',
+        0xEA490 => 'ESXi 6.7',
+        0xea5e0 => 'Fusion 8.5'
+      }.freeze
+
+      class << self
+        private
+
+        def post_resolve(fact_name)
+          @fact_list.fetch(fact_name) { run_dmidecode(fact_name) }
+        end
+
+        def run_dmidecode(fact_name)
+          output = Facter::Core::Execution.execute('dmidecode', logger: log)
+
+          @fact_list[:virtualbox_version] = output.match(/vboxVer_(\S+)/)&.captures&.first
+          @fact_list[:virtualbox_revision] = output.match(/vboxRev_(\S+)/)&.captures&.first
+          @fact_list[:vmware_version] = extract_vmware_version(output)
+
+          @fact_list[fact_name]
+        end
+
+        def extract_vmware_version(output)
+          address_of_version = output.match(/Address:\s(0x[a-zA-Z0-9]*)/)&.captures&.first
+
+          ADDRESS_TO_VERSION[address_of_version&.hex]
+        end
+      end
+    end
+  end
+end

data/lib/{resolvers → facter/resolvers}/facterversion_resolver.rb

@@ -14,8 +14,7 @@ module Facter
         end
 
         def read_version_file
-          version_file = ::File.join(ROOT_DIR, 'VERSION')
-          @fact_list[:facterversion] = ::File.read(version_file).chomp('')
+          @fact_list[:facterversion] = Facter::VERSION
         end
       end
     end

data/lib/{resolvers → facter/resolvers}/freebsd/processors.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'resolvers/bsd/processors'
+require 'facter/resolvers/bsd/processors'
 
 module Facter
   module Resolvers
@@ -17,7 +17,7 @@ module Facter
           end
 
           def collect_processors_info(fact_name)
-            require "#{ROOT_DIR}/lib/resolvers/freebsd/ffi/ffi_helper"
+            require 'facter/resolvers/freebsd/ffi/ffi_helper'
 
             @fact_list[:logical_count] = logical_count
             @fact_list[:models] = Array.new(logical_count, model) if logical_count && model

data/lib/{resolvers → facter/resolvers}/macosx/mountpoints_resolver.rb

@@ -14,7 +14,7 @@ module Facter
             @fact_list.fetch(fact_name) { read_mounts }
           end
 
-          def read_mounts # rubocop:disable Metrics/AbcSize
+          def read_mounts
             mounts = {}
             FilesystemHelper.read_mountpoints.each do |fs|
               device = fs.name
@@ -22,8 +22,6 @@ module Facter
               path = fs.mount_point
               options = fs.options.split(',').map(&:strip).map { |o| o == 'rootfs' ? 'root' : o }
 
-              next if path =~ %r{^/(proc|sys)} && filesystem != 'tmpfs' || filesystem == 'autofs'
-
               mounts[path] = read_stats(path).tap do |hash|
                 hash[:device] = device
                 hash[:filesystem] = filesystem

data/lib/{resolvers → facter/resolvers}/open_vz.rb

@@ -34,6 +34,8 @@ module Facter
 
             next unless /^envID:/ =~ parts[0]
 
+            @fact_list[:id] = parts[1]
+
             return 'openvzhn' if parts[1] == '0'
 
             return 'openvzve'

data/lib/facter/resolvers/solaris/ffi/ffi.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'ffi'
+require_relative 'structs.rb'
+require_relative 'functions.rb'
+
+module Facter
+  module Resolvers
+    module Solaris
+      module FFI
+        SIOCGLIFNUM       = -1_072_928_382
+        SIOCGLIFCONF      = -1_072_666_203
+        SIOCGLIFMTU       = -1_065_850_502
+        SIOCGLIFNETMASK   = -1_065_850_499
+        SIOCGARP          = -1_071_355_617
+        AF_INET           = 2
+        AF_INET6          = 26
+        AF_UNSPEC         = 0
+        SOCK_DGRAM        = 1
+        INET_ADDRSTRLEN   = 16
+        INET6_ADDRSTRLEN  = 46
+      end
+    end
+  end
+end

data/lib/facter/resolvers/solaris/ffi/functions.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Solaris
+      module FFI
+        module Ioctl
+          extend ::FFI::Library
+          ffi_lib ::FFI::Library::LIBC, '/usr/lib/libsocket.so'
+
+          attach_function :ioctl_base, :ioctl, %i[int int pointer], :int
+          attach_function :open_socket, :socket, %i[int int int], :int
+          attach_function :close_socket, :shutdown, %i[int int], :int
+          attach_function :inet_ntop, %i[int pointer pointer uint], :string
+
+          def self.ioctl(call_const, pointer, address_family = AF_INET)
+            fd = Ioctl.open_socket(address_family, SOCK_DGRAM, 0)
+            result = ioctl_base(fd, call_const, pointer)
+            Ioctl.close_socket(fd, 2)
+            result
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/resolvers/solaris/ffi/structs.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+module Facter
+  module Resolvers
+    module Solaris
+      module FFI
+        class SockaddrStorage < ::FFI::Struct
+          layout  :ss_family, :int16,
+                  :pad, [:char, 254]
+        end
+
+        class Sockaddr < ::FFI::Struct
+          layout  :sa_family, :sa_family_t,
+                  :sa_data, [:uchar, 14]
+        end
+
+        class Lifnum < ::FFI::Struct
+          layout  :lifn_family, :sa_family_t,
+                  :lifn_flags, :int,
+                  :lifn_count, :int
+        end
+
+        class Arpreq < ::FFI::Struct
+          layout  :arp_pa, Sockaddr,
+                  :arp_ha, Sockaddr,
+                  :arp_flags, :int
+
+          def sa_data_to_mac
+            self[:arp_ha][:sa_data].entries[0, 6].map do |s|
+              s.to_s(16).rjust(2, '0')
+            end.join ':'
+          end
+
+          def self.new_for_ioctl(lifreq)
+            arp = Arpreq.new
+            arp_addr = SockaddrIn.new(arp[:arp_pa].to_ptr)
+            arp_addr[:sin_addr][:s_addr] = SockaddrIn.new(lifreq.lifru_addr.to_ptr).s_addr
+
+            arp
+          end
+        end
+
+        class Lifru1 < ::FFI::Union
+          layout  :lifru_addrlen, :int,
+                  :lifru_ppa, :uint_t
+        end
+
+        class Lifru < ::FFI::Union
+          layout  :lifru_addr, SockaddrStorage,
+                  :lifru_dstaddr, SockaddrStorage,
+                  :lifru_broadaddr, SockaddrStorage,
+                  :lifru_token, SockaddrStorage,
+                  :lifru_subnet, SockaddrStorage,
+                  :lifru_flags, :uint64,
+                  :lifru_metric, :int,
+                  :pad, [:char, 80]
+        end
+
+        class Lifreq < ::FFI::Struct
+          layout  :lifr_name, [:char, 32],
+                  :lifr_lifru1, Lifru1,
+                  :lifr_movetoindex, :int,
+                  :lifr_lifru, Lifru,
+                  :pad, [:char, 80]
+
+          def name
+            self[:lifr_name].to_s
+          end
+
+          def ss_family
+            self[:lifr_lifru][:lifru_addr][:ss_family]
+          end
+
+          def lifru_addr
+            self[:lifr_lifru][:lifru_addr]
+          end
+        end
+
+        class Lifconf < ::FFI::Struct
+          layout  :lifc_family, :uint,
+                  :lifc_flags, :int,
+                  :lifc_len, :int,
+                  :lifc_buf, :pointer
+
+          def self.new_for_ioctl(interface_count)
+            lifconf = new
+            lifconf[:lifc_family] = 0
+            lifconf[:lifc_flags] = 0
+            lifconf[:lifc_len] = interface_count * Lifreq.size
+            lifconf[:lifc_buf] = ::FFI::MemoryPointer.new(Lifreq, interface_count)
+            lifconf
+          end
+        end
+
+        class Lifcu < ::FFI::Union
+          layout  :lifcu_buf, :caddr_t,
+                  :lifcu_req, Lifreq
+        end
+
+        class InAddr < ::FFI::Struct
+          layout :s_addr, :uint32_t
+        end
+
+        class SockaddrIn < ::FFI::Struct
+          layout  :sin_family, :sa_family_t,
+                  :sin_port, :in_port_t,
+                  :sin_addr, InAddr,
+                  :sin_zero, [:char, 8]
+
+          def s_addr
+            self[:sin_addr][:s_addr]
+          end
+        end
+      end
+    end
+  end
+end