facter 3.9.6.cfacter.20180612 → 3.11.0.cfacter.20180319

data/ext/facter/facter/acceptance/setup/common/00_EnvSetup.rb

@@ -0,0 +1,64 @@
+test_name "Setup environment"
+
+step "Ensure Git and Ruby"
+
+require 'puppet/acceptance/install_utils'
+extend Puppet::Acceptance::InstallUtils
+require 'puppet/acceptance/git_utils'
+extend Puppet::Acceptance::GitUtils
+require 'beaker/dsl/install_utils'
+extend Beaker::DSL::InstallUtils
+
+PACKAGES = {
+  :redhat => [
+    'git',
+    'ruby',
+    'rubygem-json',
+  ],
+  :debian => [
+    ['git', 'git-core'],
+    'ruby',
+  ],
+  :debian_ruby18 => [
+    'libjson-ruby',
+  ],
+  :solaris => [
+    ['git', 'developer/versioning/git'],
+    ['ruby', 'runtime/ruby-18'],
+    # there isn't a package for json, so it is installed later via gems
+  ],
+  :windows => [
+    'git',
+    # there isn't a need for json on windows because it is bundled in ruby 1.9
+  ],
+}
+
+install_packages_on(hosts, PACKAGES, :check_if_exists => true)
+
+hosts.each do |host|
+  case host['platform']
+  when /windows/
+    step "#{host} Install ruby from git"
+    ruby_arch = host[:ruby_arch] || 'x86'
+    revision = if ruby_arch == 'x64'
+                 '2.0.0-x64'
+               else
+                 '1.9.3-x86'
+               end
+
+    install_from_git(host, "/opt/puppet-git-repos",
+                    :name => 'puppet-win32-ruby',
+                    :path => build_giturl('puppet-win32-ruby'),
+                    :rev  => revision)
+    on host, 'cd /opt/puppet-git-repos/puppet-win32-ruby; cp -r ruby/* /'
+    on host, 'cd /lib; icacls ruby /grant "Everyone:(OI)(CI)(RX)"'
+    on host, 'cd /lib; icacls ruby /reset /T'
+    on host, 'cd /; icacls bin /grant "Everyone:(OI)(CI)(RX)"'
+    on host, 'cd /; icacls bin /reset /T'
+    on host, 'ruby --version'
+    on host, 'cmd /c gem list'
+  when /solaris/
+    step "#{host} Install json from rubygems"
+    on host, 'gem install json'
+  end
+end

data/ext/facter/facter/acceptance/setup/common/pre-suite/000-delete-puppet-when-none.rb

@@ -0,0 +1,11 @@
+test_name "Expunge puppet bits if hypervisor is none"
+
+# Ensure that the any previous installations of puppet
+# are removed from the host if it is not managed by a
+# provisioning hypervisor.
+
+hosts.each do |host|
+  if host[:hypervisor] == "none"
+    remove_puppet_on(host)
+  end
+end

data/ext/facter/facter/acceptance/setup/git/pre-suite/01_TestSetup.rb

@@ -0,0 +1,31 @@
+test_name "Install packages and repositories on target machines..." do
+  extend Beaker::DSL::InstallUtils
+
+  SourcePath  = Beaker::DSL::InstallUtils::SourcePath
+  GitURI      = Beaker::DSL::InstallUtils::GitURI
+  GitHubSig   = Beaker::DSL::InstallUtils::GitHubSig
+
+  tmp_repositories = []
+  options[:install].each do |uri|
+    raise(ArgumentError, "#{uri} is not recognized.") unless(uri =~ GitURI)
+    tmp_repositories << extract_repo_info_from(uri)
+  end
+
+  repositories = order_packages(tmp_repositories)
+
+  versions = {}
+  hosts.each_with_index do |host, index|
+    on host, "echo #{GitHubSig} >> $HOME/.ssh/known_hosts"
+
+    repositories.each do |repository|
+      step "Install #{repository[:name]}"
+      install_from_git host, SourcePath, repository
+
+      if index == 1
+        versions[repository[:name]] = find_git_repo_versions(host,
+                                                             SourcePath,
+                                                             repository)
+      end
+    end
+  end
+end

