facter 2.4.6-universal-darwin → 2.5.0-universal-darwin

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 73015e0c45fed5590a04d949ef957a271a17b4d0
+  data.tar.gz: 79c2313c0b1e7b634eea4d4ffd3b7ad61b24b0db
+SHA512:
+  metadata.gz: a9713f966310243ac58bcac194d1db5ba4fb69a7ecd85506228178ebd96629a9a303f3cc19c5908f019860a70d68f91f12cfa501b31ca025620783910407ca0e
+  data.tar.gz: f7eeaceeafc932a5083c0dad62a0c029cd44937b53ea5518e7839f551815d1c3e0110357e5512b09c65fe21235fa2d85e21f1f86559535865b178f070cc3c2ab

data/Gemfile

@@ -14,7 +14,7 @@ group :development, :test do
   gem 'rspec', "~> 2.11.0"
   gem 'mocha', "~> 0.10.5"
   gem 'json', "~> 1.7", :platforms => :ruby
-  gem 'json-schema', :platforms => :ruby
+  gem 'json-schema', "~> 2.6.2", :platforms => :ruby
   gem 'puppetlabs_spec_helper'
 end
 
@@ -33,17 +33,17 @@ data['gem_platform_dependencies'].each_pair do |gem_platform, info|
   end
 end
 
-platform(:mingw_19) do
-  gem 'win32console', '~> 1.3.2', :require => false
-end
-
 mingw = [:mingw]
 mingw << :x64_mingw if Bundler::Dsl::VALID_PLATFORMS.include?(:x64_mingw)
 
 platform(*mingw) do
-  gem 'ffi', '~> 1.9.5', :require => false
-  gem 'win32-dir', '~> 0.4.8', :require => false
-  gem 'win32-security', '~> 0.2.5', :require => false
+  # FFI dropped 1.9.3 support in 1.9.16, and 1.9.15 was an incomplete release.
+  # 1.9.18 is required to support Ruby 2.4
+  if RUBY_VERSION < '2.0.0'
+    gem 'ffi', '<= 1.9.14', :require => false
+  else
+    gem 'ffi', '~> 1.9.18', :require => false
+  end
 end
 
 gem 'facter', ">= 1.0.0", :path => File.expand_path("..", __FILE__)

data/ext/build_defaults.yaml

@@ -6,7 +6,7 @@ cows: 'base-precise-i386.cow base-precise-amd64.cow base-squeeze-i386.cow base-s
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'
-gpg_key: '4BD6EC30'
+gpg_key: '7F438280EF8D349F'
 sign_tar: FALSE
 # a space separated list of mock configs
 final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-el-7-x86_64 pl-fedora-20-i386 pl-fedora-20-x86_64'

data/ext/project_data.yaml

@@ -16,18 +16,13 @@ gem_default_executables: 'facter'
 gem_platform_dependencies:
   universal-darwin:
     gem_runtime_dependencies:
-      CFPropertyList: '~> 2.2.6'
+      CFPropertyList: '~> 2.2'
   x86-mingw32:
     gem_runtime_dependencies:
       ffi: '~> 1.9.5'
-      win32-dir: '~> 0.4.8'
-      win32-security: '~> 0.2.5'
-      win32console: '~> 1.3.2'
   x64-mingw32:
     gem_runtime_dependencies:
       ffi: '~> 1.9.5'
-      win32-dir: '~> 0.4.8'
-      win32-security: '~> 0.2.5'
 bundle_platforms:
   universal-darwin: ruby
   x86-mingw32: mingw

data/lib/facter/ec2.rb

@@ -46,7 +46,14 @@ Facter.define_fact(:ec2_userdata) do
     end
 
     setcode do
-      @querier.fetch
+      userdata = @querier.fetch
+      begin
+        Facter::Util::Normalization.normalize_string(userdata)
+      rescue Facter::Util::Normalization::NormalizationError => e
+        Facter.debug("Failed to read ec2 userdata: #{e.message}")
+        userdata = nil
+      end
+      userdata
     end
   end
 end

data/lib/facter/ec2/rest.rb

@@ -20,14 +20,12 @@ module Facter
 
     class Base
       def reachable?(retry_limit = 3)
