Merge remote-tracking branch 'origin/development' into development

Author: ras0219-msft

CONTRIBUTORS.txt

@@ -0,0 +1,8 @@
+Contributors should submit an update to this file with a commit in order to receive recognition. Thank you for your contributions. 
+
+
+List of Contributors
+====================
+
+Microsoft Corporation
+Brian Wengert (bwengert79)

Release/src/http/listener/http_listener.cpp

@@ -39,6 +39,14 @@ static void check_listener_uri(const http::uri &address)
 {
     // Somethings like proper URI schema are verified by the URI class.
     // We only need to check certain things specific to HTTP.
+
+#ifdef _MS_WINDOWS	
+    //HTTP Server API includes SSL support 
+    if(address.scheme() != U("http") && address.scheme() != U("https"))
+    {
+        throw std::invalid_argument("URI scheme must be 'http' or 'https'");
+    }
+#else
     if(address.scheme() == U("https"))
     {
         throw std::invalid_argument("Listeners using 'https' are not yet supported");
@@ -48,6 +56,7 @@ static void check_listener_uri(const http::uri &address)
     {
         throw std::invalid_argument("URI scheme must be 'http'");
     }
+#endif
 
     if(address.host().empty())
     {

Release/tests/Functional/http/listener/http_listener_tests.h

@@ -22,7 +22,9 @@ namespace tests { namespace functional { namespace http { namespace listener {
 class uri_address
 {
 public:
-    uri_address() : m_uri(U("http://localhost:34567/"))
+    uri_address() : 
+        m_uri(U("http://localhost:34567/")),
+        m_secure_uri(U("https://localhost:8443/"))
     {
         if (!s_dummy_listener)
             s_dummy_listener = std::make_shared<web::http::experimental::listener::http_listener>(U("http://localhost:30000/"));
@@ -33,6 +35,7 @@ class uri_address
 
     static std::shared_ptr<web::http::experimental::listener::http_listener> s_dummy_listener;
     web::http::uri m_uri;
+    web::http::uri m_secure_uri;
 };
 
 }}}}

Release/tests/Functional/http/listener/requests_tests.cpp

@@ -254,6 +254,31 @@ TEST_FIXTURE(uri_address, uri_encoding)
 
     listener.close().wait();
 }
+
+TEST_FIXTURE(uri_address, https_listener, "Ignore", "Manual")
+{
+    // Requires a certificate for execution. 
+    // Here are instructions for creating a self signed cert. Full instructions can be located here:
+    // http://blogs.msdn.com/b/haoxu/archive/2009/04/30/one-time-set-up-for-wwsapi-security-examples.aspx
+    // From an elevated admin prompt:
+    // 1. MakeCert.exe -ss Root -sr LocalMachine -n "CN=Fake-Test-CA" -cy authority -r -sk "CAKeyContainer"
+    // 2. MakeCert.exe -ss My -sr LocalMachine -n "CN=localhost" -sky exchange -is Root -ir LocalMachine -in Fake-Test-CA -sk "ServerKeyContainer"
+    // 3. Find corresponding SHA-1 hash with CertUtil.exe -store My localhost
+    // 4. Netsh.exe http add sslcert ipport=0.0.0.0:8443 appid={00112233-4455-6677-8899-AABBCCDDEEFF} certhash=<40CharacterThumbprintWithNoSpaces>
+
+    http_listener listener(m_secure_uri);
+    listener.open().wait();
+    client::http_client client(m_secure_uri);
+
+    listener.support([&](http_request request)
+    {
+        request.reply(status_codes::OK);
+    });
+
+    http_asserts::assert_response_equals(client.request(methods::GET, U("")).get(), status_codes::OK);
+
+    listener.close().wait();
+}
 }
 
 }}}}