data/ext/facter/facter/acceptance/tests/ticket_1238_hostname_fqdn.rb

@@ -5,6 +5,7 @@ test_name 'C93827: facter fqdn should return the hostname when its a fully quali
   confine :except, :platform => 'windows'
 
   fqdn = 'foo.bar.example.org'
+  fqdn_long = 'a23456789.b23456789.c23456789.d23456789.e23456789.f23456789.wxyz'
 
   agents.each do |agent|
     orig_hostname = on(agent, 'hostname').stdout.chomp
@@ -34,4 +35,23 @@ test_name 'C93827: facter fqdn should return the hostname when its a fully quali
       end
     end
   end
+
+  step "long hostname as #{fqdn_long}" do
+    on(agent, "hostname #{fqdn_long}")
+    begin
+      Timeout.timeout(20) do
+        until on(agent, 'hostname').stdout =~ /#{fqdn_long}/
+          sleep(0.25) # on Solaris 11 hostname returns before the hostname is updated
+        end
+      end
+    rescue Timeout::Error
+      raise "Failed to reset the hostname of the test machine to #{fqdn_long}"
+    end
+  end
+
+  step 'validate facter uses hostname as the LONG fqdn if its a fully qualified domain name' do
+    on(agent, 'facter fqdn') do |facter_output|
+      assert_equal(fqdn_long, facter_output.stdout.chomp, 'facter did not return the hostname set by the test')
+    end
+  end
 end

data/ext/facter/facter/lib/CMakeLists.txt

@@ -36,6 +36,7 @@ set(LIBFACTER_COMMON_SOURCES
     "src/facts/resolvers/dmi_resolver.cc"
     "src/facts/resolvers/ec2_resolver.cc"
     "src/facts/resolvers/filesystem_resolver.cc"
+    "src/facts/resolvers/fips_resolver.cc"
     "src/facts/resolvers/gce_resolver.cc"
     "src/facts/resolvers/hypervisors_resolver.cc"
     "src/facts/resolvers/identity_resolver.cc"
@@ -179,6 +180,7 @@ elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
         "src/facts/linux/disk_resolver.cc"
         "src/facts/linux/dmi_resolver.cc"
         "src/facts/linux/filesystem_resolver.cc"
+        "src/facts/linux/fips_resolver.cc"
         "src/facts/linux/kernel_resolver.cc"
         "src/facts/linux/memory_resolver.cc"
         "src/facts/linux/networking_resolver.cc"
@@ -258,8 +260,7 @@ endif()
 if (WIN32)
     set(LIBFACTER_INSTALL_DESTINATION bin)
 else()
-    # TODO: lib64 for certain operating systems?
-    set(LIBFACTER_INSTALL_DESTINATION lib)
+    set(LIBFACTER_INSTALL_DESTINATION lib${LIB_SUFFIX})
 endif()
 
 if (JRUBY_SUPPORT)

data/ext/facter/facter/lib/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = facter
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = 3.9.6
+PROJECT_NUMBER         = 3.11.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

data/ext/facter/facter/lib/inc/facter/facts/fact.hpp

@@ -659,6 +659,11 @@ namespace facter { namespace facts {
          * The structured fact for Solaris LDom facts.
          */
         constexpr static char const* ldom = "ldom";
+
+        /**
+         * The fips mode fact for RHEL/Linux* facts.
+         */
+        constexpr static char const* fips_enabled = "fips_enabled";
     };
 
 }}  // namespace facter::facts

data/ext/facter/facter/lib/inc/internal/facts/aix/networking_resolver.hpp