-        timeout = 0.2
+        timeout = 0.5
         able_to_connect = false
         attempts = 0
 
         begin
-          Timeout.timeout(timeout) do
-            open(@baseurl, :proxy => nil).read
-          end
+          open(@baseurl, :proxy => nil, :read_timeout => timeout).read
           able_to_connect = true
         rescue OpenURI::HTTPError => e
           if e.message.match /404 Not Found/i
@@ -125,7 +123,7 @@ module Facter
       end
 
       def fetch
-        open(@baseurl).read
+        open(@baseurl, :proxy => nil).read
       rescue OpenURI::HTTPError => e
         if e.message.match /404 Not Found/i
           return nil

data/lib/facter/gce/metadata.rb

@@ -45,7 +45,7 @@ module Facter
 
         begin
           Timeout.timeout(timeout) do
-            body = open(@url).read
+            body = open(@url, :proxy => nil).read
           end
         rescue *CONNECTION_ERRORS => e
           attempts = attempts + 1

data/lib/facter/kernelrelease.rb

@@ -11,6 +11,7 @@
 # Caveats:
 #
 require 'facter/util/posix'
+require 'facter/util/windows'
 
 Facter.add(:kernelrelease) do
   setcode 'uname -r'
@@ -39,12 +40,6 @@ end
 Facter.add(:kernelrelease) do
   confine :kernel => "windows"
   setcode do
-    require 'facter/util/wmi'
-    version = ""
-    Facter::Util::WMI.execquery("SELECT Version from Win32_OperatingSystem").each do |ole|
-      version = "#{ole.Version}"
-      break
-    end
-    version
+    Facter::Util::Windows::Process.os_version_string
   end
 end

data/lib/facter/operatingsystem/linux.rb

@@ -23,7 +23,9 @@ module Facter
 
       def get_osfamily
         case get_operatingsystem
-        when "RedHat", "Fedora", "CentOS", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM", "OracleLinux", "OVS", "OEL", "Amazon", "XenServer"
+        when "RedHat", "Fedora", "CentOS", "Scientific", "SLC", "Ascendos",
+             "CloudLinux", "PSBM", "OracleLinux", "OVS", "OEL", "Amazon",
+             "XenServer", "VirtuozzoLinux"
           "RedHat"
         when "LinuxMint", "Ubuntu", "Debian"
           "Debian"
@@ -51,7 +53,8 @@ module Facter
         when "BlueWhite64"
           get_bluewhite_release_with_release_file
         when "CentOS", "RedHat", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM",
-             "XenServer", "Fedora", "MeeGo", "OracleLinux", "OEL", "oel", "OVS", "ovs"
+             "XenServer", "Fedora", "MeeGo", "OracleLinux", "OEL", "oel", "OVS", "ovs",
+             "VirtuozzoLinux"
           get_redhatish_release_with_release_file
         when "Debian"
           get_debian_release_with_release_file
@@ -291,13 +294,14 @@ module Facter
       def get_redhat_operatingsystem_name
         txt = File.read("/etc/redhat-release")
         matches = {
-          "CentOS"     => "centos",
-          "Scientific" => "Scientific",
-          "CloudLinux" => "^cloudlinux",
-          "PSBM"       => "^Parallels Server Bare Metal",
-          "Ascendos"   => "Ascendos",
-          "XenServer"  => "^XenServer",
-          "XCP"        => "XCP"
+          "CentOS"         => "centos",
+          "Scientific"     => "Scientific",
+          "CloudLinux"     => "^cloudlinux",
+          "PSBM"           => "^Parallels Server Bare Metal",
+          "Ascendos"       => "Ascendos",
+          "XenServer"      => "^XenServer",
+          "XCP"            => "XCP",
+          "VirtuozzoLinux" => "^VirtuozzoLinux"
         }
 
         if txt =~ /CERN/
@@ -381,7 +385,8 @@ module Facter
 
       def get_redhatish_release_with_release_file
         case get_operatingsystem
-        when "CentOS", "RedHat", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM", "XenServer"
+        when "CentOS", "RedHat", "Scientific", "SLC", "Ascendos", "CloudLinux",
+             "PSBM", "XenServer", "VirtuozzoLinux"
           releasefile = "/etc/redhat-release"
         when "Fedora"
           releasefile = "/etc/fedora-release"

