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

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

@@ -6,7 +6,7 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: FACTER 3.9.6\n"
+"Project-Id-Version: FACTER 3.11.0\n"
 "Report-Msgid-Bugs-To: docs@puppet.com\n"
 "POT-Creation-Date: \n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
@@ -275,20 +275,6 @@ 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 ""
@@ -642,7 +628,7 @@ msgstr ""
 msgid "kenv lookup for {1}"
 msgstr ""
 
-#. warning
+#. info
 #: lib/src/facts/freebsd/dmi_resolver.cc
 msgid "kenv lookup for {1} failed: {2} ({3})"
 msgstr ""
@@ -1034,13 +1020,6 @@ 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

@@ -2,6 +2,22 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.4.0]
+
+### Changed
+- Updated Catch library to 1.10.0.
+- Updated Boost.Nowide to ec9672b
+- Update Travis CI to use container-based builds
+
+### Fixed
+- Builds with Xcode 9
+- Allow Leatherman.execute calls to opt into allowing tasks to finish without reading stdin (i.e. don't fail when the pipe is closed) via the `allow_stdin_unread` option. This specifically supports pxp-agent's task execution where input may or may not be used. (LTH-149)
+
+## [1.3.0]
+
+### Added
+- A toPrettyJson routine to Leatherman.json\_container that pretty prints a valid JSON object.
+
 ## [1.2.2]
 
 ### Fixed
@@ -53,15 +69,6 @@ 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

data/ext/facter/leatherman/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.2.2)
-project(leatherman VERSION 1.2.3)
+project(leatherman VERSION 1.4.0)
 
 if (WIN32)
     link_libraries("-Wl,--nxcompat -Wl,--dynamicbase")