@@ -38,13 +38,6 @@ namespace facter { namespace facts { namespace aix {
         */
         virtual uint8_t const* get_link_address_bytes(sockaddr const* addr) const override;
 
-        /**
-         * Gets the length of the link address.
-         * @param addr The socket address representing the link address.
-         * @return Returns the length of the address or 0 if not a link address.
-         */
-        virtual uint8_t get_link_address_length(sockaddr const* addr) const override;
-
      private:
         using mtu_map = std::unordered_map<std::string, std::string>;
 

data/ext/facter/facter/lib/inc/internal/facts/freebsd/networking_resolver.hpp

@@ -37,13 +37,6 @@ namespace facter { namespace facts { namespace freebsd {
          * @return Returns a pointer to the address bytes or nullptr if not a link address.
          */
         virtual uint8_t const* get_link_address_bytes(sockaddr const* addr) const override;
-
-        /**
-         * Gets the length of the link address.
-         * @param addr The socket address representing the link address.
-         * @return Returns the length of the address or 0 if not a link address.
-         */
-        virtual uint8_t get_link_address_length(sockaddr const* addr) const override;
     };
 
 }}}  // namespace facter::facts::freebsd

data/ext/facter/facter/lib/inc/internal/facts/linux/fips_resolver.hpp

@@ -0,0 +1,31 @@
+/**
+ * @file
+ * Declares the Linux fips fact resolver.
+ */
+#pragma once
+
+#include "../resolvers/fips_resolver.hpp"
+
+namespace facter { namespace facts { namespace linux {
+
+    /**
+     * Responsible for resolving fips-related facts.
+     */
+    struct fips_resolver : resolvers::fips_resolver
+    {
+     protected:
+        /**
+         * The check consists of the following.
+         *   (1) Examining the contents of /proc/sys/crypto/fips_enabled. If it is 1
+         *   then fips mode is enabled.
+         */ 
+
+        /**
+         * Collects the resolver data.
+         * @param facts The fact collection that is resolving facts.
+         * @return Returns the resolver data.
+         */
+        virtual data collect_data(collection& facts) override;
+    };
+
+}}}  // namespace facter::facts::linux

data/ext/facter/facter/lib/inc/internal/facts/linux/networking_resolver.hpp

@@ -40,13 +40,6 @@ namespace facter { namespace facts { namespace linux {
          */
         virtual uint8_t const* get_link_address_bytes(sockaddr const* addr) const override;
 
-        /**
-         * Gets the length of the link address.
-         * @param addr The socket address representing the link address.
-         * @return Returns the length of the address or 0 if not a link address.
-         */
-        virtual uint8_t get_link_address_length(sockaddr const* addr) const override;
-
         /**
          * Gets the MTU of the link layer data.
          * @param interface The name of the link layer interface.

data/ext/facter/facter/lib/inc/internal/facts/openbsd/networking_resolver.hpp

@@ -37,13 +37,6 @@ namespace facter { namespace facts { namespace openbsd {
          * @return Returns a pointer to the address bytes or nullptr if not a link address.
          */
         virtual uint8_t const* get_link_address_bytes(sockaddr const* addr) const override;
-
-        /**
-         * Gets the length of the link address.
-         * @param addr The socket address representing the link address.
-         * @return Returns the length of the address or 0 if not a link address.
-         */
-        virtual uint8_t get_link_address_length(sockaddr const* addr) const override;
     };
 
 }}}  // namespace facter::facts::openbsd

data/ext/facter/facter/lib/inc/internal/facts/osx/networking_resolver.hpp

@@ -28,13 +28,6 @@ namespace facter { namespace facts { namespace osx {
          */
         virtual uint8_t const* get_link_address_bytes(sockaddr const* addr) const override;
 
-        /**
-         * Gets the length of the link address.
-         * @param addr The socket address representing the link address.
-         * @return Returns the length of the address or 0 if not a link address.
-         */
-        virtual uint8_t get_link_address_length(sockaddr const* addr) const override;
-
         /**
          * Gets the MTU of the link layer data.
          * @param interface The name of the link layer interface.

data/ext/facter/facter/lib/inc/internal/facts/posix/networking_resolver.hpp

@@ -37,13 +37,6 @@ namespace facter { namespace facts { namespace posix {
          */
         virtual uint8_t const* get_link_address_bytes(sockaddr const* addr) const = 0;
 
-        /**
-         * Gets the length of the link address.
-         * @param addr The socket address representing the link address.
-         * @return Returns the length of the address or 0 if not a link address.
-         */
-        virtual uint8_t get_link_address_length(sockaddr const* addr) const = 0;
-
         /**
          * Collects the resolver data.
          * @param facts The fact collection that is resolving facts.

data/ext/facter/facter/lib/inc/internal/facts/resolvers/fips_resolver.hpp

@@ -0,0 +1,46 @@
+/**
+* @file
+* Declares the base fips fact resolver.
+*/
+#pragma once
+
+#include <facter/facts/resolver.hpp>
+
+namespace facter { namespace facts { namespace resolvers {
+
+
+    /**
+     * Responsible for resolving fips facts.
+     */
+    struct fips_resolver : resolver
+    {
+        fips_resolver();
+
+        /**
+         * Called to resolve all facts the resolver is responsible for.
+         * @param facts The fact collection that is resolving facts.
+         */
+        virtual void resolve(collection& facts) override;
+
+     protected:
+        /**
+         *  Represents fips data.
+         */
+        struct data
+        {
+            /**
+             * Stores the is_fips_mode_enabled data.
+             */
+            bool is_fips_mode_enabled;
+        };
+
+        /**
+         *
+         * Collects fips data.
+         * @param facts The fact collection that is resolving facts.
+         * @return Returns the fips data.
+         */
+        virtual data collect_data(collection& facts) = 0;
+    };
+
+}}}  // namespace facter::facts::resolvers

data/ext/facter/facter/lib/inc/internal/facts/resolvers/networking_resolver.hpp

@@ -24,11 +24,10 @@ namespace facter { namespace facts { namespace resolvers {
 
         /**
          * Utility function to convert the bytes of a MAC address to a string.
-         * @param bytes The bytes of the MAC address; accepts 6-byte and 20-byte addresses.
-         * @param byte_count The number of bytes in the MAC address; defaults to be 6 bytes long.
+         * @param bytes The bytes of the MAC address; expected to be 6 bytes long.
          * @returns Returns the MAC address as a string or an empty string if the address is the "NULL" MAC address.
          */
-        static std::string macaddress_to_string(uint8_t const* bytes, uint8_t byte_count = 6);
+        static std::string macaddress_to_string(uint8_t const* bytes);
 
         /**
         * Returns whether the address is an ignored IPv4 address.

data/ext/facter/facter/lib/inc/internal/facts/resolvers/ssh_resolver.hpp

@@ -57,6 +57,12 @@ namespace facter { namespace facts { namespace resolvers {
              * Stores the SSH key's fingerprint.
              */
             fingerprint digest;
+
+            /**
+             * Stores the SSH key type. One of ssh-dss, ssh-rsa, ssh-ed25519,
+             * ecdsa-sha2-nistp256, ecdsa-sha2-nistp384, or ecdsa-sha2-nistp512
+             */
+            std::string type;
         };
 
         /**

data/ext/facter/facter/lib/inc/internal/facts/solaris/networking_resolver.hpp

@@ -37,13 +37,6 @@ namespace facter { namespace facts { namespace solaris {
         */
         virtual uint8_t const* get_link_address_bytes(sockaddr const* addr) const override;
 
-        /**
-         * Gets the length of the link address.
-         * @param addr The socket address representing the link address.
-         * @return Returns the length of the address or 0 if not a link address.
-         */
-        virtual uint8_t get_link_address_length(sockaddr const* addr) const override;
-
      private:
         void populate_binding(interface& iface, lifreq const* addr) const;
         void populate_macaddress(interface& iface, lifreq const* addr) const;

data/ext/facter/facter/lib/schema/facter.yaml

@@ -234,7 +234,7 @@ disks:
                     caveats: Only present on Solaris.
                 size:
                     type: string
-                    description: The display size of the disk or block device (e.g. "1 GiB").
+                    description: The display size of the disk or block device, such as "1 GiB".
                 size_bytes:
                     type: integer
                     description: The size of the disk or block device, in bytes.
@@ -369,6 +369,14 @@ filesystems:
         Mac OSX: The usable file systems is limited to the file system of mounted devices.
     blockgroup: file system
 
+fips_enabled:
+    type: boolean
+    description: Return whether the platform is in FIPS mode
+    resolution: |
+        Linux: parse the contents of `/proc/sys/crypto/fips_enabled` which if non-zero indicates fips mode has been enabled.
+    caveats: |
+        Linux: Limited to linux redhat family only
+
 fqdn:
     type: string
     hidden: true
@@ -722,7 +730,7 @@ memory:
             elements:
                 available:
                     type: string
-                    description: The display size of the available amount of swap memory (e.g. "1 GiB").
+                    description: The display size of the available amount of swap memory, such as "1 GiB".
                 available_bytes:
                     type: integer
                     description: The size of the available amount of swap memory, in bytes.
@@ -734,13 +742,13 @@ memory:
                     description: True if the swap is encrypted or false if not.
                 total:
                     type: string
-                    description: The display size of the total amount of swap memory (e.g. "1 GiB").
+                    description: The display size of the total amount of swap memory, such as "1 GiB".
                 total_bytes:
                     type: integer
                     description: The size of the total amount of swap memory, in bytes.
                 used:
                     type: string
-                    description: The display size of the used amount of swap memory (e.g. "1 GiB").
+                    description: The display size of the used amount of swap memory, such as "1 GiB".
                 used_bytes:
                     type: integer
                     description: The size of the used amount of swap memory, in bytes.
@@ -750,7 +758,7 @@ memory:
             elements:
                 available:
                     type: string
-                    description: The display size of the available amount of system memory (e.g. "1 GiB").
+                    description: The display size of the available amount of system memory, such as "1 GiB".
                 available_bytes:
                     type: integer
                     description: The size of the available amount of system memory, in bytes.
@@ -759,13 +767,13 @@ memory:
                     description: The capacity percentage (0% is empty, 100% is full).
                 total:
                     type: string
-                    description: The display size of the total amount of system memory (e.g. "1 GiB").
+                    description: The display size of the total amount of system memory, such as "1 GiB".
                 total_bytes:
                     type: integer
                     description: The size of the total amount of system memory, in bytes.
                 used:
                     type: string
-                    description: The display size of the used amount of system memory (e.g. "1 GiB").
+                    description: The display size of the used amount of system memory, such as "1 GiB".
                 used_bytes:
                     type: integer
                     description: The size of the used amount of system memory, in bytes.
@@ -773,7 +781,7 @@ memory:
 memoryfree:
     type: string
     hidden: true
-    description: Return the display size of the free system memory (e.g. "1 GiB").
+    description: Return the display size of the free system memory, such as "1 GiB".
     resolution: |
         Linux: parse the contents of `/proc/meminfo` to retrieve the free system memory.
         Mac OSX: use the `sysctl` function to retrieve the free system memory.
@@ -793,7 +801,7 @@ memoryfree_mb:
 memorysize:
     type: string
     hidden: true
-    description: Return the display size of the total system memory (e.g. "1 GiB").
+    description: Return the display size of the total system memory, such as "1 GiB".
     resolution: |
         Linux: parse the contents of `/proc/meminfo` to retrieve the total system memory.
         Mac OSX: use the `sysctl` function to retrieve the total system memory.
@@ -827,7 +835,7 @@ mountpoints:
             elements:
                 available:
                     type: string
-                    description: The display size of the available space (e.g. "1 GiB").
+                    description: The display size of the available space, such as "1 GiB".
                 available_bytes:
                     type: integer
                     description: The size of the available space, in bytes.
@@ -845,13 +853,13 @@ mountpoints:
                     description: The mount options.
                 size:
                     type: string
-                    description: The display size of the total space (e.g. "1 GiB").
+                    description: The display size of the total space, such as "1 GiB".
                 size_bytes:
                     type: integer
                     description: The size of the total space, in bytes.
                 used:
                     type: string
-                    description: The display size of the used space (e.g. "1 GiB").
+                    description: The display size of the used space, such as "1 GiB".
                 used_bytes:
                     type: integer
                     description: The size of the used space, in bytes.
@@ -1066,7 +1074,7 @@ operatingsystemmajrelease:
         Solaris: parse the contents of `/etc/release` to retrieve the OS major release.
         Windows: use WMI to retrieve the OS major release.
     caveats: |
-        Linux: for Ubuntu, the major release is X.Y (e.g. "10.4").
+        Linux: for Ubuntu, the major release is X.Y, such as "10.4".
 
 operatingsystemrelease:
     type: string
@@ -1204,7 +1212,7 @@ osfamily:
     description: Return the family of the operating system.
     resolution: |
         All platforms: default to the kernel name.
-        Linux: map various Linux distributions to their base distribution (e.g. Ubuntu is a "Debian" distro).
+        Linux: map various Linux distributions to their base distribution. For example, Ubuntu is a "Debian" distro.
         Solaris: map various Solaris-based operating systems to the "Solaris" family.
         Windows: use "windows" as the family name.
 
@@ -1240,7 +1248,7 @@ partitions:
                     description: The unique identifier of a GPT partition.
                 size:
                     type: string
-                    description: The display size of the partition (e.g. "1 GiB").
+                    description: The display size of the partition, such as "1 GiB".
                 size_bytes:
                     type: integer
                     description: The size of the partition, in bytes.
@@ -1315,7 +1323,7 @@ processors:
             description: The count of physical processors.
         speed:
             type: string
-            description: The speed of the processors (e.g. "2.0 GHz").
+            description: The speed of the processors, such as "2.0 GHz".
 
 productname:
     type: string
@@ -1497,6 +1505,9 @@ ssh:
                 key:
                     type: string
                     description: The DSA public key.
+                type:
+                    type: string
+                    description: The exact type of the key, i.e. "ssh-dss".
         ecdsa:
             type: map
             description: Represents the public key and fingerprints for the ECDSA algorithm.
@@ -1514,6 +1525,9 @@ ssh:
                 key:
                     type: string
                     description: The ECDSA public key.
+                type:
+                    type: string
+                    description: The exact type of the key, e.g. "ecdsa-sha2-nistp256".
         ed25519:
             type: map
             description: Represents the public key and fingerprints for the Ed25519 algorithm.
@@ -1531,6 +1545,9 @@ ssh:
                 key:
                     type: string
                     description: The Ed25519 public key.
+                type:
+                    type: string
+                    description: The exact type of the key, i.e. "ssh-ed25519".
         rsa:
             type: map
             description: Represents the public key and fingerprints for the RSA algorithm.
@@ -1548,6 +1565,9 @@ ssh:
                 key:
                     type: string
                     description: The RSA public key.
+                type:
+                    type: string
+                    description: The exact type of the key, i.e. "ssh-rsa".
 
 ssh<algorithm>key:
     pattern: ^ssh\w*key$
@@ -1579,7 +1599,7 @@ swapencrypted:
 swapfree:
     type: string
     hidden: true
-    description: Return the display size of the free swap memory (e.g. "1 GiB").
+    description: Return the display size of the free swap memory, such as "1 GiB".
     resolution: |
         Linux: parse the contents of `/proc/meminfo` to retrieve the free swap memory.
         Mac OSX: use the `sysctl` function to retrieve the free swap memory.
@@ -1597,7 +1617,7 @@ swapfree_mb:
 swapsize:
     type: string
     hidden: true
-    description: Return the display size of the total swap memory (e.g. "1 GiB").
+    description: Return the display size of the total swap memory, such as "1 GiB".
     resolution: |
         Linux: parse the contents of `/proc/meminfo` to retrieve the total swap memory.
         Mac OSX: use the `sysctl` function to retrieve the total swap memory.