facter 1.7.2 → 1.7.3.rc1

data/README.md

@@ -20,6 +20,14 @@ Adding your own facts
 See the [Adding Facts](http://docs.puppetlabs.com/guides/custom_facts.html)
 page for details of how to add your own custom facts to Facter.
 
+Running Specs
+-------------
+
+* bundle install --path .bundle/gems
+* bundle exec rake spec
+
+Note: external facts in the system facts.d directory can cause spec failures.
+
 Further Information
 -------------------
 

data/Rakefile

@@ -10,13 +10,19 @@ require 'rake'
 
 begin
   load File.join(File.dirname(__FILE__), 'ext', 'packaging', 'packaging.rake')
-  require 'rubygems'
-  require 'rspec'
-  require 'rspec/core/rake_task'
-  require 'rcov'
 rescue LoadError
 end
 
+['rubygems',
+'rspec',
+'rspec/core/rake_task',
+'rcov',].each do |lib|
+  begin
+    require lib
+  rescue LoadError
+  end
+end
+
 Dir['tasks/**/*.rake'].each { |t| load t }
 
 build_defs_file = 'ext/build_defaults.yaml'

data/ext/build_defaults.yaml

@@ -9,15 +9,16 @@ gpg_name: 'info@puppetlabs.com'
 gpg_key: '4BD6EC30'
 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-fedora-17-i386 pl-fedora-17-x86_64 pl-fedora-18-i386 pl-fedora-18-x86_64'
-yum_host: 'burji.puppetlabs.com'
+final_mocks: 'pl-el-5-i386 pl-el-5-x86_64 pl-el-6-i386 pl-el-6-x86_64 pl-fedora-17-i386 pl-fedora-17-x86_64 pl-fedora-18-i386 pl-fedora-18-x86_64 pl-fedora-19-i386 pl-fedora-19-x86_64'
+yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE
 build_dmg: TRUE
 build_ips: TRUE
-apt_host: 'burji.puppetlabs.com'
+apt_host: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'
 apt_repo_path: '/opt/repository/incoming'
 ips_repo: '/var/pkgrepo'
 ips_store: '/opt/repository'
 ips_host: 'solaris-11-ips-repo.acctest.dc1.puppetlabs.net'
+tar_host: 'downloads.puppetlabs.com'

data/ext/debian/changelog.erb

@@ -1,9 +1,15 @@
-facter (<%= @debversion %>) hardy lucid oneiric unstable sid wheezy lucid squeeze precise quantal; urgency=low
+facter (<%= @debversion %>) lucid unstable sid wheezy lucid squeeze precise quantal raring; urgency=low
 
   * Update to version <% @debversion %>
 
  -- Puppet Labs Release <info@puppetlabs.com>  <%= Time.now.strftime("%a, %d %b %Y %H:%M:%S %z")%>
 
+facter (1.7.2-1puppetlabs2) lucid unstable sid wheezy lucid squeeze precise; urgency=low
+
+  * Remove dependenices on libssl-ruby from facter as they are not used
+
+ -- Matthaus Owens <matthaus@puppetlabs.com>  Thu, 11 Jul 2013 13:11:30 +0000
+
 facter (1.7.0-0.1rc1puppetlabs1) hardy lucid oneiric unstable sid wheezy lucid squeeze precise; urgency=low
 
   * Add dependency on virt-what to facter for better virutalization detection

data/ext/debian/control

@@ -2,13 +2,13 @@ Source: facter
 Section: ruby
 Priority: optional
 Maintainer: Puppet Labs <info@puppetlabs.com>
-Build-Depends: cdbs, debhelper (>> 7), ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.8 | libopenssl-ruby1.9.1, rdoc
+Build-Depends: cdbs, debhelper (>> 7), ruby | ruby-interpreter
 Standards-Version: 3.9.1
 Homepage: http://www.puppetlabs.com
 
 Package: facter
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, libopenssl-ruby | libopenssl-ruby1.8 | libopenssl-ruby1.9.1, dmidecode [i386 amd64 ia64], virt-what, pciutils
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, dmidecode [i386 amd64 ia64], virt-what, pciutils
 Description: Ruby module for collecting simple facts about a host operating system
  Some of the facts are preconfigured, such as the hostname and the operating
  system. Additional facts can be added through simple Ruby scripts.

data/ext/redhat/facter.spec.erb

@@ -32,7 +32,7 @@ Requires:       dmidecode
 Requires:       pciutils
 %endif
 Requires:       virt-what
-Requires:       ruby(abi) >= 1.8
+Requires:       ruby >= 1.8.5
 BuildRequires:  ruby >= 1.8.5
 
 # In Fedora 17 ruby-rdoc is called rubygem-rdoc

data/install.rb

@@ -60,7 +60,7 @@ $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), 'lib')))
 require 'facter'
 @operatingsystem = Facter[:operatingsystem].value
 