@@ -29,7 +29,6 @@ defoption(LEATHERMAN_DEBUG "Enable verbose logging messages from leatherman macr
 defoption(LEATHERMAN_ENABLE_TESTING "Build the leatherman test binary" ${LEATHERMAN_DEFAULT_ENABLE})
 defoption(LEATHERMAN_INSTALL "Install the leatherman libraries and headers" ${LEATHERMAN_DEFAULT_ENABLE})
 defoption(LEATHERMAN_SHARED "Create shared libraries instead of static" FALSE)
-defoption(LEATHERMAN_USE_ICU "Set when Boost is built with ICU" FALSE)
 
 set(BUILDING_LEATHERMAN TRUE)
 

data/ext/facter/leatherman/appveyor.yml

@@ -1,29 +1,36 @@
 clone_depth: 10
-install:
-  - choco install -y mingw-w64 -Version 5.2.0 -source https://www.myget.org/F/puppetlabs
-  - choco install -y cmake -Version 3.2.2 -source https://www.myget.org/F/puppetlabs
-  - choco install -y gettext -Version 0.19.6 -source https://www.myget.org/F/puppetlabs
-  - choco install -y pl-toolchain-x64 -Version 2015.12.01.1 -source https://www.myget.org/F/puppetlabs
-  - choco install -y pl-boost-x64 -Version 1.58.0.2 -source https://www.myget.org/F/puppetlabs
-  - choco install -y pl-openssl-x64 -Version 1.0.24.1 -source https://www.myget.org/F/puppetlabs
-  - choco install -y pl-curl-x64 -Version 7.46.0.1 -source https://www.myget.org/F/puppetlabs
+environment:
+  matrix:
+  - shared: OFF
+  - shared: ON
+
+init:
+  - |
+      choco install -y mingw-w64 -Version 5.2.0 -source https://www.myget.org/F/puppetlabs
+      choco install -y cmake -Version 3.2.2 -source https://www.myget.org/F/puppetlabs
+      choco install -y gettext -Version 0.19.6 -source https://www.myget.org/F/puppetlabs
+      choco install -y pl-toolchain-x64 -Version 2015.12.01.1 -source https://www.myget.org/F/puppetlabs
+      choco install -y pl-boost-x64 -Version 1.58.0.2 -source https://www.myget.org/F/puppetlabs
+      choco install -y pl-openssl-x64 -Version 1.0.24.1 -source https://www.myget.org/F/puppetlabs
+      choco install -y pl-curl-x64 -Version 7.46.0.1 -source https://www.myget.org/F/puppetlabs
+
+  - ps: |
+      $env:PATH = $env:PATH.Replace("Git\bin", "Git\cmd")
+      $env:PATH = $env:PATH.Replace("Git\usr\bin", "Git\cmd")
 
+install:
   - SET PATH=C:\Ruby21-x64\bin;C:\tools\mingw64\bin;C:\Program Files\gettext-iconv;%PATH%
-  - ps: $env:PATH = $env:PATH.Replace("Git\bin", "Git\cmd")
-  - ps: $env:PATH = $env:PATH.Replace("Git\usr\bin", "Git\cmd")
 
 build_script:
-  - ps: cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE="C:\tools\pl-build-tools\pl-build-toolchain.cmake" -DCMAKE_INSTALL_PREFIX=C:\tools\leatherman -DBOOST_STATIC=ON -DLEATHERMAN_SHARED="$env:shared" .
-  - ps: mingw32-make install
-  - ps: 7z.exe a -t7z leatherman.7z C:\tools\leatherman\
+  - ps: |
+      cmake -G "MinGW Makefiles" -DCMAKE_TOOLCHAIN_FILE="C:\tools\pl-build-tools\pl-build-toolchain.cmake" -DCMAKE_INSTALL_PREFIX=C:\tools\leatherman -DBOOST_STATIC=ON -DLEATHERMAN_SHARED="$env:shared" .
+      mingw32-make -j2
 
 test_script:
-  - ps: ctest -V 2>&1 | %{ if ($_ -is [System.Management.Automation.ErrorRecord]) { $_ | c++filt } else { $_ } }
-
-environment:
-  matrix:
-  - shared: OFF
-  - shared: ON
+  - ps: |
+      ctest -V 2>&1 | %{ if ($_ -is [System.Management.Automation.ErrorRecord]) { $_ | c++filt } else { $_ } }
+      mingw32-make install
+      7z.exe a -t7z leatherman.7z C:\tools\leatherman\
 
 artifacts:
   - path: leatherman.7z

data/ext/facter/leatherman/catch/CMakeLists.txt

@@ -1 +1 @@
-add_leatherman_vendored("catch-1.4.0.zip" "catch" "include")
+add_leatherman_vendored("Catch-1.10.0.zip" "Catch-1.10.0" "single_include")

data/ext/facter/leatherman/curl/tests/client_test.cc

@@ -15,6 +15,7 @@
 using namespace std;
 namespace fs = boost::filesystem;
 namespace nw = boost::nowide;
+using namespace leatherman::curl;
 
 #define REQUIRE_THROWS_AS_WITH(expression, exception_type, msg_matcher) {\
     try {\
@@ -47,354 +48,352 @@ void remove_temp_file() {
     fs::remove(temp_path);
 }
 
-namespace leatherman { namespace curl {
+struct mock_client : client {
+    curl_handle const& get_handle() { return client::get_handle(); }
+};
 
-    struct mock_client : client {
-        curl_handle const& get_handle() { return client::get_handle(); }
-    };
+TEST_CASE("curl::client HTTP methods") {
+    mock_client test_client;
+    request test_request {"http://valid.com/"};
 
-    TEST_CASE("curl::client HTTP methods") {
-        mock_client test_client;
-        request test_request {"http://valid.com/"};
+    SECTION("GET succeeds on a given URL") {
+        auto resp = test_client.get(test_request);
+        REQUIRE(resp.status_code() == 200);
+    }
+
+    SECTION("POST succeeds on a given URL") {
+        auto resp = test_client.post(test_request);
+        REQUIRE(resp.status_code() == 200);
+    }
+
+    SECTION("PUT succeeds on a given URL") {
+        auto resp = test_client.put(test_request);
+        REQUIRE(resp.status_code() == 200);
+    }
+
+    SECTION("Request returns status code 404 on invalid URL") {
+        request invalid_test_request {"http://invalid.com/"};
+        auto resp = test_client.get(invalid_test_request);
+        REQUIRE(resp.status_code() == 404);
+    }
+}
 
-        SECTION("GET succeeds on a given URL") {
-            auto resp = test_client.get(test_request);
-            REQUIRE(resp.status_code() == 200);
-        }
+TEST_CASE("curl::client HTTP request setup") {
+    mock_client test_client;
+    request test_request {"http://valid.com"};
 
-        SECTION("POST succeeds on a given URL") {
-            auto resp = test_client.post(test_request);
-            REQUIRE(resp.status_code() == 200);
-        }
+    SECTION("HTTP method is set to GET given a GET request") {
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->method == curl_impl::http_method::get);
+    }
 
-        SECTION("PUT succeeds on a given URL") {
-            auto resp = test_client.put(test_request);
-            REQUIRE(resp.status_code() == 200);
-        }
+    SECTION("HTTP method is set to POST given a POST request") {
+        auto resp = test_client.post(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->method == curl_impl::http_method::post);
+    }
 
-        SECTION("Request returns status code 404 on invalid URL") {
-            request invalid_test_request {"http://invalid.com/"};
-            auto resp = test_client.get(invalid_test_request);
-            REQUIRE(resp.status_code() == 404);
-        }
+    SECTION("HTTP method is set to PUT given a PUT request") {
+        auto resp = test_client.put(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->method == curl_impl::http_method::put);
     }
 
-    TEST_CASE("curl::client HTTP request setup") {
-        mock_client test_client;
+    SECTION("cURL should receive the URL specified in the request") {
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->request_url == "http://valid.com");
+    }
+}
+
+TEST_CASE("curl::client header and body writing and reading") {
+    mock_client test_client;
+
+    /*
+     * Header writing and reading tests
+     */
+    SECTION("Custom request headers should be honored in the request to the server") {
         request test_request {"http://valid.com"};
+        test_request.add_header("header_name", "header_value");
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->header);
+        REQUIRE(test_impl->header->data == string("header_name: header_value"));
+    }
 
-        SECTION("HTTP method is set to GET given a GET request") {
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->method == curl_impl::http_method::get);
-        }
-
-        SECTION("HTTP method is set to POST given a POST request") {
-            auto resp = test_client.post(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->method == curl_impl::http_method::post);
-        }
-
-        SECTION("HTTP method is set to PUT given a PUT request") {
-            auto resp = test_client.put(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->method == curl_impl::http_method::put);
-        }
-
-        SECTION("cURL should receive the URL specified in the request") {
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->request_url == "http://valid.com");
-        }
-    }
-
-    TEST_CASE("curl::client header and body writing and reading") {
-        mock_client test_client;
+    SECTION("The header response delimiter should be ignored") {
+        request test_request {"http://response-delimiter.com/"};
+        auto resp = test_client.get(test_request);
+        int headers = 0;
+        resp.each_header([&](string const& name, string const& value) {
+            ++headers;
+            return true;
+        });
+        REQUIRE(headers == 0);
+    }
 
-        /*
-         * Header writing and reading tests
-         */
-        SECTION("Custom request headers should be honored in the request to the server") {
-            request test_request {"http://valid.com"};
-            test_request.add_header("header_name", "header_value");
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->header);
-            REQUIRE(test_impl->header->data == string("header_name: header_value"));
-        }
-
-        SECTION("The header response delimiter should be ignored") {
-            request test_request {"http://response-delimiter.com/"};
-            auto resp = test_client.get(test_request);
-            int headers = 0;
-            resp.each_header([&](string const& name, string const& value) {
-                ++headers;
-                return true;
-            });
-            REQUIRE(headers == 0);
-        }
-
-        SECTION("Non-standard response header should be parsed for name and value") {
-            request test_request {"http://nonstd-header.com/"};
-            auto resp = test_client.get(test_request);
-            REQUIRE(resp.header("nonstd_header_name"));
-            REQUIRE(*(resp.header("nonstd_header_name")) == "nonstd_header_value");
-        }
-
-        SECTION("Invalid headers should not be parsed or returned in the response") {
-            request test_request {"http://invalid-header.com/"};
-            auto resp = test_client.get(test_request);
-            int headers = 0;
-            resp.each_header([&](string const& name, string const& value) {
-                ++headers;
-                return true;
-            });
-            REQUIRE(headers == 0);
-        }
-
-        /*
-         * Body writing and reading tests
-         */
-        SECTION("Request body should be settable and readable") {
-            request test_request {"http://valid.com"};
-            test_request.body("Hello, I am a request body!", "message");
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->read_buffer == "Hello, I am a request body!");
-        }
-
-        SECTION("Response body should be what is in the data part of the cURL response") {
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            test_impl->resp_body = "Hello, I am a response body!";
-            request test_request {"http://valid.com"};
-            auto resp = test_client.get(test_request);
-            REQUIRE(resp.body() == "Hello, I am a response body!");
-        }
-    }
-
-    TEST_CASE("curl::client cookies") {
-        mock_client test_client;
+    SECTION("Non-standard response header should be parsed for name and value") {
+        request test_request {"http://nonstd-header.com/"};
+        auto resp = test_client.get(test_request);
+        REQUIRE(resp.header("nonstd_header_name"));
+        REQUIRE(*(resp.header("nonstd_header_name")) == "nonstd_header_value");
+    }
+
+    SECTION("Invalid headers should not be parsed or returned in the response") {
+        request test_request {"http://invalid-header.com/"};
+        auto resp = test_client.get(test_request);
+        int headers = 0;
+        resp.each_header([&](string const& name, string const& value) {
+            ++headers;
+            return true;
+        });
+        REQUIRE(headers == 0);
+    }
+
+    /*
+     * Body writing and reading tests
+     */
+    SECTION("Request body should be settable and readable") {
         request test_request {"http://valid.com"};
+        test_request.body("Hello, I am a request body!", "message");
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->read_buffer == "Hello, I am a request body!");
+    }
 
