facter 2.0.2-universal-darwin → 2.1.0-universal-darwin

data/lib/facter/util/windows_root.rb

@@ -1,37 +1,7 @@
-require 'windows/system_info'
-require 'windows/security'
-require 'sys/admin'
+require 'win32/security'
 
 module Facter::Util::Root
-  extend ::Windows::SystemInfo
-  extend ::Windows::Security
-
   def self.root?
-    # if Vista or later, check for unrestricted process token
-    return Win32::Security.elevated_security? unless windows_version < 6.0
-
-    # otherwise 2003 or less
-    check_token_membership
-  end
-
-  def self.check_token_membership
-    sid = 0.chr * 80
-    size = [80].pack('L')
-    member = 0.chr * 4
-
-    unless CreateWellKnownSid(Windows::Security::WinBuiltinAdministratorsSid, nil, sid, size)
-      raise "Failed to create administrators SID"
-    end
-
-    unless IsValidSid(sid)
-      raise "Invalid SID"
-    end
-
-    unless CheckTokenMembership(nil, sid, member)
-      raise "Failed to check membership"
-    end
-
-    # Is administrators SID enabled in calling thread's access token?
-    member.unpack('L')[0] == 1
+    Win32::Security.elevated_security?
   end
 end

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '2.0.2'
+    FACTERVERSION = '2.1.0'
   end
 
   # Returns the running version of Facter.

data/lib/facter/virtual.rb

@@ -5,9 +5,11 @@
 # Resolution:
 #   Assumes physical unless proven otherwise.
 #
-#   On Darwin, use the macosx util module to acquire the SPDisplaysDataType,
-#   from that parse it to see if it's VMWare or Parallels pretending to be the
-#   display.
+#   On Darwin, use the macosx util module to acquire the SPHardwareDataType and
+#   SPEthernetDataType, from which it is possible to determine if the host is a
+#   VMware, Parallels, or VirtualBox.  This previously used SPDisplaysDataType
+#   which was not reliable if running headless, and also caused lagging issues
+#   on actual Macs.
 #
 #   On Linux, BSD, Solaris and HPUX:
 #   Much of the logic here is obscured behind util/virtual.rb, which rather
@@ -16,9 +18,9 @@
 #   contents of files in there.
 #   If after all the other tests, it's still seen as physical, then it tries to
 #   parse the output of the "lspci", "dmidecode" and "prtdiag" and parses them
-#   for obvious signs of being under VMWare, Parallels or VirtualBox.
+#   for obvious signs of being under VMware, Parallels or VirtualBox.
 #   Finally it checks for the existence of vmware-vmx, which would hint it's
-#   VMWare.
+#   VMware.
 #
 # Caveats:
 #   Many checks rely purely on existence of files.
@@ -32,13 +34,18 @@ Facter.add("virtual") do
   setcode do
     require 'facter/util/macosx'
     result = "physical"
-    output = Facter::Util::Macosx.profiler_data("SPDisplaysDataType")
+    # use SPHardwareDataType for VMware and VirtualBox, since it is the most
+    # reliable source.
+    output = Facter::Util::Macosx.profiler_data("SPHardwareDataType")
     if output.is_a?(Hash)
-      result = "parallels" if output["spdisplays_vendor-id"] =~ /0x1ab8/
-      result = "parallels" if output["spdisplays_vendor"] =~ /[Pp]arallels/
-      result = "vmware" if output["spdisplays_vendor-id"] =~ /0x15ad/
-      result = "vmware" if output["spdisplays_vendor"] =~ /VM[wW]are/
-      result = "virtualbox" if output["spdisplays_vendor-id"] =~ /0x80ee/
+      result = "vmware" if output["machine_model"] =~ /VMware/
+      result = "virtualbox" if output["boot_rom_version"] =~ /VirtualBox/
+    end
+    # Parallels passes through almost all of the host's hardware info to the
+    # virtual machine, so use a different field.
+    output = Facter::Util::Macosx.profiler_data("SPEthernetDataType")
+    if output.is_a?(Hash)
+      result = "parallels" if output["spethernet_subsystem-vendor-id"] =~ /0x1ab8/
     end
     result
   end
@@ -91,13 +98,14 @@ Facter.add("virtual") do
   confine :kernel => 'OpenBSD'
   has_weight 10
   setcode do