data/lib/facter/operatingsystem/windows.rb

@@ -4,33 +4,32 @@ module Facter
   module Operatingsystem
     class Windows < Base
       def get_operatingsystemrelease
-        require 'facter/util/wmi'
+        require 'facter/util/windows'
         result = nil
-        Facter::Util::WMI.execquery("SELECT version, producttype FROM Win32_OperatingSystem").each do |os|
+        Facter::Util::Windows::Process.os_version do |os|
           result =
-            case os.version
-            when /^6\.4/
-              # As of October 2014, there are no Win server releases with kernel 6.4.x.
-              # This case prevents future releases from resolving to nil before we
-              # can update the fact regexes.
-              os.producttype == 1 ? "10" : Facter[:kernelrelease].value
-            when /^6\.3/
-              os.producttype == 1 ? "8.1" : "2012 R2"
-            when /^6\.2/
-              os.producttype == 1 ? "8" : "2012"
-            when /^6\.1/
-              os.producttype == 1 ? "7" : "2008 R2"
-            when /^6\.0/
-              os.producttype == 1 ? "Vista" : "2008"
-            when /^5\.2/
-              if os.producttype == 1
+            case "#{os[:dwMajorVersion]}.#{os[:dwMinorVersion]}"
+            when '10.0'
+              if os[:dwBuildNumber] == 14300
+                'Nano'
+              else
+                os[:wProductType] == 1 ? '10' : Facter[:kernelrelease].value
+              end
+            when '6.3'
+              os[:wProductType] == 1 ? "8.1" : "2012 R2"
+            when '6.2'
+              os[:wProductType] == 1 ? "8" : "2012"
+            when '6.1'
+              os[:wProductType] == 1 ? "7" : "2008 R2"
+            when '6.0'
+              os[:wProductType] == 1 ? "Vista" : "2008"
+            when '5.2'
+              if os[:wProductType] == 1
                 "XP"
+              elsif Facter::Util::Windows::Process.is_2003_r2?
+                "2003 R2"
               else
-                begin
-                  os.othertypedescription == "R2" ? "2003 R2" : "2003"
-                rescue NoMethodError
-                  "2003"
-                end
+                "2003"
               end
             else
               Facter[:kernelrelease].value

data/lib/facter/util/config.rb

@@ -22,8 +22,8 @@ module Facter::Util::Config
   end
 
   def self.windows_data_dir
-    if Dir.const_defined? 'COMMON_APPDATA' then
-      Dir::COMMON_APPDATA
+    if Facter::Util::Config.is_windows?
+      Facter::Util::Windows::Dir.get_common_appdata()
     else
       nil
     end
@@ -60,7 +60,7 @@ module Facter::Util::Config
   end
 
   if Facter::Util::Config.is_windows?
-    require 'win32/dir'
+    require 'facter/util/windows/dir'
     require 'facter/util/windows_root'
   else
     require 'facter/util/unix_root'

data/lib/facter/util/ec2.rb

@@ -13,7 +13,7 @@ module Facter::Util::EC2
     def can_connect?(wait_sec=2)
       Facter.warnonce("#{self}.#{__method__} is deprecated; see the Facter::EC2 classes instead")
       url = "http://169.254.169.254:80/"
-      Timeout::timeout(wait_sec) {open(url)}
+      Timeout::timeout(wait_sec) {open(url, :proxy => nil)}
       return true
     rescue Timeout::Error
       return false
@@ -100,7 +100,7 @@ module Facter::Util::EC2
   #
   # @return [String] containing the body of the response
   def self.read_uri(uri)
-    open(uri).read
+    open(uri, :proxy => nil).read
   end
   private_class_method :read_uri
 end

data/lib/facter/util/ip.rb