-        SECTION("There should be no cookies in the request by default") {
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->cookie == "");
-        }
-
-        SECTION("Cookies should be present in the request when added") {
-            test_request.add_cookie("cookie_name", "cookie_val");
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->cookie == "cookie_name=cookie_val");
-        }
-
-        SECTION("Cookies should be removable from the request") {
-            test_request.add_cookie("cookie_0", "cookie_val_0");
-            test_request.add_cookie("cookie_1", "cookie_val_1");
-            test_request.remove_cookie("cookie_1");
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->cookie == "cookie_0=cookie_val_0");
-        }
-
-        SECTION("cURL should receieve cookies specified in the request") {
-            test_request.add_cookie("cookie_0", "cookie_val_0");
-            test_request.add_cookie("cookie_1", "cookie_val_1");
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->cookie == "cookie_0=cookie_val_0; cookie_1=cookie_val_1");
-        }
-    }
-
-    TEST_CASE("curl::client CA bundle and SSL setup") {
-        mock_client test_client;
+    SECTION("Response body should be what is in the data part of the cURL response") {
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        test_impl->resp_body = "Hello, I am a response body!";
         request test_request {"http://valid.com"};
+        auto resp = test_client.get(test_request);
+        REQUIRE(resp.body() == "Hello, I am a response body!");
+    }
+}
 