-    output = Facter::Core::Execution.exec('sysctl -n hw.product 2>/dev/null')
+    output = Facter::Util::POSIX.sysctl("hw.product")
     if output
       lines = output.split("\n")
       next "parallels"  if lines.any? {|l| l =~ /Parallels/ }
       next "vmware"     if lines.any? {|l| l =~ /VMware/ }
       next "virtualbox" if lines.any? {|l| l =~ /VirtualBox/ }
       next "xenhvm"     if lines.any? {|l| l =~ /HVM domU/ }
+      next "ovirt"      if lines.any? {|l| l =~ /oVirt Node/ }
     end
   end
 end
@@ -244,6 +252,39 @@ Facter.add("virtual") do
     end
   end
 end
+
+##
+# virtual fact specific to linux containers.  This also works for Docker
+# containers running in lxc.
+Facter.add("virtual") do
+  has_weight 700
+  confine :kernel => "Linux"
+
+  setcode do
+    "lxc" if Facter::Util::Virtual.lxc?
+  end
+end
+
+##
+# virtual fact specific to docker containers.
+Facter.add("virtual") do
+  has_weight 750
+  confine :kernel => "Linux"
+
+  setcode do
+    "docker" if Facter::Util::Virtual.docker?
+  end
+end
+
+Facter.add("virtual") do
+  has_weight 600
+  confine :kernel => "Linux"
+
+  setcode do
+    "gce" if Facter::Util::Virtual.gce?
+  end
+end
+
 # Fact: is_virtual
 #
 # Purpose: returning true or false for if a machine is virtualised or not.

data/spec/fixtures/ifconfig/openbsd_bridge_rules

@@ -0,0 +1,11 @@
+bridge0: flags=41
+        groups: bridge
+        priority 32768 hellotime 2 fwddelay 15 maxage 20 holdcnt 6 proto rstp
+        vlan1 flags=3
+                port 5 ifpriority 0 ifcost 0
+        em0 flags=7
+                port 1 ifpriority 0 ifcost 0
+block out on em0 src 00:24:21:ef:1b:de
+pflog0: flags=41 mtu 33152
+        priority: 0
+        groups: pflog

data/spec/fixtures/unit/dhcp_servers/nmcli_devices

@@ -0,0 +1,4 @@
+DEVICE     TYPE              STATE        
+wlan0      802-11-wireless   connected    
+eth0       802-3-ethernet    connected
+eth1       802-3-ethernet    disconnected

data/spec/fixtures/unit/dhcp_servers/nmcli_devices_disconnected

@@ -0,0 +1,4 @@
+DEVICE     TYPE              STATE        
+wlan0      802-11-wireless   disconnected    
+eth0       802-3-ethernet    disconnected
+eth1       802-3-ethernet    disconnected

data/spec/fixtures/unit/dhcp_servers/nmcli_eth0_dhcp