@@ -6,7 +6,7 @@ module Facter::Util::IP
   REGEX_MAP = {
     :linux => {
       :ipaddress  => /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-      :ipaddress6 => /inet6 (?:addr: )?((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+      :ipaddress6 => /inet6 (?:addr: )?((?!(?:fe80|::1))(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
       :macaddress => /(?:ether|HWaddr)\s+((\w{1,2}:){5,}\w{1,2})/,
       :netmask  => /(?:Mask:|netmask )([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
       :mtu  => /MTU:?\s*(\d+)/i
@@ -14,14 +14,14 @@ module Facter::Util::IP
     :bsd   => {
       :aliases  => [:openbsd, :netbsd, :freebsd, :darwin, :"gnu/kfreebsd", :dragonfly],
       :ipaddress  => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-      :ipaddress6 => /inet6 ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+      :ipaddress6 => /inet6 ((?!(?:fe80|::1))(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
       :macaddress => /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/,
       :netmask  => /netmask\s+0x(\w{8})/,
       :mtu => /mtu\s+(\d+)/
     },
     :sunos => {
       :ipaddress  => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-      :ipaddress6 => /inet6 ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+      :ipaddress6 => /inet6 ((?!(?:fe80|::1))(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
       :macaddress => /(?:ether|lladdr)\s+(\w?\w:\w?\w:\w?\w:\w?\w:\w?\w:\w?\w)/,
       :netmask  => /netmask\s+(\w{8})/,
       :mtu => /mtu\s+(\d+)/
@@ -33,7 +33,7 @@ module Facter::Util::IP
     },
     :aix   => {
       :ipaddress  => /inet\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-      :ipaddress6 => /inet6 ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
+      :ipaddress6 => /inet6 ((?!(?:fe80|::1))(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
       :netmask  => /netmask\s+0x(\w{8})/,
       :mtu => /mtu\s+(\d+)/,
       :macaddress => /^Hardware\sAddress:\s(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/

data/lib/facter/util/memory.rb

@@ -150,7 +150,7 @@ module Facter::Memory
     when /AIX/i
       (Facter.value(:id) == "root") ? Facter::Core::Execution.exec('swap -l 2>/dev/null') : nil
     when /OpenBSD/i
-      Facter::Core::Execution.exec('swapctl -s')
+      Facter::Core::Execution.exec('swapctl -s 2>/dev/null')
     when /FreeBSD/i
       Facter::Core::Execution.exec('swapinfo -k')
     when /Darwin/i

data/lib/facter/util/windows.rb

@@ -0,0 +1,10 @@
+module Facter::Util::Windows
+  module Process; end
+
+  if Facter::Util::Config.is_windows?
+    require 'facter/util/windows/api_types'
+    require 'facter/util/windows/error'
+    require 'facter/util/windows/user'
+    require 'facter/util/windows/process'
+  end
+end

data/lib/facter/util/windows/api_types.rb

@@ -0,0 +1,143 @@
+require 'ffi'
+
+module Facter::Util::Windows::ApiTypes
+  module ::FFI
+    WIN32_FALSE = 0
+
+    # standard Win32 error codes
+    ERROR_SUCCESS = 0
+  end
+
+  module ::FFI::Library
+    # Wrapper method for attach_function + private
+    def attach_function_private(*args)
+      attach_function(*args)
+      private args[0]
+    end
+  end
+
+  class ::FFI::Pointer
+    NULL_HANDLE = 0
+
+    def read_win32_bool
+      # BOOL is always a 32-bit integer in Win32
+      # some Win32 APIs return 1 for true, while others are non-0
+      read_int32 != FFI::WIN32_FALSE
+    end
+    #
+    alias_method :read_dword, :read_uint32
+
+    def read_handle
+      type_size == 4 ? read_uint32 : read_uint64
+    end
+
+    def read_wide_string(char_length, dst_encoding = Encoding::UTF_8)
+      # char_length is number of wide chars (typically excluding NULLs), *not* bytes
+      str = get_bytes(0, char_length * 2).force_encoding('UTF-16LE')
+      str.encode(dst_encoding)
+    end
+
+    # @param max_char_length [Integer] Maximum number of wide chars to return (typically excluding NULLs), *not* bytes
+    # @param null_terminator [Symbol] Number of number of null wchar characters, *not* bytes, that determine the end of the string
+    #   null_terminator = :single_null, then the terminating sequence is two bytes of zero.   This is UNIT16 = 0
+    #   null_terminator = :double_null, then the terminating sequence is four bytes of zero.  This is UNIT32 = 0
+    def read_arbitrary_wide_string_up_to(max_char_length = 512, null_terminator = :single_null)
+      if null_terminator != :single_null && null_terminator != :double_null
+        raise _("Unable to read wide strings with %{null_terminator} terminal nulls") % { null_terminator: null_terminator }
+      end
+
+      terminator_width = null_terminator == :single_null ? 1 : 2
+      reader_method = null_terminator == :single_null ? :get_uint16 : :get_uint32
+
+      # Look for a null terminating characters; if found, read up to that null (exclusive)
+      (0...max_char_length - terminator_width).each do |i|
+        return read_wide_string(i) if send(reader_method, (i * 2)) == 0
+      end
+
+      # String is longer than the max; read just to the max
+      read_wide_string(max_char_length)
+    end
+
+    def read_win32_local_pointer(&block)
+      ptr = nil
+      begin
+        ptr = read_pointer
+        yield ptr
+      ensure
+        if ptr && ! ptr.null?
+          if FFI::WIN32::LocalFree(ptr.address) != FFI::Pointer::NULL_HANDLE
+            Puppet.debug "LocalFree memory leak"
+          end
+        end
+      end
+
+      # ptr has already had LocalFree called, so nothing to return
+      nil
+    end
+  end
+  # FFI Types
+  # https://github.com/ffi/ffi/wiki/Types
+
+  # Windows - Common Data Types
+  # https://msdn.microsoft.com/en-us/library/cc230309.aspx
+
+  # Windows Data Types
+  # https://msdn.microsoft.com/en-us/library/windows/desktop/aa383751(v=vs.85).aspx
+
+  FFI.typedef :uint32, :dword
+  FFI.typedef :uintptr_t, :handle
+
+  # buffer_inout is similar to pointer (platform specific), but optimized for buffers
+  FFI.typedef :buffer_inout, :lpwstr
+
+  # pointer in FFI is platform specific
+  # NOTE: for API calls with reserved lpvoid parameters, pass a FFI::Pointer::NULL
+  FFI.typedef :pointer, :lpcvoid
+  FFI.typedef :pointer, :lpvoid
+  FFI.typedef :pointer, :lpdword
+  FFI.typedef :pointer, :pdword
+  FFI.typedef :pointer, :phandle
+  FFI.typedef :pointer, :pbool
+
+  # any time LONG / ULONG is in a win32 API definition DO NOT USE platform specific width
+  # which is what FFI uses by default
+  # instead create new aliases for these very special cases
+  # NOTE: not a good idea to redefine FFI :ulong since other typedefs may rely on it
+  FFI.typedef :uint32, :win32_ulong
+  FFI.typedef :int32, :win32_long
+  # FFI bool can be only 1 byte at times,
+  # Win32 BOOL is a signed int, and is always 4 bytes, even on x64
+  # https://blogs.msdn.com/b/oldnewthing/archive/2011/03/28/10146459.aspx
+  FFI.typedef :int32, :win32_bool
+
+  # Same as a LONG, a 32-bit signed integer
+  FFI.typedef :int32, :hresult
+
+  # NOTE: FFI already defines (u)short as a 16-bit (un)signed like this:
+  # FFI.typedef :uint16, :ushort
+  # FFI.typedef :int16, :short
+
+  # 8 bits per byte
+  FFI.typedef :uchar, :byte
+  FFI.typedef :uint16, :wchar
+
+  module ::FFI::WIN32
+    extend ::FFI::Library
+
+    ffi_convention :stdcall
+
+    # https://msdn.microsoft.com/en-us/library/windows/desktop/aa366730(v=vs.85).aspx
+    # HLOCAL WINAPI LocalFree(
+    #   _In_  HLOCAL hMem
+    # );
+    ffi_lib :kernel32
+    attach_function :LocalFree, [:handle], :handle
+
+    # https://msdn.microsoft.com/en-us/library/windows/desktop/ms724211(v=vs.85).aspx
+    # BOOL WINAPI CloseHandle(
+    #   _In_  HANDLE hObject
+    # );
+    ffi_lib :kernel32
+    attach_function_private :CloseHandle, [:handle], :win32_bool
+  end
+end