facter 3.11.0.cfacter.20180319 → 3.11.2.cfacter.20180606

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

@@ -37,6 +37,13 @@ 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,6 +28,13 @@ 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,6 +37,13 @@ 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/networking_resolver.hpp

@@ -24,10 +24,11 @@ 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; expected to be 6 bytes long.
+         * @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.
          * @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);
+        static std::string macaddress_to_string(uint8_t const* bytes, uint8_t byte_count = 6);
 
         /**
         * Returns whether the address is an ignored IPv4 address.

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

@@ -37,6 +37,13 @@ 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/src/facts/aix/disk_resolver.cc

@@ -36,9 +36,18 @@ namespace facter { namespace facts { namespace aix {
 
                 {
                     string device = (boost::format("/dev/%1%") % d.name).str();
-                    scoped_descriptor fd(open(device.c_str(), O_RDONLY));
+                    auto descriptor = open(device.c_str(), O_RDONLY);
+                    if (descriptor < 0) {
+                        LOG_DEBUG("Could not open device %1% for reading: %2% (%3%). Disk facts will not be populated for this device", d.name, strerror(errno), errno);
+                        continue;
+                    }
+                    scoped_descriptor fd(descriptor);
                     devinfo info;
-                    ioctl(fd, IOCINFO, &info);
+                    auto result = ioctl(fd, IOCINFO, &info);
+                    if (result < 0) {
+                        LOG_DEBUG("Ioctl IOCINFO failed for device %1%: %2% (%3%). Disk facts will not be populated for this device", d.name, strerror(errno), errno);
+                        continue;
+                    }
                     switch (info.devtype) {
                     case DD_DISK:
                     case DD_SCDISK:

data/ext/facter/facter/lib/src/facts/aix/networking_resolver.cc

@@ -241,5 +241,10 @@ namespace facter { namespace facts { namespace aix {
         return nullptr;
     }
 
+    uint8_t networking_resolver::get_link_address_length(const sockaddr * addr) const
+    {
+        return 0;
+    }
+
 
 }}}  // namespace facter::facts::aix

data/ext/facter/facter/lib/src/facts/bsd/networking_resolver.cc

@@ -1,15 +1,21 @@
+#include <facter/util/string.hpp>
 #include <internal/facts/bsd/networking_resolver.hpp>
 #include <internal/util/bsd/scoped_ifaddrs.hpp>
 #include <leatherman/execution/execution.hpp>
 #include <leatherman/file_util/file.hpp>
 #include <leatherman/file_util/directory.hpp>
 #include <leatherman/logging/logging.hpp>
+#include <leatherman/util/regex.hpp>
 #include <boost/algorithm/string.hpp>
+#include <boost/filesystem.hpp>
 #include <netinet/in.h>
+#include <unordered_map>
 
 using namespace std;
 using namespace facter::util::bsd;
 using namespace leatherman::execution;
+using namespace leatherman::util;
+using facter::util::maybe_stoi;
 
 namespace lth_file = leatherman::file_util;
 
@@ -117,11 +123,8 @@ namespace facter { namespace facts { namespace bsd {
         // that has a non-loopback address
         return {};
     }
-
-    map<string, string> networking_resolver::find_dhcp_servers() const
+    void networking_resolver::find_dhclient_dhcp_servers(std::map<std::string, std::string>& servers) const
     {
-        map<string, string> servers;
-
         static vector<string> const dhclient_search_directories = {
             "/var/lib/dhclient",
             "/var/lib/dhcp",
@@ -153,6 +156,59 @@ namespace facter { namespace facts { namespace bsd {
                 return true;
             }, "^dhclient.*lease.*$");
         }
+    }
+
+    void networking_resolver::find_networkd_dhcp_servers(std::map<std::string, std::string>& servers) const
+    {
+        // Files in this lease directory are not part of systemd's public API,
+        // and they include warnings against parsing them, but they seem to be
+        // the only way to get this information for now.
+        // Each file is named after the interface's index number.
+        static const string networkd_lease_directory = "/run/systemd/netif/leases/";
+
+        if (!boost::filesystem::is_directory(networkd_lease_directory)) return;
+
+        static boost::regex ip_link_re("^(\\d+):\\s+([^:]+)");
+        unordered_map<int, string> iface_index_names;
+        string key, value;
+
+        // Gather a map of interface indices and their interface names from `ip link show` --
+        // Only the index is known in the lease files.
+        each_line("ip", {"link", "show"}, [&](string line) {
+            if (re_search(line, ip_link_re, &key, &value)) {
+                iface_index_names.insert(make_pair(stoi(key), value));
+            }
+            return true;
+        });
+
+        LOG_DEBUG("searching \"{1}\" for systemd-networkd DHCP lease files", networkd_lease_directory);
+
+        lth_file::each_file(networkd_lease_directory, [&](string const& path) {
+            LOG_DEBUG("searching \"{1}\" for systemd-networkd DHCP lease information", path);
+            string server_address;
+
+            static boost::regex server_address_re("^SERVER_ADDRESS=(.*)$");
+            lth_file::each_line(path, [&](string& line) {
+                boost::trim(line);
+                if (re_search(line, server_address_re, &server_address)) {
+                    boost::filesystem::path p {path};
+                    auto iface_index = maybe_stoi(p.filename().string());
+                    if (!iface_index) return true;
+                    servers.emplace(make_pair(iface_index_names[iface_index.get()], server_address));
+                }
+                return true;
+            });
+            return true;
+        });
+    }
+
+    map<string, string> networking_resolver::find_dhcp_servers() const
+    {
+        map<string, string> servers;
+
+        find_networkd_dhcp_servers(servers);
+        if (servers.empty()) find_dhclient_dhcp_servers(servers);
+
         return servers;
     }
 

data/ext/facter/facter/lib/src/facts/freebsd/networking_resolver.cc

@@ -27,12 +27,21 @@ namespace facter { namespace facts { namespace freebsd {
             return nullptr;
         }
         sockaddr_dl const* link_addr = reinterpret_cast<sockaddr_dl const*>(addr);
-        if (link_addr->sdl_alen != 6) {
+        if (link_addr->sdl_alen != 6 && link_addr->sdl_alen != 20) {
             return nullptr;
         }
         return reinterpret_cast<uint8_t const*>(LLADDR(link_addr));
      }
 
+    uint8_t networking_resolver::get_link_address_length(sockaddr const* addr) const
+    {
+        if (!is_link_address(addr)) {
+            return 0;
+        }
+        sockaddr_dl const* link_addr = reinterpret_cast<sockaddr_dl const*>(addr);
+        return link_addr->sdl_alen;
+    }
+
     boost::optional<uint64_t> networking_resolver::get_link_mtu(string const& interface, void* data) const
     {
         ifreq ifr;

data/ext/facter/facter/lib/src/facts/linux/networking_resolver.cc

@@ -67,12 +67,21 @@ namespace facter { namespace facts { namespace linux {
             return nullptr;
         }
         sockaddr_ll const* link_addr = reinterpret_cast<sockaddr_ll const*>(addr);
-        if (link_addr->sll_halen != 6) {
+        if (link_addr->sll_halen != 6 && link_addr->sll_halen != 20) {
             return nullptr;
         }
         return reinterpret_cast<uint8_t const*>(link_addr->sll_addr);
     }
 
+    uint8_t networking_resolver::get_link_address_length(sockaddr const* addr) const
+    {
+        if (!is_link_address(addr)) {
+            return 0;
+        }
+        sockaddr_ll const* link_addr = reinterpret_cast<sockaddr_ll const*>(addr);
+        return link_addr->sll_halen;
+    }
+
     boost::optional<uint64_t> networking_resolver::get_link_mtu(string const& interface, void* data) const
     {
         // Unfortunately in Linux, the data points at interface statistics

data/ext/facter/facter/lib/src/facts/openbsd/networking_resolver.cc

@@ -27,12 +27,21 @@ namespace facter { namespace facts { namespace openbsd {
             return nullptr;
         }
         sockaddr_dl const* link_addr = reinterpret_cast<sockaddr_dl const*>(addr);
-        if (link_addr->sdl_alen != 6) {
+        if (link_addr->sdl_alen != 6 && link_addr->sdl_alen != 20) {
             return nullptr;
         }
         return reinterpret_cast<uint8_t const*>(LLADDR(link_addr));
      }
 
+    uint8_t networking_resolver::get_link_address_length(sockaddr const* addr) const
+    {
+        if (!is_link_address(addr)) {
+            return 0;
+        }
+        sockaddr_dl const* link_addr = reinterpret_cast<sockaddr_dl const*>(addr);
+        return link_addr->sdl_alen;
+    }
+
     boost::optional<uint64_t> networking_resolver::get_link_mtu(string const& interface, void* data) const
     {
         ifreq ifr;

data/ext/facter/facter/lib/src/facts/osx/networking_resolver.cc

@@ -23,12 +23,21 @@ namespace facter { namespace facts { namespace osx {
             return nullptr;
         }
         sockaddr_dl const* link_addr = reinterpret_cast<sockaddr_dl const*>(addr);
-        if (link_addr->sdl_alen != 6) {
+        if (link_addr->sdl_alen != 6 && link_addr->sdl_alen != 20) {
             return nullptr;
         }
         return reinterpret_cast<uint8_t const*>(LLADDR(link_addr));
     }
 
+    uint8_t networking_resolver::get_link_address_length(sockaddr const* addr) const
+    {
+        if (!is_link_address(addr)) {
+            return 0;
+        }
+        sockaddr_dl const* link_addr = reinterpret_cast<sockaddr_dl const*>(addr);
+        return link_addr->sdl_alen;
+    }
+
     boost::optional<uint64_t> networking_resolver::get_link_mtu(string const& interface, void* data) const
     {
         if (!data) {

data/ext/facter/facter/lib/src/facts/posix/networking_resolver.cc

@@ -49,8 +49,9 @@ namespace facter { namespace facts { namespace posix {
             return buffer;
         } else if (is_link_address(addr)) {
             auto link_addr = get_link_address_bytes(addr);
+            uint8_t link_addr_len = get_link_address_length(addr);
             if (link_addr) {
-                return macaddress_to_string(reinterpret_cast<uint8_t const*>(link_addr));
+                return macaddress_to_string(reinterpret_cast<uint8_t const*>(link_addr), link_addr_len);
             }
         }
 

data/ext/facter/facter/lib/src/facts/resolvers/networking_resolver.cc

@@ -151,15 +151,15 @@ namespace facter { namespace facts { namespace resolvers {
         }
     }
 
-    string networking_resolver::macaddress_to_string(uint8_t const* bytes)
+    string networking_resolver::macaddress_to_string(uint8_t const* bytes, uint8_t byte_count)
     {
-        if (!bytes) {
+        if (!bytes || (byte_count != 6 && byte_count != 20)) {
             return {};
         }
 
         // Ignore MAC address "0"
         bool nonzero = false;
-        for (size_t i = 0; i < 6; ++i) {
+        for (size_t i = 0; i < byte_count; ++i) {
             if (bytes[i] != 0) {
                 nonzero = true;
                 break;
@@ -169,10 +169,26 @@ namespace facter { namespace facts { namespace resolvers {
             return {};
         }
 
-        return (boost::format("%02x:%02x:%02x:%02x:%02x:%02x") %
-                static_cast<int>(bytes[0]) % static_cast<int>(bytes[1]) %
-                static_cast<int>(bytes[2]) % static_cast<int>(bytes[3]) %
-                static_cast<int>(bytes[4]) % static_cast<int>(bytes[5])).str();
+        if (byte_count == 6) {
+            return (boost::format("%02x:%02x:%02x:%02x:%02x:%02x") %
+                    static_cast<int>(bytes[0]) % static_cast<int>(bytes[1]) %
+                    static_cast<int>(bytes[2]) % static_cast<int>(bytes[3]) %
+                    static_cast<int>(bytes[4]) % static_cast<int>(bytes[5])).str();
+        } else if (byte_count == 20) {
+            return (boost::format("%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x") %
+                    static_cast<int>(bytes[0]) % static_cast<int>(bytes[1]) %
+                    static_cast<int>(bytes[2]) % static_cast<int>(bytes[3]) %
+                    static_cast<int>(bytes[4]) % static_cast<int>(bytes[5]) %
+                    static_cast<int>(bytes[6]) % static_cast<int>(bytes[7]) %
+                    static_cast<int>(bytes[8]) % static_cast<int>(bytes[9]) %
+                    static_cast<int>(bytes[10]) % static_cast<int>(bytes[11]) %
+                    static_cast<int>(bytes[12]) % static_cast<int>(bytes[13]) %
+                    static_cast<int>(bytes[14]) % static_cast<int>(bytes[15]) %
+                    static_cast<int>(bytes[16]) % static_cast<int>(bytes[17]) %
+                    static_cast<int>(bytes[18]) % static_cast<int>(bytes[19])).str();
+        } else {
+            return {};
+        }
     }
 
     bool networking_resolver::ignored_ipv4_address(string const& addr)

data/ext/facter/facter/lib/src/facts/solaris/networking_resolver.cc

@@ -171,6 +171,11 @@ namespace facter { namespace facts { namespace solaris {
         return nullptr;
     }
 
+    uint8_t networking_resolver::get_link_address_length(const sockaddr * addr) const
+    {
+        return 0;
+    }
+
     string networking_resolver::find_dhcp_server(string const& interface) const
     {
         auto exec = execute("dhcpinfo", { "-i", interface, "ServerID" });

data/ext/facter/facter/locales/FACTER.pot

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FACTER 3.11.0\n"
+"Project-Id-Version: FACTER 3.11.2\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -275,6 +275,20 @@ msgstr ""
 msgid "/dev/%1%"
 msgstr ""
 
+#. debug
+#: lib/src/facts/aix/disk_resolver.cc
+msgid ""
+"Could not open device %1% for reading: %2% (%3%). Disk facts will not be "
+"populated for this device"
+msgstr ""
+
+#. debug
+#: lib/src/facts/aix/disk_resolver.cc
+msgid ""
+"Ioctl IOCINFO failed for device %1%: %2% (%3%). Disk facts will not be "
+"populated for this device"
+msgstr ""
+
 #. warning
 #: lib/src/facts/aix/disk_resolver.cc
 msgid ""
@@ -401,6 +415,16 @@ msgstr ""
 msgid "reading \"{1}\" for dhclient lease information."
 msgstr ""
 
+#. debug
+#: lib/src/facts/bsd/networking_resolver.cc
+msgid "searching \"{1}\" for systemd-networkd DHCP lease files"
+msgstr ""
+
+#. debug
+#: lib/src/facts/bsd/networking_resolver.cc
+msgid "searching \"{1}\" for systemd-networkd DHCP lease information"
+msgstr ""
+
 #. debug
 #: lib/src/facts/cache.cc
 msgid "Deleting unused cache file {1}"
@@ -1020,6 +1044,13 @@ msgstr ""
 msgid "%02x:%02x:%02x:%02x:%02x:%02x"
 msgstr ""
 
+#: lib/src/facts/resolvers/networking_resolver.cc
+#, c-format
+msgid ""
+"%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:"
+"%02x:%02x:%02x:%02x:%02x"
+msgstr ""
+
 #. error
 #: lib/src/facts/resolvers/ruby_resolver.cc
 msgid "error while resolving ruby {1} fact: {2}"

data/ext/facter/leatherman/CHANGELOG.md

@@ -69,6 +69,15 @@ This is a pre-release version for Leatherman 1.0.0, containing backwards-incompa
 ### Changed
 - Remove Ruby bindings for Fixnum and Bignum, replace with Integer for Ruby 2.4 support (LTH-124)
 
+## [0.12.3]
+
+This is a maintenance release to re-sync the code version with the tag, in order to make our internal automation happy
+
+## [0.12.2]
+
+### Added
+- Leatherman can now be built with DEP on Windows
+
 ## [0.12.1]
 
 ### Fixed