@@ -0,0 +1,36 @@
+GENERAL.DEVICE:                         eth0
+GENERAL.TYPE:                           802-3-ethernet
+GENERAL.VENDOR:                         Realtek Semiconductor Co., Ltd.
+GENERAL.PRODUCT:                        RTL8111/8168 PCI Express Gigabit Ethernet controller
+GENERAL.DRIVER:                         r8169
+GENERAL.DRIVER-VERSION:                 2.3LK-NAPI
+GENERAL.FIRMWARE-VERSION:               
+GENERAL.HWADDR:                         D4:BE:D9:34:67:68
+GENERAL.STATE:                          100 (connected)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.UDI:                            /sys/devices/pci0000:00/0000:00:1c.0/0000:07:00.0/net/eth0
+GENERAL.IP-IFACE:                       eth0
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.CONNECTION:                     /org/freedesktop/NetworkManager/ActiveConnection/9
+CAPABILITIES.CARRIER-DETECT:            yes
+CAPABILITIES.SPEED:                     1000 Mb/s
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{1,2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   acafdb99-23e4-49e5-a3e6-0a00575312b5 | Office
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   d6aaee51-2ed8-4b05-82ac-365c9c74b44e | DHCP
+WIRED-PROPERTIES.CARRIER:               on
+IP4.ADDRESS[1]:                         ip = 192.168.1.10, gw = 192.168.1.1
+IP4.DNS[1]:                             192.168.1.1
+DHCP4.OPTION[1]:                        time_offset = 0
+DHCP4.OPTION[2]:                        expiry = 1401991971
+DHCP4.OPTION[3]:                        broadcast_address = 192.168.1.255
+DHCP4.OPTION[4]:                        dhcp_message_type = 5
+DHCP4.OPTION[5]:                        dhcp_lease_time = 9999999
+DHCP4.OPTION[6]:                        ip_address = 192.168.1.10
+DHCP4.OPTION[7]:                        subnet_mask = 255.255.255.0
+DHCP4.OPTION[8]:                        routers = 192.168.1.1
+DHCP4.OPTION[9]:                        domain_name_servers = 192.168.1.1
+DHCP4.OPTION[10]:                       network_number = 192.168.1.0
+DHCP4.OPTION[11]:                       default_ip_ttl = 64
+DHCP4.OPTION[12]:                       dhcp_server_identifier = 192.168.1.1

data/spec/fixtures/unit/dhcp_servers/nmcli_eth0_static

@@ -0,0 +1,24 @@
+GENERAL.DEVICE:                         eth0
+GENERAL.TYPE:                           802-3-ethernet
+GENERAL.VENDOR:                         Realtek Semiconductor Co., Ltd.
+GENERAL.PRODUCT:                        RTL8111/8168 PCI Express Gigabit Ethernet controller
+GENERAL.DRIVER:                         r8169
+GENERAL.DRIVER-VERSION:                 2.3LK-NAPI
+GENERAL.FIRMWARE-VERSION:               
+GENERAL.HWADDR:                         D4:BE:D9:34:67:68
+GENERAL.STATE:                          100 (connected)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.UDI:                            /sys/devices/pci0000:00/0000:00:1c.0/0000:07:00.0/net/eth0
+GENERAL.IP-IFACE:                       eth0
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.CONNECTION:                     /org/freedesktop/NetworkManager/ActiveConnection/9
+CAPABILITIES.CARRIER-DETECT:            yes
+CAPABILITIES.SPEED:                     1000 Mb/s
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{1,2}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   acafdb99-23e4-49e5-a3e6-0a00575312b5 | Office
+CONNECTIONS.AVAILABLE-CONNECTIONS[2]:   d6aaee51-2ed8-4b05-82ac-365c9c74b44e | DHCP
+WIRED-PROPERTIES.CARRIER:               on
+IP4.ADDRESS[1]:                         ip = 192.168.1.10, gw = 192.168.1.1
+IP4.DNS[1]:                             192.168.1.1

data/spec/fixtures/unit/dhcp_servers/nmcli_wlan0_dhcp

@@ -0,0 +1,49 @@
+GENERAL.DEVICE:                         wlan0
+GENERAL.TYPE:                           802-11-wireless
+GENERAL.VENDOR:                         Intel Corporation
+GENERAL.PRODUCT:                        Centrino Advanced-N 6235 AGN
+GENERAL.DRIVER:                         iwlwifi
+GENERAL.DRIVER-VERSION:                 3.11.0-12-generic
+GENERAL.FIRMWARE-VERSION:               18.168.6.1
+GENERAL.HWADDR:                         C4:85:08:06:2C:55
+GENERAL.STATE:                          100 (connected)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.UDI:                            /sys/devices/pci0000:00/0000:00:1c.2/0000:08:00.0/net/wlan0
+GENERAL.IP-IFACE:                       wlan0
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.CONNECTION:                     /org/freedesktop/NetworkManager/ActiveConnection/10
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     13 Mb/s
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   7a82c94b-afba-498b-9a62-30ebb335b365 | Auto OptusCD3_80ac32
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+AP[1].SSID:                             'TestSSid'
+AP[1].BSSID:                            C8:F9:F9:BE:F1:4E
+AP[1].MODE:                             Infrastructure
+AP[1].FREQ:                             5745 MHz
+AP[1].RATE:                             54 MB/s
+AP[1].SIGNAL:                           72
+AP[1].SECURITY:                         WPA WPA2 Enterprise
+AP[1].ACTIVE:                           no
+IP4.ADDRESS[1]:                         ip = 192.168.2.10/24, gw = 192.168.2.1
+IP4.DNS[1]:                             192.168.2.1
+DHCP4.OPTION[1]:                        time_offset = 0
+DHCP4.OPTION[2]:                        expiry = 1401991971
+DHCP4.OPTION[3]:                        broadcast_address = 192.168.0.255
+DHCP4.OPTION[4]:                        dhcp_message_type = 5
+DHCP4.OPTION[5]:                        dhcp_lease_time = 9999999
+DHCP4.OPTION[6]:                        ip_address = 192.168.2.10
+DHCP4.OPTION[7]:                        subnet_mask = 255.255.255.0
+DHCP4.OPTION[8]:                        routers = 192.168.2.1
+DHCP4.OPTION[9]:                        domain_name_servers = 192.168.2.1
+DHCP4.OPTION[10]:                       network_number = 192.168.2.0
+DHCP4.OPTION[11]:                       default_ip_ttl = 64
+DHCP4.OPTION[12]:                       dhcp_server_identifier = 192.168.2.1

data/spec/fixtures/unit/dhcp_servers/nmcli_wlan0_static

@@ -0,0 +1,37 @@
+GENERAL.DEVICE:                         wlan0
+GENERAL.TYPE:                           802-11-wireless
+GENERAL.VENDOR:                         Intel Corporation
+GENERAL.PRODUCT:                        Centrino Advanced-N 6235 AGN
+GENERAL.DRIVER:                         iwlwifi
+GENERAL.DRIVER-VERSION:                 3.11.0-12-generic
+GENERAL.FIRMWARE-VERSION:               18.168.6.1
+GENERAL.HWADDR:                         C4:85:08:06:2C:55
+GENERAL.STATE:                          100 (connected)
+GENERAL.REASON:                         0 (No reason given)
+GENERAL.UDI:                            /sys/devices/pci0000:00/0000:00:1c.2/0000:08:00.0/net/wlan0
+GENERAL.IP-IFACE:                       wlan0
+GENERAL.NM-MANAGED:                     yes
+GENERAL.AUTOCONNECT:                    yes
+GENERAL.FIRMWARE-MISSING:               no
+GENERAL.CONNECTION:                     /org/freedesktop/NetworkManager/ActiveConnection/10
+CAPABILITIES.CARRIER-DETECT:            no
+CAPABILITIES.SPEED:                     13 Mb/s
+CONNECTIONS.AVAILABLE-CONNECTION-PATHS: /org/freedesktop/NetworkManager/Settings/{3}
+CONNECTIONS.AVAILABLE-CONNECTIONS[1]:   7a82c94b-afba-498b-9a62-30ebb335b365 | Auto OptusCD3_80ac32
+WIFI-PROPERTIES.WEP:                    yes
+WIFI-PROPERTIES.WPA:                    yes
+WIFI-PROPERTIES.WPA2:                   yes
+WIFI-PROPERTIES.TKIP:                   yes
+WIFI-PROPERTIES.CCMP:                   yes
+WIFI-PROPERTIES.AP:                     yes
+WIFI-PROPERTIES.ADHOC:                  yes
+AP[1].SSID:                             'TestSSid'
+AP[1].BSSID:                            C8:F9:F9:BE:F1:4E
+AP[1].MODE:                             Infrastructure
+AP[1].FREQ:                             5745 MHz
+AP[1].RATE:                             54 MB/s
+AP[1].SIGNAL:                           72
+AP[1].SECURITY:                         WPA WPA2 Enterprise
+AP[1].ACTIVE:                           no
+IP4.ADDRESS[1]:                         ip = 192.168.2.10/24, gw = 192.168.2.1
+IP4.DNS[1]:                             192.168.2.1

data/spec/fixtures/unit/dhcp_servers/route

@@ -0,0 +1,3 @@
+Iface	Destination	Gateway 	Flags	RefCnt	Use	Metric	Mask		MTU	Window	IRTT
+eth0	00000000	0110100A	0003	0	0	0	00000000	0	0	0
+eth0	0010100A	00000000	0001	0	0	1	00FCFFFF	0	0	0

data/spec/fixtures/unit/dhcp_servers/route_nogw

@@ -0,0 +1 @@
+Iface	Destination	Gateway 	Flags	RefCnt	Use	Metric	Mask		MTU	Window	IRTT

data/spec/fixtures/unit/ec2/rest/meta-data/root

@@ -0,0 +1,20 @@
+ami-id
+ami-launch-index
+ami-manifest-path
+block-device-mapping/
+hostname
+instance-action
+instance-id
+instance-type
+kernel-id
+local-hostname
+local-ipv4
+mac
+metrics/
+network/
+placement/
+profile
+public-hostname
+public-ipv4
+public-keys/
+reservation-id

data/spec/fixtures/unit/gce/metadata/metadata.json

@@ -0,0 +1,69 @@
+{
+    "instance": {
+        "attributes": {},
+        "description": "",
+        "disks": [
+            {
+                "deviceName": "gce-facts",
+                "index": 0,
+                "mode": "READ_WRITE",
+                "type": "PERSISTENT"
+            }
+        ],
+        "hostname": "gce-facts.c.dev-sand-box.internal",
+        "id": 18287562037867659655,
+        "image": "projects/485161417235/images/centos6",
+        "machineType": "projects/485161417235/machineTypes/n1-standard-1",
+        "maintenanceEvent": "NONE",
+        "networkInterfaces": [
+            {
+                "accessConfigs": [
+                    {
+                        "externalIp": "23.251.145.218",
+                        "type": "ONE_TO_ONE_NAT"
+                    }
+                ],
+                "forwardedIps": [],
+                "ip": "10.240.193.246",
+                "network": "projects/485161417235/networks/default"
+            }
+        ],
+        "scheduling": {
+            "automaticRestart": "TRUE",
+            "onHostMaintenance": "MIGRATE"
+        },
+        "serviceAccounts": {
+            "485161417235-u737tauareitfc5ju1t5cbmdrasr4giv@developer.gserviceaccount.com": {
+                "aliases": [
+                    "default"
+                ],
+                "email": "485161417235-u737tauareitfc5ju1t5cbmdrasr4giv@developer.gserviceaccount.com",
+                "scopes": [
+                    "https://www.googleapis.com/auth/compute",
+                    "https://www.googleapis.com/auth/devstorage.full_control",
+                    "https://www.googleapis.com/auth/userinfo.email"
+                ]
+            },
+            "default": {
+                "aliases": [
+                    "default"
+                ],
+                "email": "485161417235-u737tauareitfc5ju1t5cbmdrasr4giv@developer.gserviceaccount.com",
+                "scopes": [
+                    "https://www.googleapis.com/auth/compute",
+                    "https://www.googleapis.com/auth/devstorage.full_control",
+                    "https://www.googleapis.com/auth/userinfo.email"
+                ]
+            }
+        },
+        "tags": [],
+        "zone": "projects/485161417235/zones/us-central1-b"
+    },
+    "project": {
+        "attributes": {
+            "sshKeys": "justin:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKTIyNpvkUHk71q79CfiMOiY9xL9bOazvDfsCLD1UaK+g6kugMRxxiFRIB7aOajOrQl/+ZJ3Cy16f/D6zmSLTMJSIQKiJsGFyCdfkbZ6YKDSKMOpqlZCSeErpJp74X4Olg37DLqkFH2MtuoclrkheY0f87CMTGc/ICr6zDF2DoYM7yCU7y8s6FckcDs6xBUYd+phduQLLuEiUxB95neESvV0ZiD4IoJsEMOj5Y5VLqvmbozlHVu8OqVtUxNj5iIwXMGG/hROvjtZQfFRYn64xhINDt/ozbesh5ah1zn6FosGwfuYM5WJeTsUN53iiXIsDDks2Kv3bLu4fOSQ/P9LEF justin@holguinj.wifi.puppetlabs.net\nadrien:ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCtYeE0mv03TdEZ/1Gd6SEOkG0QCFzBH/rGqji75WJpMrr9UKti7wAN3nFBWp6ElM1pxmnzGBqJPxFfsIkjRhm89hh123KlaorJQZU5pftGXGNMUo/cd/idqu3OXTMs149TGrZAlowKdzOPIx9ndNJQW6OtKmn8yFgxXFpB6kJRccjeh0erDk9Zdv+/PZL1UWmDBlNh9exPsUV9qTclih/jI1PAbA+/8Oj8MqlxrlsTltjczPe/TUbvpw/d/12d1EIF6F3f498Y4mAwB/ERQIKb55b3NwPjQJ+RwZIRpayQ8nvhxJmAn8xtbyTF4o5ORHICbGqLpbmc52h2pUieqJqf adrien@grey"
+        },
+        "numericProjectId": 485161417235,
+        "projectId": "dev-sand-box"
+    }
+}

data/spec/fixtures/unit/kernelrelease/openbsd-5.3

@@ -0,0 +1,2 @@
+OpenBSD 5.3 (GENERIC.MP) #2: Fri May 17 15:54:55 CEST 2013
+root@binpatch-53-i386.mtier.org:/home/jasper/binpatchng/work-binpatch53-i386/src/sys/arch/i386/compile/GENERIC.MP

data/spec/fixtures/unit/kernelrelease/openbsd-5.3-current

@@ -0,0 +1,3 @@
+OpenBSD 5.3-current (GENERIC.MP) #130: Wed Jun 5 15:15:03 MDT 2013
+deraadt@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
+

data/spec/fixtures/unit/memory/aix-svmon

@@ -0,0 +1,9 @@
+Unit: KB
+--------------------------------------------------------------------------------------
+               size       inuse        free         pin     virtual  available   mmode
+memory     32768000     9948408    22819592     2432080     4448928   27231828     Ded
+pg space   34078720       15000
+
+               work        pers        clnt       other
+pin         1478228           0           0      953852
+in use      4448928           0     5499480