-PREREQS = %w{openssl xmlrpc/client xmlrpc/server cgi}
+PREREQS = %w{cgi}
 
 InstallOptions = OpenStruct.new
 

data/lib/facter/domain.rb

@@ -29,11 +29,14 @@ Facter.add(:domain) do
     # Due to dangerous behavior of 'hostname -f' on old OS, we will explicitly opt-in
     # 'hostname -f' --hkenney May 9, 2012
     basic_hostname = 'hostname 2> /dev/null'
+    windows_hostname = 'hostname > NUL'
     full_hostname = 'hostname -f 2> /dev/null'
     can_do_hostname_f = Regexp.union /Linux/i, /FreeBSD/i, /Darwin/i
 
     hostname_command = if Facter.value(:kernel) =~ can_do_hostname_f
                          full_hostname
+                       elsif Facter.value(:kernel) == "windows"
+                         windows_hostname
                        else
                          basic_hostname
                        end
@@ -42,7 +45,7 @@ Facter.add(:domain) do
       and name =~ /.*?\.(.+$)/
 
       return_value = $1
-    elsif domain = Facter::Util::Resolution.exec('dnsdomainname 2> /dev/null') \
+    elsif Facter.value(:kernel) != "windows" and domain = Facter::Util::Resolution.exec('dnsdomainname 2> /dev/null') \
       and domain =~ /.+/
 
       return_value = domain
@@ -76,10 +79,15 @@ Facter.add(:domain) do
     if domain == ""
       require 'facter/util/wmi'
       Facter::Util::WMI.execquery("select DNSDomain from Win32_NetworkAdapterConfiguration where IPEnabled = True").each { |nic|
-        domain = nic.DNSDomain
-        break
+        if nic.DNSDomain && nic.DNSDomain.length > 0
+          domain = nic.DNSDomain
+          break
+        end
       }
     end
+
+    domain ||= ''
+
     domain.gsub(/\.$/, '')
   end
 end

data/lib/facter/hardwaremodel.rb

@@ -32,17 +32,22 @@ Facter.add(:hardwaremodel) do
     # http://source.winehq.org/source/include/winnt.h#L568
     # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394373(v=vs.85).aspx
     # http://msdn.microsoft.com/en-us/library/windows/desktop/windows.system.processorarchitecture.aspx
+    # http://linux.derkeiler.com/Mailing-Lists/Kernel/2008-05/msg12924.html (anything over 6 is still i686)
     # Also, arm and neutral are included because they are valid for the upcoming
     # windows 8 release.  --jeffweiss 23 May 2012
     require 'facter/util/wmi'
     model = ""
+    architecture_level = nil
+
     Facter::Util::WMI.execquery("select Architecture, Level, AddressWidth from Win32_Processor").each do |cpu|
+      architecture_level = (cpu.Level > 5) ? 6 : cpu.Level;
+
       model =
         case cpu.Architecture
         when 11 then 'neutral'        # PROCESSOR_ARCHITECTURE_NEUTRAL
         when 10 then 'i686'           # PROCESSOR_ARCHITECTURE_IA32_ON_WIN64
         when 9 then                   # PROCESSOR_ARCHITECTURE_AMD64