-        SECTION("Path to CA certificate should be unspecified by default") {
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->cacert == "");
-        }
-
-        SECTION("cURL should receive the path to the CA certificate specified in the request") {
-            test_client.set_ca_cert("cacert");
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->cacert == "cacert");
-        }
-
-        SECTION("Client cert name should be unspecified by default") {
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->client_cert == "");
-        }
-
-        SECTION("cURL should receive the client cert name specified in the request") {
-            test_client.set_client_cert("cert", "key");
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->client_cert == "cert");
-        }
-
-        SECTION("Private keyfile name should be unspecified by default") {
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->client_key == "");
-        }
-
-        SECTION("cURL should receive the private keyfile name specified in the request") {
-            test_client.set_client_cert("cert", "key");
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->client_key == "key");
-        }
-
-        SECTION("cURL should make an HTTP request with the specified HTTP protocol") {
-            test_client.set_supported_protocols(CURLPROTO_HTTP);
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->protocols == CURLPROTO_HTTP);
-        }
-
-        SECTION("cURL defaults to all protocols if no protocols are specified") {
-            auto resp = test_client.get(test_request);
-            CURL* const& handle = test_client.get_handle();
-            auto test_impl = reinterpret_cast<curl_impl* const>(handle);
-            REQUIRE(test_impl->protocols == CURLPROTO_ALL);
-        }
-    }
-
-    TEST_CASE("curl::client errors") {
-        mock_client test_client;
-        request test_request {"http://valid.com/"};
+TEST_CASE("curl::client cookies") {
+    mock_client test_client;
+    request test_request {"http://valid.com"};
+
+    SECTION("There should be no cookies in the request by default") {
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->cookie == "");
+    }
+
+    SECTION("Cookies should be present in the request when added") {
+        test_request.add_cookie("cookie_name", "cookie_val");
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->cookie == "cookie_name=cookie_val");
+    }
+
+    SECTION("Cookies should be removable from the request") {
+        test_request.add_cookie("cookie_0", "cookie_val_0");
+        test_request.add_cookie("cookie_1", "cookie_val_1");
+        test_request.remove_cookie("cookie_1");
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->cookie == "cookie_0=cookie_val_0");
+    }
+
+    SECTION("cURL should receieve cookies specified in the request") {
+        test_request.add_cookie("cookie_0", "cookie_val_0");
+        test_request.add_cookie("cookie_1", "cookie_val_1");
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->cookie == "cookie_0=cookie_val_0; cookie_1=cookie_val_1");
+    }
+}
+
+TEST_CASE("curl::client CA bundle and SSL setup") {
+    mock_client test_client;
+    request test_request {"http://valid.com"};
+
+    SECTION("Path to CA certificate should be unspecified by default") {
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->cacert == "");
+    }
+
+    SECTION("cURL should receive the path to the CA certificate specified in the request") {
+        test_client.set_ca_cert("cacert");
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->cacert == "cacert");
+    }
+
+    SECTION("Client cert name should be unspecified by default") {
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->client_cert == "");
+    }
+
+    SECTION("cURL should receive the client cert name specified in the request") {
+        test_client.set_client_cert("cert", "key");
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->client_cert == "cert");
+    }
+
+    SECTION("Private keyfile name should be unspecified by default") {
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->client_key == "");
+    }
+
+    SECTION("cURL should receive the private keyfile name specified in the request") {
+        test_client.set_client_cert("cert", "key");
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->client_key == "key");
+    }
+
+    SECTION("cURL should make an HTTP request with the specified HTTP protocol") {
+        test_client.set_supported_protocols(CURLPROTO_HTTP);
+        auto resp = test_client.get(test_request);
+        CURL* const& handle = test_client.get_handle();
+        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->protocols == CURLPROTO_HTTP);
+    }
+
+    SECTION("cURL defaults to all protocols if no protocols are specified") {
+        auto resp = test_client.get(test_request);
         CURL* const& handle = test_client.get_handle();
         auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+        REQUIRE(test_impl->protocols == CURLPROTO_ALL);
+    }
+}
+
+TEST_CASE("curl::client errors") {
+    mock_client test_client;
+    request test_request {"http://valid.com/"};
+    CURL* const& handle = test_client.get_handle();
+    auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+
+    /*
+     * Note: we do not currently test the case where cURL errors
+     * on curl_global_init, as the global init is done as part of
+     * static initialization in the cURL helper, and there is
+     * currently no way to force it to be reinitialized.
+     */
+
+    SECTION("client fails to initialize a libcurl easy session") {
+        curl_fail_init mock_error {easy_init_error};
+        REQUIRE_THROWS_AS(mock_client(), http_exception);
+    }
+
+    SECTION("client fails to perform a cURL request") {
+        test_impl->test_failure_mode = curl_impl::error_mode::easy_perform_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_request_exception);
+    }
+
+    SECTION("client fails to set HTTP method to POST") {
+        test_impl->test_failure_mode = curl_impl::error_mode::http_post_error;
+        REQUIRE_THROWS_AS(test_client.post(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set HTTP method to PUT") {
+        test_impl->test_failure_mode = curl_impl::error_mode::http_put_error;
+        REQUIRE_THROWS_AS(test_client.put(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set the request URL") {
+        test_impl->test_failure_mode = curl_impl::error_mode::set_url_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set the request headers") {
+        test_impl->test_failure_mode = curl_impl::error_mode::set_header_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set cookies in the request") {
+        test_impl->test_failure_mode = curl_impl::error_mode::set_cookie_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set the header callback function") {
+        test_impl->test_failure_mode = curl_impl::error_mode::header_function_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
 
-        /*
-         * Note: we do not currently test the case where cURL errors
-         * on curl_global_init, as the global init is done as part of
-         * static initialization in the cURL helper, and there is
-         * currently no way to force it to be reinitialized.
-         */
-
-        SECTION("client fails to initialize a libcurl easy session") {
-            curl_fail_init mock_error {easy_init_error};
-            REQUIRE_THROWS_AS(mock_client test_client, http_exception);
-        }
-
-        SECTION("client fails to perform a cURL request") {
-            test_impl->test_failure_mode = curl_impl::error_mode::easy_perform_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_request_exception);
-        }
-
-        SECTION("client fails to set HTTP method to POST") {
-            test_impl->test_failure_mode = curl_impl::error_mode::http_post_error;
-            REQUIRE_THROWS_AS(test_client.post(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set HTTP method to PUT") {
-            test_impl->test_failure_mode = curl_impl::error_mode::http_put_error;
-            REQUIRE_THROWS_AS(test_client.put(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set the request URL") {
-            test_impl->test_failure_mode = curl_impl::error_mode::set_url_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set the request headers") {
-            test_impl->test_failure_mode = curl_impl::error_mode::set_header_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set cookies in the request") {
-            test_impl->test_failure_mode = curl_impl::error_mode::set_cookie_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set the header callback function") {
-            test_impl->test_failure_mode = curl_impl::error_mode::header_function_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set the header write location") {
-            test_impl->test_failure_mode = curl_impl::error_mode::header_context_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set the body writing callback function") {
-            test_impl->test_failure_mode = curl_impl::error_mode::write_body_function_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set the body write location") {
-            test_impl->test_failure_mode = curl_impl::error_mode::write_body_context_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-        SECTION("client fails to set the read_body callback function") {
-            test_impl->test_failure_mode = curl_impl::error_mode::read_body_function_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set the read_body data source") {
-            test_impl->test_failure_mode = curl_impl::error_mode::read_body_context_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set the connection timeout") {
-            test_impl->test_failure_mode = curl_impl::error_mode::connect_timeout_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set the request timeout") {
-            test_impl->test_failure_mode = curl_impl::error_mode::request_timeout_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set certificate authority info") {
-            test_client.set_ca_cert("certfile");
-            test_impl->test_failure_mode = curl_impl::error_mode::ca_bundle_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set SSL cert info") {
-            test_client.set_client_cert("cert", "key");
-            test_impl->test_failure_mode = curl_impl::error_mode::ssl_cert_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to set SSL key info") {
-            test_client.set_client_cert("cert", "key");
-            test_impl->test_failure_mode = curl_impl::error_mode::ssl_key_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
-
-        SECTION("client fails to make http call with https protocol only enabled") {
-            test_client.set_supported_protocols(CURLPROTO_HTTPS);
-            test_impl->test_failure_mode = curl_impl::error_mode::protocol_error;
-            REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
-        }
+    SECTION("client fails to set the header write location") {
+        test_impl->test_failure_mode = curl_impl::error_mode::header_context_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
     }
 
+    SECTION("client fails to set the body writing callback function") {
+        test_impl->test_failure_mode = curl_impl::error_mode::write_body_function_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set the body write location") {
+        test_impl->test_failure_mode = curl_impl::error_mode::write_body_context_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+    SECTION("client fails to set the read_body callback function") {
+        test_impl->test_failure_mode = curl_impl::error_mode::read_body_function_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set the read_body data source") {
+        test_impl->test_failure_mode = curl_impl::error_mode::read_body_context_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set the connection timeout") {
+        test_impl->test_failure_mode = curl_impl::error_mode::connect_timeout_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set the request timeout") {
+        test_impl->test_failure_mode = curl_impl::error_mode::request_timeout_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set certificate authority info") {
+        test_client.set_ca_cert("certfile");
+        test_impl->test_failure_mode = curl_impl::error_mode::ca_bundle_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set SSL cert info") {
+        test_client.set_client_cert("cert", "key");
+        test_impl->test_failure_mode = curl_impl::error_mode::ssl_cert_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to set SSL key info") {
+        test_client.set_client_cert("cert", "key");
+        test_impl->test_failure_mode = curl_impl::error_mode::ssl_key_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+
+    SECTION("client fails to make http call with https protocol only enabled") {
+        test_client.set_supported_protocols(CURLPROTO_HTTPS);
+        test_impl->test_failure_mode = curl_impl::error_mode::protocol_error;
+        REQUIRE_THROWS_AS(test_client.get(test_request), http_curl_setup_exception);
+    }
+}
+
     TEST_CASE("curl::client download_file") {
         mock_client test_client;
         temp_directory temp_dir;
@@ -542,74 +541,73 @@ namespace leatherman { namespace curl {
       }
     }
 
-    TEST_CASE("curl::client download_file errors") {
-        mock_client test_client;
-        temp_directory temp_dir;
-        fs::path temp_dir_path = fs::path(temp_dir.get_dir_name()); 
-        CURL* const& handle = test_client.get_handle();
-        auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+TEST_CASE("curl::client download_file errors") {
+    mock_client test_client;
+    temp_directory temp_dir;
+    fs::path temp_dir_path = fs::path(temp_dir.get_dir_name()); 
+    CURL* const& handle = test_client.get_handle();
+    auto test_impl = reinterpret_cast<curl_impl* const>(handle);
+
+    SECTION("when fopen fails, an http_file_operation_exception is thrown") {
+        fs::path parent_dir = temp_dir_path / "parent";
+        std::string file_path = (parent_dir / "child").string();
+        request req("");
+        REQUIRE_THROWS_AS_WITH(
+            test_client.download_file(req, file_path),
+            http_file_operation_exception,
+            Catch::Equals("File operation error: failed to open temporary file for writing"));
+    }
+
+    SECTION("when curl_easy_setopt fails, an http_curl_setup_exception is thrown and the temporary file is removed") {
+        request req("");
+        std::string file_path = (temp_dir_path / "file").string();
+        test_impl->test_failure_mode = curl_impl::error_mode::set_url_error;
+        REQUIRE_THROWS_AS(test_client.download_file(req, file_path), http_curl_setup_exception);
+        // Ensure that the temp file was removed
+        REQUIRE(fs::is_empty(temp_dir_path));
+    }
+
+    SECTION("when curl_easy_perform fails due to a CURLE_WRITE_ERROR, but the temporary file is removed, an http_file_operation_exception is thrown") {
+        std::string file_path = (temp_dir_path / "file").string();
+        request req("");
+        test_impl->test_failure_mode = curl_impl::error_mode::easy_perform_write_error; 
+        REQUIRE_THROWS_AS_WITH(
+            test_client.download_file(req, file_path),
+            http_file_operation_exception,
+            Catch::StartsWith("File operation error: failed to write to the temporary file during download"));
+    }
+
+    SECTION("when curl_easy_perform fails for reasons other than a CURLE_WRITE_ERROR, but the temporary file is removed, only the errbuf message is contained in the thrown http_file_download_exception") {
+        std::string file_path = (temp_dir_path / "file").string();
+        request req("");
+        test_impl->test_failure_mode = curl_impl::error_mode::easy_perform_error; 
+        REQUIRE_THROWS_AS_WITH(
+            test_client.download_file(req, file_path),
+            http_file_download_exception,
+            Catch::Equals("File download server side error: easy perform failed"));
+
+        // Ensure that the temp file was removed
+        REQUIRE(fs::is_empty(temp_dir_path));
+    }
 
-        SECTION("when fopen fails, an http_file_operation_exception is thrown") {
-          fs::path parent_dir = temp_dir_path / "parent";
-          std::string file_path = (parent_dir / "child").string();
-          curl::request req("");
-          REQUIRE_THROWS_AS_WITH(
-              test_client.download_file(req, file_path),
-              curl::http_file_operation_exception,
-              Catch::Equals("File operation error: failed to open temporary file for writing"));
-        }
-
-        SECTION("when curl_easy_setopt fails, an http_curl_setup_exception is thrown and the temporary file is removed") {
-          curl::request req("");
-          std::string file_path = (temp_dir_path / "file").string();
-          test_impl->test_failure_mode = curl_impl::error_mode::set_url_error;
-          REQUIRE_THROWS_AS(test_client.download_file(req, file_path), curl::http_curl_setup_exception);
-          // Ensure that the temp file was removed
-          REQUIRE(fs::is_empty(temp_dir_path));
-        }
-
-        SECTION("when curl_easy_perform fails due to a CURLE_WRITE_ERROR, but the temporary file is removed, an http_file_operation_exception is thrown") {
-          std::string file_path = (temp_dir_path / "file").string();
-          curl::request req("");
-          test_impl->test_failure_mode = curl_impl::error_mode::easy_perform_write_error; 
-          REQUIRE_THROWS_AS_WITH(
-              test_client.download_file(req, file_path),
-              curl::http_file_operation_exception,
-              Catch::StartsWith("File operation error: failed to write to the temporary file during download"));
-        }
-
-        SECTION("when curl_easy_perform fails for reasons other than a CURLE_WRITE_ERROR, but the temporary file is removed, only the errbuf message is contained in the thrown http_file_download_exception") {
-          std::string file_path = (temp_dir_path / "file").string();
-          curl::request req("");
-          test_impl->test_failure_mode = curl_impl::error_mode::easy_perform_error; 
-          REQUIRE_THROWS_AS_WITH(
-              test_client.download_file(req, file_path),
-              curl::http_file_download_exception,
-              Catch::Equals("File download server side error: easy perform failed"));
-
-          // Ensure that the temp file was removed
-          REQUIRE(fs::is_empty(temp_dir_path));
-        }
-
-        SECTION("when renaming the temporary file to the user-provided file path fails, an http_file_operation_exception is thrown") {
-          std::string file_path = (temp_dir_path / "file").string();
-          curl::request req("https://download.com");
-          test_impl->trigger_external_failure = remove_temp_file; 
-          REQUIRE_THROWS_AS_WITH(
-              test_client.download_file(req, file_path),
-              curl::http_file_operation_exception,
-              Catch::StartsWith("File operation error: failed to move over the temporary file's downloaded contents"));
-        }
-
-        SECTION("when writing the temporary file's contents to the response body fails, an http_file_operation_exception is thrown") {
-          std::string file_path = (temp_dir_path / "file").string();
-          request req("https://download_trigger_404.com");
-          test_impl->trigger_external_failure = remove_temp_file;
-          response res;
-          REQUIRE_THROWS_AS_WITH(
-              test_client.download_file(req, file_path, res),
-              curl::http_file_operation_exception,
-              Catch::StartsWith("File operation error: failed to write the temporary file's contents to the response body"));
-        }
-    }
-}}
+    SECTION("when renaming the temporary file to the user-provided file path fails, an http_file_operation_exception is thrown") {
+        std::string file_path = (temp_dir_path / "file").string();
+        request req("https://download.com");
+        test_impl->trigger_external_failure = remove_temp_file; 
+        REQUIRE_THROWS_AS_WITH(
+            test_client.download_file(req, file_path),
+            http_file_operation_exception,
+            Catch::StartsWith("File operation error: failed to move over the temporary file's downloaded contents"));
+    }
+
+    SECTION("when writing the temporary file's contents to the response body fails, an http_file_operation_exception is thrown") {
+        std::string file_path = (temp_dir_path / "file").string();
+        request req("https://download_trigger_404.com");
+        test_impl->trigger_external_failure = remove_temp_file;
+        response res;
+        REQUIRE_THROWS_AS_WITH(
+            test_client.download_file(req, file_path, res),
+            http_file_operation_exception,
+            Catch::StartsWith("File operation error: failed to write the temporary file's contents to the response body"));
+    }
+}