Merge pull request microsoft#415 from HEPTACOM/master

Handled uncaught exception when request contains bad encoded URI

Author: ras0219-msft

Release/src/http/listener/http_server_asio.cpp

@@ -900,7 +900,19 @@ void asio_server_connection::async_read_until_buffersize(size_t size, const Read
 will_deref_and_erase_t asio_server_connection::dispatch_request_to_listener()
 {
     // locate the listener:
-    http_listener_impl* pListener = m_p_parent->find_listener(m_request.relative_uri());
+    http_listener_impl* pListener = nullptr;
+
+    try
+    {
+        pListener = m_p_parent->find_listener(m_request.relative_uri());
+    }
+    catch (const web::uri_exception&)
+    {
+        m_request.reply(status_codes::BadRequest);
+        (will_erase_from_parent_t)do_response();
+        (will_deref_t)deref();
+        return will_deref_and_erase_t{};
+    }
 
     if (pListener == nullptr)
     {

Release/tests/functional/http/listener/request_relative_uri_tests.cpp

@@ -115,6 +115,27 @@ TEST(listener_uri_empty_path)
     listener.close().wait();
 }
 
+TEST(listener_invalid_encoded_uri)
+{
+    uri address(U("http://localhost:45678"));
+    http_listener listener(address);
+    listener.open().wait();
+    test_http_client::scoped_client client(address);
+    test_http_client * p_client = client.client();
+
+    listener.support([](http_request request)
+    {
+        request.reply(status_codes::OK);
+    });
+    VERIFY_ARE_EQUAL(0, p_client->request(methods::GET, U("/%invalid/uri")));
+    p_client->next_response().then([](test_response *p_response)
+    {
+        http_asserts::assert_test_response_equals(p_response, status_codes::BadRequest);
+    }).wait();
+
+    listener.close().wait();
+}
+
 }
 
 }}}}