-          cpu.AddressWidth == 32 ? "i#{cpu.Level}86" : 'x64' # 32 bit OS on 64 bit CPU
+          cpu.AddressWidth == 32 ? "i#{architecture_level}86" : 'x64' # 32 bit OS on 64 bit CPU
         when 8 then 'msil'            # PROCESSOR_ARCHITECTURE_MSIL
         when 7 then 'alpha64'         # PROCESSOR_ARCHITECTURE_ALPHA64
         when 6 then 'ia64'            # PROCESSOR_ARCHITECTURE_IA64
@@ -51,7 +56,7 @@ Facter.add(:hardwaremodel) do
         when 3 then 'powerpc'         # PROCESSOR_ARCHITECTURE_PPC
         when 2 then 'alpha'           # PROCESSOR_ARCHITECTURE_ALPHA
         when 1 then 'mips'            # PROCESSOR_ARCHITECTURE_MIPS
-        when 0 then "i#{cpu.Level}86" # PROCESSOR_ARCHITECTURE_INTEL
+        when 0 then "i#{architecture_level}86" # PROCESSOR_ARCHITECTURE_INTEL
         else 'unknown'            # PROCESSOR_ARCHITECTURE_UNKNOWN
         end
       break

data/lib/facter/ipaddress.rb

@@ -33,11 +33,13 @@ Facter.add(:ipaddress) do
       regexp = /inet (?:addr:)?([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/
       output.split("\n").each do |line|
         match = regexp.match(line)
-        if match
-          break match[1] unless /^127/.match(match[1])
+        if match and not /^127\./.match(match[1])
+          ip = match[1]
+          break
         end
       end
     end
+    ip
   end
 end
 
@@ -104,8 +106,18 @@ end
 Facter.add(:ipaddress) do
   confine :kernel => %w{windows}
   setcode do
-    require 'socket'
-    IPSocket.getaddress(Socket.gethostname)
+    require 'facter/util/ip/windows'
+    ipaddr = nil
+
+    adapters = Facter::Util::IP::Windows.get_preferred_ipv4_adapters
+    adapters.find do |nic|
+      nic.IPAddress.any? do |addr|
+        ipaddr = addr if Facter::Util::IP::Windows.valid_ipv4_address?(addr)
+        ipaddr
+      end
+    end
+
+    ipaddr
   end
 end
 

data/lib/facter/ipaddress6.rb

@@ -26,7 +26,7 @@ require 'facter/util/ip'
 def get_address_after_token(output, token, return_first=false)
   ip = nil
 
-  output.scan(/#{token} ((?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/).each do |match|
+  String(output).scan(/#{token}\s?((?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/).each do |match|
     match = match.first
     unless match =~ /fe80.*/ or match == "::1"
       ip = match
@@ -66,8 +66,17 @@ end
 Facter.add(:ipaddress6) do
   confine :kernel => :windows
   setcode do
-    output = Facter::Util::Resolution.exec("#{ENV['SYSTEMROOT']}/system32/netsh.exe interface ipv6 show address level=verbose")
+    require 'facter/util/ip/windows'
+    ipaddr = nil
 
-    get_address_after_token(output, 'Address', true)
+    adapters = Facter::Util::IP::Windows.get_preferred_ipv6_adapters
+    adapters.find do |nic|
+      nic.IPAddress.any? do |addr|
+        ipaddr = addr if Facter::Util::IP::Windows.valid_ipv6_address?(addr)
+        ipaddr
+      end
+    end
+
+    ipaddr
   end
 end

data/lib/facter/macaddress.rb

@@ -29,7 +29,7 @@ Facter.add(:macaddress) do
     ether = []
     output = Facter::Util::IP.exec_ifconfig(["-a","2>/dev/null"])
 
-    output.each_line do |s|
+    String(output).each_line do |s|
       ether.push($1) if s =~ /(?:ether|HWaddr) ((\w{1,2}:){5,}\w{1,2})/
     end
     Facter::Util::Macaddress.standardize(ether[0])

data/lib/facter/netmask.rb

@@ -21,3 +21,22 @@ Facter.add("netmask") do
     Facter::NetMask.get_netmask
   end
 end
+
+Facter.add(:netmask) do
+  confine :kernel => :windows
+  setcode do
+    require 'facter/util/ip/windows'
+
+    mask = nil
+
+    adapters = Facter::Util::IP::Windows.get_preferred_ipv4_adapters
+    adapters.find do |nic|
+      nic.IPSubnet.any? do |subnet|
+        mask = subnet if Facter::Util::IP::Windows.valid_ipv4_address?(subnet)
+        mask
+      end
+    end
+
+    mask
+  end
+end

data/lib/facter/util/directory_loader.rb

@@ -1,7 +1,7 @@
 # A Facter plugin that loads external facts.
 #
 # Default Unix Directories:
-# /etc/facter/facts.d, /etc/puppetlbas/facter/facts.d
+# /etc/facter/facts.d", "/etc/puppetlabs/facter/facts.d"
 #
 # Default Windows Direcotires:
 # C:\ProgramData\Puppetlabs\facter\facts.d (2008)

data/lib/facter/util/ip.rb

@@ -31,11 +31,7 @@ module Facter::Util::IP
       :macaddress => /(\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/,
       :netmask  => /.*\s+netmask (\S+)\s.*/
     },
-    :windows => {
-      :ipaddress  => /\s+IP Address:\s+([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)/,
-      :ipaddress6 => /Address ((?![fe80|::1])(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/,
-      :netmask  => /\s+Subnet Prefix:\s+\S+\s+\(mask ([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+)\)/
-    }
+    :windows => {}
   }
 
   # Convert an interface name into purely alphanumeric characters.
@@ -61,11 +57,12 @@ module Facter::Util::IP
   end
 
   def self.get_interfaces
-    return [] unless output = Facter::Util::IP.get_all_interface_output()
+    if Facter.value(:kernel) == 'windows'
+      require 'facter/util/ip/windows'
+      return Facter::Util::IP::Windows.interfaces
+    end
 
-    # windows interface names contain spaces and are quoted and can appear multiple
-    # times as ipv4 and ipv6
-    return output.scan(/\s* connected\s*(\S.*)/).flatten.uniq if Facter.value(:kernel) == 'windows'
+    return [] unless output = Facter::Util::IP.get_all_interface_output()
 
     # Our regex appears to be stupid, in that it leaves colons sitting
     # at the end of interfaces.  So, we have to trim those trailing
@@ -89,9 +86,6 @@ module Facter::Util::IP
         output.sub!(/^[^\n]*\n/, "")            # delete the header line.
         output
       end
-    when 'windows'
-      output = %x|#{ENV['SYSTEMROOT']}/system32/netsh.exe interface ip show interface|
-      output += %x|#{ENV['SYSTEMROOT']}/system32/netsh.exe interface ipv6 show interface|
     end
     output
   end
@@ -172,12 +166,9 @@ module Facter::Util::IP
   def self.get_output_for_interface_and_label(interface, label)
     return get_single_interface_output(interface) unless Facter.value(:kernel) == 'windows'
 
-    if label == 'ipaddress6'
-      output = %x|#{ENV['SYSTEMROOT']}/system32/netsh.exe interface ipv6 show address \"#{interface}\"|
-    else
-      output = %x|#{ENV['SYSTEMROOT']}/system32/netsh.exe interface ip show address \"#{interface}\"|
-    end
-    output
+    require 'facter/util/ip/windows'
+    output = Facter::Util::IP::Windows.value_for_interface_and_label(interface, label)
+    output ? output : ""
   end
 
   def self.get_bonding_master(interface)
@@ -220,6 +211,11 @@ module Facter::Util::IP
   # @return [String] representing the requested value.  An empty array is
   # returned if the kernel is not supported by the REGEX_MAP constant.
   def self.get_interface_value(interface, label)
+    if Facter.value(:kernel) == 'windows'
+      require 'facter/util/ip/windows'
+      return Facter::Util::IP::Windows.value_for_interface_and_label(interface, label)
+    end
+
     tmp1 = []
 
     kernel = Facter.value(:kernel).downcase.to_sym

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

@@ -0,0 +1,215 @@
+# encoding: UTF-8
+
+require 'facter/util/wmi'
+require 'facter/util/ip'
+
+class Facter::Util::IP::Windows
+  # The WMI query used to return ip information
+  #
+  # @return [String]
+  #
+  # @api private
+  WMI_IP_INFO_QUERY = 'SELECT Description, ServiceName, IPAddress, IPConnectionMetric, InterfaceIndex, Index, IPSubnet, MACAddress, MTU, SettingID FROM Win32_NetworkAdapterConfiguration WHERE IPConnectionMetric IS NOT NULL AND IPEnabled = TRUE'
+
+  # Mapping fact names to WMI properties of the Win32_NetworkAdapterConfiguration
+  #
+  # @api private
+  WINDOWS_LABEL_WMI_MAP = {
+      :ipaddress => 'IPAddress',
+      :ipaddress6 => 'IPAddress',
+      :macaddress => 'MACAddress',
+      :netmask => 'IPSubnet'
+  }
+
+  def self.to_s
+    'windows'
+  end
+
+  # Windows doesn't display netmask in hex.
+  #
+  # @return [Boolean] false by default
+  #
+  # @api private
+  def self.convert_netmask_from_hex?
+    false
+  end
+
+  # Retrieves a list of unique interfaces names.
+  #
+  # @return [Array<String>]
+  #
+  # @api private
+  def self.interfaces
+    interface_names = []
+
+    network_adapter_configurations.map do |nic|
+      Facter::Util::WMI.execquery("SELECT * FROM Win32_NetworkAdapter WHERE Index = #{nic.Index}").each do |nic|
+        interface_names << nic.NetConnectionId
+      end
+    end
+
+    interface_names.uniq
+  end
+
+  # Get the value of an interface and label. For example, you may want to find
+  # the MTU for eth0.
+  #
+  # @param [String] interface the name of the interface returned by the {#interfaces} method.
+  # @param [String] label the type of value to return, e.g. ipaddress
+  # @return [String] the value, or nil if not defined
+  #
+  # @api private
+  def self.value_for_interface_and_label(interface, label)
+    wmi_value = WINDOWS_LABEL_WMI_MAP[label.downcase.to_sym]
+    label_value = nil
+    Facter::Util::WMI.execquery("SELECT Index FROM Win32_NetworkAdapter WHERE NetConnectionID = '#{interface}'").each do |nic|
+      Facter::Util::WMI.execquery("SELECT #{wmi_value} FROM Win32_NetworkAdapterConfiguration WHERE Index = #{nic.Index}").each do |nic_config|
+        case label.downcase.to_sym
+        when :ipaddress
+          nic_config.IPAddress.any? do |addr|
+            label_value = addr if valid_ipv4_address?(addr)
+            label_value
+          end
+        when :ipaddress6
+          nic_config.IPAddress.any? do |addr|
+            label_value = addr if Facter::Util::IP::Windows.valid_ipv6_address?(addr)
+            label_value
+          end
+        when :netmask
+          nic_config.IPSubnet.any? do |addr|
+            label_value = addr if Facter::Util::IP::Windows.valid_ipv4_address?(addr)
+            label_value
+          end
+        when :macaddress
+          label_value = nic_config.MACAddress
+        end
+      end
+    end
+
+    label_value
+  end
+
+  # Returns an array of partial Win32_NetworkAdapterConfiguration objects.
+  #
+  # @return [Array<WIN32OLE>] objects
+  #
+  # @api private
+  def self.network_adapter_configurations
+    nics = []
+    # WIN32OLE doesn't implement Enumerable
+    Facter::Util::WMI.execquery(WMI_IP_INFO_QUERY).each do |nic|
+      nics << nic
+    end
+    nics
+  end
+
+  # Gets a list of active IPv4 network adapter configurations sorted by the
+  # lowest IP connection metric. If two configurations have the same metric,
+  # then the IPv4 specific binding order as specified in the registry will
+  # be used.
+  #
+  # @return [Array<WIN32OLE>]
+  #
+  # @api private
+  def self.get_preferred_ipv4_adapters
+    get_preferred_network_adapters(Bindings4.new)
+  end
+
+  # Gets a list of active IPv6 network adapter configurations sorted by the
+  # lowest IP connection metric. If two configurations have the same metric,
+  # then the IPv6 specific binding order as specified in the registry will
+  # be used.
+  #
+  # @return [Array<WIN32OLE>]
+  #
+  # @api private
+  def self.get_preferred_ipv6_adapters
+    get_preferred_network_adapters(Bindings6.new)
+  end
+
+  # Gets a list of active network adapter configurations sorted by the lowest
+  # IP connection metric. If two configurations have the same metric, then
+  # the adapter binding order as specified in the registry will be used.
+  # Note the order may different for IPv4 vs IPv6 addresses.
+  #
+  # @see http://support.microsoft.com/kb/894564
+  # @return [Array<WIN32OLE>]
+  #
+  # @api private
+  def self.get_preferred_network_adapters(bindings)
+    network_adapter_configurations.select do |nic|
+      bindings.bindings.include?(nic.SettingID)
+    end.sort do |nic_left,nic_right|
+      cmp = nic_left.IPConnectionMetric <=> nic_right.IPConnectionMetric
+      if cmp == 0
+        bindings.bindings[nic_left.SettingID] <=> bindings.bindings[nic_right.SettingID]
+      else
+        cmp
+      end
+    end
+  end
+
+  class Bindings4
+    def initialize
+      @key = 'SYSTEM\CurrentControlSet\Services\Tcpip\Linkage'
+    end
+
+    def bindings
+      require 'facter/util/registry'
+      bindings = {}
+
+      Facter::Util::Registry.hklm_read(@key, 'Bind').each_with_index do |entry, index|
+        match_data = entry.match(/\\Device\\(\{.*\})/)
+        unless match_data.nil?
+          bindings[match_data[1]] = index
+        end
+      end
+
+      bindings
+    rescue
+      {}
+    end
+  end
+
+  class Bindings6 < Bindings4
+    def initialize
+      @key = 'SYSTEM\CurrentControlSet\Services\Tcpip6\Linkage'
+    end
+  end
+
+  # Determines if the value passed in is a valid ipv4 address.
+  #
+  # @param [String] ip_address the IPv4 address to validate
+  # @return [Boolean]
+  #
+  # @api private
+  def self.valid_ipv4_address?(ip_address)
+    String(ip_address).scan(/(?:[0-9]{1,3}\.){3}[0-9]{1,3}/).each do |match|
+      # excluding 169.254.x.x in Windows - this is the DHCP APIPA
+      #  meaning that if the node cannot get an ip address from the dhcp server,
+      #  it auto-assigns a private ip address
+      unless match == "127.0.0.1" or match =~ /^169.254.*/
+        return !!match
+      end
+    end
+
+    false
+  end
+
+  # Determines if the value passed in is a valid ipv6 address.
+  #
+  # @param [String] ip_address the IPv6 address to validate
+  # @return [Boolean]
+  #
+  # @api private
+  def self.valid_ipv6_address?(ip_address)
+    String(ip_address).scan(/(?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4}/).each do |match|
+      unless match =~ /fe80.*/ or match == "::1"
+        return !!match
+      end
+    end
+
+    false
+  end
+
+end