Merge branch 'xqp-feature/get_human_readable_ssl_errors'

Author: ras0219-msft

Release/src/http/client/http_client_winhttp.cpp

@@ -88,6 +88,7 @@
 #include <exception>
 #include <assert.h>
 #include <streambuf>
+#include <atomic>
 #include <mutex>
 #include <array>
 #include <vector>

Release/src/pch/stdafx.h

@@ -646,7 +646,7 @@ TEST_FIXTURE(uri_address, failed_authentication_attempt, "Ignore:Linux", "89", "
 void auth_test_impl(bool fail)
 {
     std::string user("user1"), password("user1");
-    auto return_code = status_codes::NotFound; // return 404 if successful auth
+    auto return_code = status_codes::OK;
 
     if (fail)
     {
@@ -657,7 +657,7 @@ void auth_test_impl(bool fail)
     http_client_config client_config;
     web::credentials cred(U(user), U(password));
     client_config.set_credentials(cred);
-    http_client client(U("http://test.webdav.org/auth-basic/"), client_config);
+    http_client client(U("http://httpbin.org/basic-auth/user1/user1"), client_config);
 
     http_response response = client.request(methods::GET).get();
     VERIFY_ARE_EQUAL(return_code, response.status_code());

Release/tests/functional/http/client/authentication_tests.cpp

@@ -91,7 +91,7 @@ TEST_FIXTURE(uri_address, server_doesnt_exist)
     http_client_config config;
     config.set_timeout(std::chrono::seconds(1));
     http_client client(m_uri, config);
-    VERIFY_THROWS_HTTP_ERROR_CODE(client.request(methods::GET).wait(), std::errc::host_unreachable);
+    VERIFY_THROWS(client.request(methods::GET).wait(), web::http::http_exception);
 }
 
 TEST_FIXTURE(uri_address, open_failure)
@@ -125,7 +125,7 @@ TEST_FIXTURE(uri_address, server_close_without_responding)
     VERIFY_THROWS_HTTP_ERROR_CODE(response.wait(), std::errc::connection_aborted);
 
     // Try sending another request.
-    VERIFY_THROWS_HTTP_ERROR_CODE(client.request(methods::GET).wait(), std::errc::host_unreachable);
+    VERIFY_THROWS(client.request(methods::GET).wait(), web::http::http_exception);
 }
 
 TEST_FIXTURE(uri_address, request_timeout)

Release/tests/functional/http/client/connections_and_errors.cpp

@@ -151,24 +151,25 @@ TEST_FIXTURE(uri_address, no_transfer_encoding_content_length)
 }
 
 // Note additional sites for testing can be found at:
+// https://badssl.com/
 // https://www.ssllabs.com/ssltest/
 // http://www.internetsociety.org/deploy360/resources/dane-test-sites/
 // https://onlinessl.netlock.hu/#
 TEST(server_selfsigned_cert)
 {
     handle_timeout([]
     {
-        http_client client(U("https://www.pcwebshop.co.uk/"));
+        http_client client(U("https://self-signed.badssl.com/"));
         auto requestTask = client.request(methods::GET);
         VERIFY_THROWS(requestTask.get(), http_exception);
     });
 }
 
-TEST(server_hostname_mismatch, "Ignore", "Site fixed certificate. Improve test (new site or alternate method).")
+TEST(server_hostname_mismatch)
 {
     handle_timeout([]
     {
-        http_client client(U("https://swordsoftruth.com/"));
+        http_client client(U("https://wrong.host.badssl.com/"));
         auto requestTask = client.request(methods::GET);
         VERIFY_THROWS(requestTask.get(), http_exception);
     });
@@ -180,7 +181,7 @@ TEST(server_cert_expired)
     {
         http_client_config config;
         config.set_timeout(std::chrono::seconds(1));
-        http_client client(U("https://tv.eurosport.com/"), config);
+        http_client client(U("https://expired.badssl.com/"), config);
         auto requestTask = client.request(methods::GET);
         VERIFY_THROWS(requestTask.get(), http_exception);
     });

Release/tests/functional/http/client/outside_tests.cpp

@@ -202,7 +202,7 @@ class http_asserts
 #define HTTP_ERROR_CHECK_IMPL(__code) VERIFY_ARE_EQUAL(static_cast<int>(__code), _exc.error_code().default_error_condition().value()); 
 #endif
 #else
-#define HTTP_ERROR_CHECK_IMPL(__code) if(__code != _exc.error_code()) { VERIFY_IS_TRUE(false, "Unexpected error code encountered."); }
+#define HTTP_ERROR_CHECK_IMPL(__code) VERIFY_ARE_EQUAL(_exc.error_code(), __code, "Unexpected error code encountered.")
 #endif
 
 
@@ -212,17 +212,20 @@ class http_asserts
         try                                                                             \
         {                                                                               \
             __expression;                                                               \
-            VERIFY_IS_TRUE(false, "Expected http_exception not thrown");                \
+            UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__), "Expected exception: \"web::http::http_exception\" not thrown"); \
         }                                                                               \
         catch (const web::http::http_exception& _exc)                                   \
         {                                                                               \
             VERIFY_IS_TRUE(std::string(_exc.what()).size() > 0);                        \
             HTTP_ERROR_CHECK_IMPL(__code);                                              \
-        }                                                                               \
-        catch(...)                                                                      \
-        {                                                                               \
-            VERIFY_IS_TRUE(false, "Exception other than http_exception thrown");        \
-        }                                                                               \
+        } catch(const std::exception & _exc) { \
+            std::string _msg("(" #__expression ") threw exception: "); \
+            _msg.append(_exc.what()); \
+            UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__), _msg.c_str()); \
+        } catch (...) { \
+            std::string _msg("(" #__expression ") threw exception: <...>"); \
+            UnitTest::CurrentTest::Results()->OnTestFailure(UnitTest::TestDetails(*UnitTest::CurrentTest::Details(), __LINE__), _msg.c_str()); \
+        } \
     UNITTEST_MULTILINE_MACRO_END
 
 }}}}

Release/tests/functional/http/utilities/include/http_asserts.h

@@ -219,17 +219,17 @@ void handshake_error_test_impl(const ::utility::string_t &host)
 
 TEST(self_signed_cert)
 {
-    handshake_error_test_impl(U("wss://www.pcwebshop.co.uk/"));
+    handshake_error_test_impl(U("wss://self-signed.badssl.com/"));
 }
 
 TEST(hostname_mismatch)
 {
-    handshake_error_test_impl(U("wss://jabbr.net"));
+    handshake_error_test_impl(U("wss://wrong.host.badssl.com/"));
 }
 
 TEST(cert_expired)
 {
-    handshake_error_test_impl(U("wss://tv.eurosport.com/"));
+    handshake_error_test_impl(U("wss://expired.badssl.com/"));
 }
 
 #endif