diff --git a/.gitignore b/.gitignore index 99d000d..e91bf78 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,12 @@ example/server example/client example/hello example/simplesvr +example/benchmark +example/*.pem test/test test/test.xcodeproj/xcuser* test/test.xcodeproj/*/xcuser* +test/*.pem *.swp @@ -16,5 +19,8 @@ Release *.sdf *.suo *.opensdf +*.db ipch *.dSYM +.* +!/.travis.yml \ No newline at end of file diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..101b7a0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,12 @@ +# Environment +language: cpp +os: osx + +# Compiler selection +compiler: + - clang + +# Build/test steps +script: + - cd ${TRAVIS_BUILD_DIR}/test + - make all \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..3e5ed35 --- /dev/null +++ b/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2017 yhirose + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/README.md b/README.md index 7210bc3..fa59575 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,18 @@ cpp-httplib =========== -A C++11 header-only HTTP library. +[![Build Status](https://travis-ci.org/yhirose/cpp-httplib.svg?branch=master)](https://travis-ci.org/yhirose/cpp-httplib) +[![Bulid Status](https://ci.appveyor.com/api/projects/status/github/yhirose/cpp-httplib?branch=master&svg=true)](https://ci.appveyor.com/project/yhirose/cpp-httplib) -[The Boost Software License 1.0](http://www.boost.org/LICENSE_1_0.txt) +A C++11 header-only HTTP library. It's extremely easy to setup. Just include **httplib.h** file in your code! +Inspired by [Sinatra](http://www.sinatrarb.com/) and [express](https://github.com/visionmedia/express). + Server Example -------------- -Inspired by [Sinatra](http://www.sinatrarb.com/) and [express](https://github.com/visionmedia/express). - ```c++ #include @@ -21,11 +22,11 @@ int main(void) Server svr; - svr.get("/hi", [](const Request& req, const Response& res) { + svr.Get("/hi", [](const Request& req, Response& res) { res.set_content("Hello World!", "text/plain"); }); - svr.get(R"(/numbers/(\d+))", [&](const Request& req, const Response& res) { + svr.Get(R"(/numbers/(\d+))", [&](const Request& req, Response& res) { auto numbers = req.matches[1]; res.set_content(numbers, "text/plain"); }); @@ -34,9 +35,70 @@ int main(void) } ``` +`Post`, `Put`, `Delete` and `Options` methods are also supported. + +### Bind a socket to multiple interfaces and any available port + +```cpp +int port = svr.bind_to_any_port("0.0.0.0"); +svr.listen_after_bind(); +``` + +### Method Chain + +```cpp +svr.Get("/get", [](const auto& req, auto& res) { + res.set_content("get", "text/plain"); + }) + .Post("/post", [](const auto& req, auto& res) { + res.set_content(req.body(), "text/plain"); + }) + .listen("localhost", 1234); +``` + +### Static File Server + +```cpp +svr.set_base_dir("./www"); +``` + +### Logging + +```cpp +svr.set_logger([](const auto& req, const auto& res) { + your_logger(req, res); +}); +``` + +### Error Handler + +```cpp +svr.set_error_handler([](const auto& req, auto& res) { + const char* fmt = "

Error Status: %d

"; + char buf[BUFSIZ]; + snprintf(buf, sizeof(buf), fmt, res.status); + res.set_content(buf, "text/html"); +}); +``` + +### 'multipart/form-data' POST data + +```cpp +svr.Post("/multipart", [&](const auto& req, auto& res) { + auto size = req.files.size(); + auto ret = req.has_file("name1")); + const auto& file = req.get_file_value("name1"); + // file.filename; + // file.content_type; + auto body = req.body.substr(file.offset, file.length)); +}) +``` + Client Example -------------- +### GET + ```c++ #include #include @@ -45,13 +107,97 @@ int main(void) { httplib::Client cli("localhost", 1234); - auto res = cli.get("/hi"); + auto res = cli.Get("/hi"); if (res && res->status == 200) { std::cout << res->body << std::endl; } } ``` +### POST + +```c++ +res = cli.Post("/post", "text", "text/plain"); +res = cli.Post("/person", "name=john1¬e=coder", "application/x-www-form-urlencoded"); +``` + +### POST with parameters + +```c++ +httplib::Params params; +params.emplace("name", "john"); +params.emplace("note", "coder"); + +auto res = cli.Post("/post", params); +``` + or + +```c++ +httplib::Params params{ + { "name", "john" }, + { "note", "coder" } +}; + +auto res = cli.Post("/post", params); +``` + +### PUT + +```c++ +res = cli.Put("/resource/foo", "text", "text/plain"); +``` + +### DELETE + +```c++ +res = cli.Delete("/resource/foo"); +``` + +### OPTIONS + +```c++ +res = cli.Options("*"); +res = cli.Options("/resource/foo"); +``` + +### Connection Timeout + +```c++ +httplib::Client cli("localhost", 8080, 5); // timeouts in 5 seconds +``` +### With Progress Callback + +```cpp +httplib::Client client(url, port); + +// prints: 0 / 000 bytes => 50% complete +std::shared_ptr res = + cli.Get("/", [](uint64_t len, uint64_t total) { + printf("%lld / %lld bytes => %d%% complete\n", + len, total, + (int)((len/total)*100)); + return true; // return 'false' if you want to cancel the request. + } +); +``` + +![progress](https://user-images.githubusercontent.com/236374/33138910-495c4ecc-cf86-11e7-8693-2fc6d09615c4.gif) + +This feature was contributed by [underscorediscovery](https://github.com/yhirose/cpp-httplib/pull/23). + +### Range + +```cpp +httplib::Client cli("httpbin.org", 80); + +// 'Range: bytes=1-10' +httplib::Headers headers = { httplib::make_range_header(1, 10) }; + +auto res = cli.Get("/range/32", headers); +// res->status should be 206. +// res->body should be "bcdefghijk". +``` + OpenSSL Support --------------- @@ -65,4 +211,26 @@ SSLServer svr("./cert.pem", "./key.pem"); SSLClient cli("localhost", 8080); ``` -Copyright (c) 2017 Yuji Hirose. All rights reserved. +Zlib Support +------------ + +'gzip' compression is available with `CPPHTTPLIB_ZLIB_SUPPORT`. + +The server applies gzip compression to the following MIME type contents: + + * all text types + * image/svg+xml + * application/javascript + * application/json + * application/xml + * application/xhtml+xml + +NOTE +---- + +g++ 4.8 cannot build this library since `` in g++4.8 is [broken](https://stackoverflow.com/questions/12530406/is-gcc-4-8-or-earlier-buggy-about-regular-expressions). + +License +------- + +MIT license (© 2019 Yuji Hirose) diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..0b3bc9e --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,9 @@ +version: 1.0.{build} +image: Visual Studio 2017 +build_script: +- cmd: >- + cd test + + msbuild.exe test.sln /verbosity:minimal /t:Build /p:Configuration=Debug;Platform=Win32 +test_script: +- cmd: Debug\test.exe \ No newline at end of file diff --git a/example/Makefile b/example/Makefile index 750122e..28af76c 100644 --- a/example/Makefile +++ b/example/Makefile @@ -1,21 +1,25 @@ CC = clang++ -CFLAGS = -std=c++14 -I.. -OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto +CFLAGS = -std=c++14 -I.. -Wall -Wextra -lpthread +#OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto +ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz -all: server client hello simplesvr +all: server client hello simplesvr benchmark -server : server.cc ../httplib.h - $(CC) -o server $(CFLAGS) server.cc $(OPENSSL_SUPPORT) +server : server.cc ../httplib.h Makefile + $(CC) -o server $(CFLAGS) server.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) -client : client.cc ../httplib.h - $(CC) -o client $(CFLAGS) client.cc $(OPENSSL_SUPPORT) +client : client.cc ../httplib.h Makefile + $(CC) -o client $(CFLAGS) client.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) -hello : hello.cc ../httplib.h - $(CC) -o hello $(CFLAGS) hello.cc $(OPENSSL_SUPPORT) +hello : hello.cc ../httplib.h Makefile + $(CC) -o hello $(CFLAGS) hello.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) -simplesvr : simplesvr.cc ../httplib.h - $(CC) -o simplesvr $(CFLAGS) simplesvr.cc $(OPENSSL_SUPPORT) +simplesvr : simplesvr.cc ../httplib.h Makefile + $(CC) -o simplesvr $(CFLAGS) simplesvr.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) + +benchmark : benchmark.cc ../httplib.h Makefile + $(CC) -o benchmark $(CFLAGS) benchmark.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) pem: openssl genrsa 2048 > key.pem diff --git a/example/benchmark.cc b/example/benchmark.cc new file mode 100644 index 0000000..d4092f5 --- /dev/null +++ b/example/benchmark.cc @@ -0,0 +1,33 @@ +#include +#include +#include + +using namespace std; + +struct StopWatch { + StopWatch(const string& label) : label_(label) { + start_ = chrono::system_clock::now(); + } + ~StopWatch() { + auto end = chrono::system_clock::now(); + auto diff = end - start_; + auto count = chrono::duration_cast(diff).count(); + cout << label_ << ": " << count << " millisec." << endl; + } + string label_; + chrono::system_clock::time_point start_; +}; + +int main(void) { + string body(1024 * 5, 'a'); + + httplib::Client cli("httpbin.org", 80); + + for (int i = 0; i < 3; i++) { + StopWatch sw(to_string(i).c_str()); + auto res = cli.Post("/post", body, "application/octet-stream"); + assert(res->status == 200); + } + + return 0; +} diff --git a/example/client.cc b/example/client.cc index 3bd1641..d3ad4ba 100644 --- a/example/client.cc +++ b/example/client.cc @@ -18,7 +18,7 @@ int main(void) httplib::Client cli("localhost", 8080); #endif - auto res = cli.get("/hi"); + auto res = cli.Get("/hi"); if (res) { cout << res->status << endl; cout << res->get_header_value("Content-Type") << endl; diff --git a/example/client.vcxproj b/example/client.vcxproj index 51d06c1..1abb773 100644 --- a/example/client.vcxproj +++ b/example/client.vcxproj @@ -1,33 +1,55 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {6DB1FC63-B153-4279-92B7-D8A11AF285D6} Win32Proj client + 10.0.15063.0 Application true Unicode - v140 + v141 + + + Application + true + Unicode + v141 Application false true Unicode - v140 + v141 + + + Application + false + true + Unicode + v141 @@ -35,15 +57,31 @@ + + + + + + true + $(Configuration)\$(ProjectName)_obj\ + + + true + $(Platform)\$(Configuration)\$(ProjectName)_obj\ false + $(Configuration)\$(ProjectName)_obj\ + + + false + $(Platform)\$(Configuration)\$(ProjectName)_obj\ @@ -60,6 +98,21 @@ Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + .. + + + Console + true + Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + Level3 @@ -79,6 +132,25 @@ Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + .. + + + Console + true + true + true + Ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + + diff --git a/example/example.sln b/example/example.sln index e11aa85..81a3e78 100644 --- a/example/example.sln +++ b/example/example.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27703.2047 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "server", "server.vcxproj", "{864CD288-050A-4C8B-9BEF-3048BD876C5B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "client.vcxproj", "{6DB1FC63-B153-4279-92B7-D8A11AF285D6}" @@ -13,19 +15,32 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|Win32.ActiveCfg = Debug|Win32 {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|Win32.Build.0 = Debug|Win32 + {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|x64.ActiveCfg = Debug|x64 + {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Debug|x64.Build.0 = Debug|x64 {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|Win32.ActiveCfg = Release|Win32 {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|Win32.Build.0 = Release|Win32 + {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|x64.ActiveCfg = Release|x64 + {864CD288-050A-4C8B-9BEF-3048BD876C5B}.Release|x64.Build.0 = Release|x64 {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|Win32.ActiveCfg = Debug|Win32 {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|Win32.Build.0 = Debug|Win32 + {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|x64.ActiveCfg = Debug|x64 + {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Debug|x64.Build.0 = Debug|x64 {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|Win32.ActiveCfg = Release|Win32 {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|Win32.Build.0 = Release|Win32 + {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|x64.ActiveCfg = Release|x64 + {6DB1FC63-B153-4279-92B7-D8A11AF285D6}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {7097C9E4-07F8-48C6-A888-BBA9EBB5D17D} + EndGlobalSection EndGlobal diff --git a/example/hello.cc b/example/hello.cc index de6f4fb..9db3195 100644 --- a/example/hello.cc +++ b/example/hello.cc @@ -12,7 +12,7 @@ int main(void) { Server svr; - svr.get("/hi", [](const auto& req, auto& res) { + svr.Get("/hi", [](const Request& /*req*/, Response& res) { res.set_content("Hello World!", "text/plain"); }); diff --git a/example/server.cc b/example/server.cc index b6e348d..469e02f 100644 --- a/example/server.cc +++ b/example/server.cc @@ -7,13 +7,14 @@ #include #include +#include #define SERVER_CERT_FILE "./cert.pem" #define SERVER_PRIVATE_KEY_FILE "./key.pem" using namespace httplib; -std::string dump_headers(const MultiMap& headers) +std::string dump_headers(const Headers& headers) { std::string s; char buf[BUFSIZ]; @@ -34,7 +35,7 @@ std::string log(const Request& req, const Response& res) s += "================================\n"; - snprintf(buf, sizeof(buf), "%s %s", req.method.c_str(), req.path.c_str()); + snprintf(buf, sizeof(buf), "%s %s %s", req.method.c_str(), req.version.c_str(), req.path.c_str()); s += buf; std::string query; @@ -51,9 +52,10 @@ std::string log(const Request& req, const Response& res) s += "--------------------------------\n"; - snprintf(buf, sizeof(buf), "%d\n", res.status); + snprintf(buf, sizeof(buf), "%d %s\n", res.status, res.version.c_str()); s += buf; s += dump_headers(res.headers); + s += "\n"; if (!res.body.empty()) { s += res.body; @@ -72,30 +74,40 @@ int main(void) Server svr; #endif - svr.get("/", [=](const auto& req, auto& res) { + if (!svr.is_valid()) { + printf("server has an error...\n"); + return -1; + } + + svr.Get("/", [=](const Request& /*req*/, Response& res) { res.set_redirect("/hi"); }); - svr.get("/hi", [](const auto& req, auto& res) { - res.set_content("Hello World!", "text/plain"); + svr.Get("/hi", [](const Request& /*req*/, Response& res) { + res.set_content("Hello World!\n", "text/plain"); }); - svr.get("/dump", [](const auto& req, auto& res) { + svr.Get("/slow", [](const Request& /*req*/, Response& res) { + std::this_thread::sleep_for(std::chrono::seconds(2)); + res.set_content("Slow...\n", "text/plain"); + }); + + svr.Get("/dump", [](const Request& req, Response& res) { res.set_content(dump_headers(req.headers), "text/plain"); }); - svr.get("/stop", [&](const auto& req, auto& res) { + svr.Get("/stop", [&](const Request& /*req*/, Response& /*res*/) { svr.stop(); }); - svr.set_error_handler([](const auto& req, auto& res) { + svr.set_error_handler([](const Request& /*req*/, Response& res) { const char* fmt = "

Error Status: %d

"; char buf[BUFSIZ]; snprintf(buf, sizeof(buf), fmt, res.status); res.set_content(buf, "text/html"); }); - svr.set_logger([](const auto& req, const auto& res) { + svr.set_logger([](const Request& req, const Response& res) { printf("%s", log(req, res).c_str()); }); diff --git a/example/server.vcxproj b/example/server.vcxproj index f4e7181..31ff203 100644 --- a/example/server.vcxproj +++ b/example/server.vcxproj @@ -1,33 +1,55 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {864CD288-050A-4C8B-9BEF-3048BD876C5B} Win32Proj sample + 10.0.15063.0 Application true Unicode - v140 + v141 + + + Application + true + Unicode + v141 Application false true Unicode - v140 + v141 + + + Application + false + true + Unicode + v141 @@ -35,15 +57,31 @@ + + + + + + true + $(Configuration)\$(ProjectName)_obj\ + + + true + $(Platform)\$(Configuration)\$(ProjectName)_obj\ false + $(Configuration)\$(ProjectName)_obj\ + + + false + $(Platform)\$(Configuration)\$(ProjectName)_obj\ @@ -60,6 +98,21 @@ Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + .. + + + Console + true + Ws2_32.lib;%(AdditionalDependencies) + + Level3 @@ -79,6 +132,25 @@ Ws2_32.lib;%(AdditionalDependencies) + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + .. + + + Console + true + true + true + Ws2_32.lib;%(AdditionalDependencies) + + diff --git a/example/simplesvr.cc b/example/simplesvr.cc index 1c9d5a2..124a314 100644 --- a/example/simplesvr.cc +++ b/example/simplesvr.cc @@ -15,7 +15,7 @@ using namespace httplib; using namespace std; -string dump_headers(const MultiMap& headers) +string dump_headers(const Headers& headers) { string s; char buf[BUFSIZ]; @@ -28,6 +28,38 @@ string dump_headers(const MultiMap& headers) return s; } +string dump_multipart_files(const MultipartFiles& files) +{ + string s; + char buf[BUFSIZ]; + + s += "--------------------------------\n"; + + for (const auto& x: files) { + const auto& name = x.first; + const auto& file = x.second; + + snprintf(buf, sizeof(buf), "name: %s\n", name.c_str()); + s += buf; + + snprintf(buf, sizeof(buf), "filename: %s\n", file.filename.c_str()); + s += buf; + + snprintf(buf, sizeof(buf), "content type: %s\n", file.content_type.c_str()); + s += buf; + + snprintf(buf, sizeof(buf), "text offset: %lu\n", file.offset); + s += buf; + + snprintf(buf, sizeof(buf), "text length: %lu\n", file.length); + s += buf; + + s += "----------------\n"; + } + + return s; +} + string log(const Request& req, const Response& res) { string s; @@ -35,7 +67,7 @@ string log(const Request& req, const Response& res) s += "================================\n"; - snprintf(buf, sizeof(buf), "%s %s", req.method.c_str(), req.path.c_str()); + snprintf(buf, sizeof(buf), "%s %s %s", req.method.c_str(), req.version.c_str(), req.path.c_str()); s += buf; string query; @@ -49,6 +81,7 @@ string log(const Request& req, const Response& res) s += buf; s += dump_headers(req.headers); + s += dump_multipart_files(req.files); s += "--------------------------------\n"; @@ -72,18 +105,26 @@ int main(int argc, const char** argv) Server svr; #endif - svr.set_error_handler([](const auto& req, auto& res) { + svr.Post("/multipart", [](const Request& req, Response& res) { + auto body = + dump_headers(req.headers) + + dump_multipart_files(req.files); + + res.set_content(body, "text/plain"); + }); + + svr.set_error_handler([](const Request& /*req*/, Response& res) { const char* fmt = "

Error Status: %d

"; char buf[BUFSIZ]; snprintf(buf, sizeof(buf), fmt, res.status); res.set_content(buf, "text/html"); }); - svr.set_logger([](const auto& req, const auto& res) { + svr.set_logger([](const Request& req, const Response& res) { cout << log(req, res); }); - auto port = 80; + auto port = 8080; if (argc > 1) { port = atoi(argv[1]); } diff --git a/httplib.h b/httplib.h index dda5cc3..b0b5c88 100644 --- a/httplib.h +++ b/httplib.h @@ -2,36 +2,42 @@ // httplib.h // // Copyright (c) 2017 Yuji Hirose. All rights reserved. -// The Boost Software License 1.0 +// MIT License // -#ifndef _CPPHTTPLIB_HTTPLIB_H_ -#define _CPPHTTPLIB_HTTPLIB_H_ +#ifndef CPPHTTPLIB_HTTPLIB_H +#define CPPHTTPLIB_HTTPLIB_H -#ifdef _MSC_VER +#ifdef _WIN32 +#ifndef _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS +#endif //_CRT_SECURE_NO_WARNINGS + +#ifndef _CRT_NONSTDC_NO_DEPRECATE #define _CRT_NONSTDC_NO_DEPRECATE +#endif //_CRT_NONSTDC_NO_DEPRECATE -#ifndef SO_SYNCHRONOUS_NONALERT -#define SO_SYNCHRONOUS_NONALERT 0x20 -#endif -#ifndef SO_OPENTYPE -#define SO_OPENTYPE 0x7008 -#endif -#if (_MSC_VER < 1900) +#if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf_s -#endif +#endif // _MSC_VER +#ifndef S_ISREG #define S_ISREG(m) (((m)&S_IFREG)==S_IFREG) -#define S_ISDIR(m) (((m)&S_IFDIR)==S_IFDIR) +#endif //S_ISREG + +#ifndef S_ISDIR +#define S_ISDIR(m) (((m)&S_IFDIR)==S_IFDIR) +#endif //S_ISDIR + +#define NOMINMAX -#include #include #include #include -#undef min -#undef max +#ifndef strcasecmp +#define strcasecmp _stricmp +#endif //strcasecmp typedef SOCKET socket_t; #else @@ -43,55 +49,114 @@ typedef SOCKET socket_t; #include #include #include +#include typedef int socket_t; -#endif +#define INVALID_SOCKET (-1) +#endif //_WIN32 #include #include #include #include +#include #include #include +#include #include +#include #include #ifdef CPPHTTPLIB_OPENSSL_SUPPORT #include #endif +#ifdef CPPHTTPLIB_ZLIB_SUPPORT +#include +#endif + +/* + * Configuration + */ +#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND 5 +#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_USECOND 0 + namespace httplib { -typedef std::map Map; -typedef std::multimap MultiMap; -typedef std::smatch Match; +namespace detail { + +struct ci { + bool operator() (const std::string & s1, const std::string & s2) const { + return std::lexicographical_compare( + s1.begin(), s1.end(), + s2.begin(), s2.end(), + [](char c1, char c2) { + return ::tolower(c1) < ::tolower(c2); + }); + } +}; + +} // namespace detail + +enum class HttpVersion { v1_0 = 0, v1_1 }; + +typedef std::multimap Headers; + +template +std::pair make_range_header(uint64_t value, Args... args); + +typedef std::multimap Params; +typedef std::smatch Match; +typedef std::function Progress; + +struct MultipartFile { + std::string filename; + std::string content_type; + size_t offset = 0; + size_t length = 0; +}; +typedef std::multimap MultipartFiles; struct Request { - std::string method; - std::string path; - MultiMap headers; - std::string body; - Map params; - Match matches; + std::string version; + std::string method; + std::string target; + std::string path; + Headers headers; + std::string body; + Params params; + MultipartFiles files; + Match matches; + + Progress progress; bool has_header(const char* key) const; - std::string get_header_value(const char* key) const; + std::string get_header_value(const char* key, size_t id = 0) const; + size_t get_header_value_count(const char* key) const; void set_header(const char* key, const char* val); bool has_param(const char* key) const; + std::string get_param_value(const char* key, size_t id = 0) const; + size_t get_param_value_count(const char* key) const; + + bool has_file(const char* key) const; + MultipartFile get_file_value(const char* key) const; }; struct Response { + std::string version; int status; - MultiMap headers; + Headers headers; std::string body; + std::function streamcb; bool has_header(const char* key) const; - std::string get_header_value(const char* key) const; + std::string get_header_value(const char* key, size_t id = 0) const; + size_t get_header_value_count(const char* key) const; void set_header(const char* key, const char* val); - void set_redirect(const char* url); + void set_redirect(const char* uri); void set_content(const char* s, size_t n, const char* content_type); void set_content(const std::string& s, const char* content_type); @@ -104,6 +169,10 @@ public: virtual int read(char* ptr, size_t size) = 0; virtual int write(const char* ptr, size_t size1) = 0; virtual int write(const char* ptr) = 0; + virtual std::string get_remote_addr() const = 0; + + template + void write_format(const char* fmt, const Args& ...args); }; class SocketStream : public Stream { @@ -114,111 +183,198 @@ public: virtual int read(char* ptr, size_t size); virtual int write(const char* ptr, size_t size); virtual int write(const char* ptr); + virtual std::string get_remote_addr() const; private: socket_t sock_; }; +class BufferStream : public Stream { +public: + BufferStream() {} + virtual ~BufferStream() {} + + virtual int read(char* ptr, size_t size); + virtual int write(const char* ptr, size_t size); + virtual int write(const char* ptr); + virtual std::string get_remote_addr() const; + + const std::string& get_buffer() const; + +private: + std::string buffer; +}; + class Server { public: typedef std::function Handler; typedef std::function Logger; Server(); + virtual ~Server(); - void get(const char* pattern, Handler handler); - void post(const char* pattern, Handler handler); + virtual bool is_valid() const; + + Server& Get(const char* pattern, Handler handler); + Server& Post(const char* pattern, Handler handler); + + Server& Put(const char* pattern, Handler handler); + Server& Delete(const char* pattern, Handler handler); + Server& Options(const char* pattern, Handler handler); bool set_base_dir(const char* path); void set_error_handler(Handler handler); void set_logger(Logger logger); + void set_keep_alive_max_count(size_t count); + + int bind_to_any_port(const char* host, int socket_flags = 0); + bool listen_after_bind(); + bool listen(const char* host, int port, int socket_flags = 0); + + bool is_running() const; void stop(); protected: - void process_request(Stream& strm); + bool process_request(Stream& strm, bool last_connection, bool& connection_close); + + size_t keep_alive_max_count_; private: typedef std::vector> Handlers; + socket_t create_server_socket(const char* host, int port, int socket_flags) const; + int bind_internal(const char* host, int port, int socket_flags); + bool listen_internal(); + bool routing(Request& req, Response& res); bool handle_file_request(Request& req, Response& res); bool dispatch_request(Request& req, Response& res, Handlers& handlers); - bool read_request_line(Stream& strm, Request& req); + bool parse_request_line(const char* s, Request& req); + void write_response(Stream& strm, bool last_connection, const Request& req, Response& res); virtual bool read_and_close_socket(socket_t sock); + bool is_running_; socket_t svr_sock_; std::string base_dir_; Handlers get_handlers_; Handlers post_handlers_; + Handlers put_handlers_; + Handlers delete_handlers_; + Handlers options_handlers_; Handler error_handler_; Logger logger_; + + // TODO: Use thread pool... + std::mutex running_threads_mutex_; + int running_threads_; }; class Client { public: - Client(const char* host, int port); + Client( + const char* host, + int port = 80, + time_t timeout_sec = 300); + virtual ~Client(); - std::shared_ptr get(const char* path); - std::shared_ptr head(const char* path); - std::shared_ptr post(const char* path, const std::string& body, const char* content_type); - std::shared_ptr post(const char* path, const Map& params); + virtual bool is_valid() const; - bool send(const Request& req, Response& res); + std::shared_ptr Get(const char* path, Progress progress = nullptr); + std::shared_ptr Get(const char* path, const Headers& headers, Progress progress = nullptr); + + std::shared_ptr Head(const char* path); + std::shared_ptr Head(const char* path, const Headers& headers); + + std::shared_ptr Post(const char* path, const std::string& body, const char* content_type); + std::shared_ptr Post(const char* path, const Headers& headers, const std::string& body, const char* content_type); + + std::shared_ptr Post(const char* path, const Params& params); + std::shared_ptr Post(const char* path, const Headers& headers, const Params& params); + + std::shared_ptr Put(const char* path, const std::string& body, const char* content_type); + std::shared_ptr Put(const char* path, const Headers& headers, const std::string& body, const char* content_type); + + std::shared_ptr Delete(const char* path); + std::shared_ptr Delete(const char* path, const Headers& headers); + + std::shared_ptr Options(const char* path); + std::shared_ptr Options(const char* path, const Headers& headers); + + bool send(Request& req, Response& res); protected: - bool process_request(Stream& strm, const Request& req, Response& res); + bool process_request(Stream& strm, Request& req, Response& res, bool& connection_close); const std::string host_; const int port_; + time_t timeout_sec_; + const std::string host_and_port_; private: + socket_t create_client_socket() const; bool read_response_line(Stream& strm, Response& res); - void add_default_headers(Request& req); + void write_request(Stream& strm, Request& req); - virtual bool read_and_close_socket(socket_t sock, const Request& req, Response& res); + virtual bool read_and_close_socket(socket_t sock, Request& req, Response& res); + virtual bool is_ssl() const; }; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT class SSLSocketStream : public Stream { public: - SSLSocketStream(SSL* ssl); + SSLSocketStream(socket_t sock, SSL* ssl); virtual ~SSLSocketStream(); virtual int read(char* ptr, size_t size); virtual int write(const char* ptr, size_t size); virtual int write(const char* ptr); + virtual std::string get_remote_addr() const; private: + socket_t sock_; SSL* ssl_; }; class SSLServer : public Server { public: - SSLServer(const char* cert_path, const char* private_key_path); + SSLServer( + const char* cert_path, const char* private_key_path); + virtual ~SSLServer(); + virtual bool is_valid() const; + private: virtual bool read_and_close_socket(socket_t sock); SSL_CTX* ctx_; + std::mutex ctx_mutex_; }; class SSLClient : public Client { public: - SSLClient(const char* host, int port); + SSLClient( + const char* host, + int port = 443, + time_t timeout_sec = 300); + virtual ~SSLClient(); + virtual bool is_valid() const; + private: - virtual bool read_and_close_socket(socket_t sock, const Request& req, Response& res); + virtual bool read_and_close_socket(socket_t sock, Request& req, Response& res); + virtual bool is_ssl() const; SSL_CTX* ctx_; + std::mutex ctx_mutex_; }; #endif @@ -246,69 +402,158 @@ void split(const char* b, const char* e, char d, Fn fn) } } -inline bool socket_gets(Stream& strm, char* buf, int bufsiz) -{ - // TODO: buffering for better performance - size_t i = 0; +// NOTE: until the read size reaches `fixed_buffer_size`, use `fixed_buffer` +// to store data. The call can set memory on stack for performance. +class stream_line_reader { +public: + stream_line_reader(Stream& strm, char* fixed_buffer, size_t fixed_buffer_size) + : strm_(strm) + , fixed_buffer_(fixed_buffer) + , fixed_buffer_size_(fixed_buffer_size) { + } - for (;;) { - char byte; - auto n = strm.read(&byte, 1); + const char* ptr() const { + if (glowable_buffer_.empty()) { + return fixed_buffer_; + } else { + return glowable_buffer_.data(); + } + } - if (n < 1) { - if (i == 0) { + bool getline() { + fixed_buffer_used_size_ = 0; + glowable_buffer_.clear(); + + for (size_t i = 0; ; i++) { + char byte; + auto n = strm_.read(&byte, 1); + + if (n < 0) { return false; - } else { + } else if (n == 0) { + if (i == 0) { + return false; + } else { + break; + } + } + + append(byte); + + if (byte == '\n') { break; } } - buf[i++] = byte; - - if (byte == '\n') { - break; - } + return true; } - buf[i] = '\0'; - return true; -} - -template -inline void socket_printf(Stream& strm, const char* fmt, const Args& ...args) -{ - char buf[BUFSIZ]; - auto n = snprintf(buf, BUFSIZ, fmt, args...); - if (n > 0) { - if (n >= BUFSIZ) { - // TODO: buffer size is not large enough... +private: + void append(char c) { + if (fixed_buffer_used_size_ < fixed_buffer_size_ - 1) { + fixed_buffer_[fixed_buffer_used_size_++] = c; + fixed_buffer_[fixed_buffer_used_size_] = '\0'; } else { - strm.write(buf, n); + if (glowable_buffer_.empty()) { + assert(fixed_buffer_[fixed_buffer_used_size_] == '\0'); + glowable_buffer_.assign(fixed_buffer_, fixed_buffer_used_size_); + } + glowable_buffer_ += c; } } -} + + Stream& strm_; + char* fixed_buffer_; + const size_t fixed_buffer_size_; + size_t fixed_buffer_used_size_; + std::string glowable_buffer_; +}; inline int close_socket(socket_t sock) { -#ifdef _MSC_VER +#ifdef _WIN32 return closesocket(sock); #else return close(sock); #endif } -template -inline bool read_and_close_socket(socket_t sock, T callback) +inline int select_read(socket_t sock, time_t sec, time_t usec) { - SocketStream strm(sock); - auto ret = callback(strm); + fd_set fds; + FD_ZERO(&fds); + FD_SET(sock, &fds); + + timeval tv; + tv.tv_sec = sec; + tv.tv_usec = usec; + + return select(sock + 1, &fds, NULL, NULL, &tv); +} + +inline bool wait_until_socket_is_ready(socket_t sock, time_t sec, time_t usec) +{ + fd_set fdsr; + FD_ZERO(&fdsr); + FD_SET(sock, &fdsr); + + auto fdsw = fdsr; + auto fdse = fdsr; + + timeval tv; + tv.tv_sec = sec; + tv.tv_usec = usec; + + if (select(sock + 1, &fdsr, &fdsw, &fdse, &tv) < 0) { + return false; + } else if (FD_ISSET(sock, &fdsr) || FD_ISSET(sock, &fdsw)) { + int error = 0; + socklen_t len = sizeof(error); + if (getsockopt(sock, SOL_SOCKET, SO_ERROR, (char*)&error, &len) < 0 || error) { + return false; + } + } else { + return false; + } + + return true; +} + +template +inline bool read_and_close_socket(socket_t sock, size_t keep_alive_max_count, T callback) +{ + bool ret = false; + + if (keep_alive_max_count > 0) { + auto count = keep_alive_max_count; + while (count > 0 && + detail::select_read(sock, + CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND, + CPPHTTPLIB_KEEPALIVE_TIMEOUT_USECOND) > 0) { + SocketStream strm(sock); + auto last_connection = count == 1; + auto connection_close = false; + + ret = callback(strm, last_connection, connection_close); + if (!ret || connection_close) { + break; + } + + count--; + } + } else { + SocketStream strm(sock); + auto dummy_connection_close = false; + ret = callback(strm, true, dummy_connection_close); + } + close_socket(sock); return ret; } inline int shutdown_socket(socket_t sock) { -#ifdef _MSC_VER +#ifdef _WIN32 return shutdown(sock, SD_BOTH); #else return shutdown(sock, SHUT_RDWR); @@ -318,7 +563,10 @@ inline int shutdown_socket(socket_t sock) template socket_t create_socket(const char* host, int port, Fn fn, int socket_flags = 0) { -#ifdef _MSC_VER +#ifdef _WIN32 +#define SO_SYNCHRONOUS_NONALERT 0x20 +#define SO_OPENTYPE 0x7008 + int opt = SO_SYNCHRONOUS_NONALERT; setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (char*)&opt, sizeof(opt)); #endif @@ -336,13 +584,13 @@ socket_t create_socket(const char* host, int port, Fn fn, int socket_flags = 0) auto service = std::to_string(port); if (getaddrinfo(host, service.c_str(), &hints, &result)) { - return -1; + return INVALID_SOCKET; } for (auto rp = result; rp; rp = rp->ai_next) { // Create a socket auto sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); - if (sock == -1) { + if (sock == INVALID_SOCKET) { continue; } @@ -360,42 +608,94 @@ socket_t create_socket(const char* host, int port, Fn fn, int socket_flags = 0) } freeaddrinfo(result); - return -1; + return INVALID_SOCKET; } -inline socket_t create_server_socket(const char* host, int port, int socket_flags) +inline void set_nonblocking(socket_t sock, bool nonblocking) { - return create_socket(host, port, [](socket_t sock, struct addrinfo& ai) -> socket_t { - if (::bind(sock, ai.ai_addr, ai.ai_addrlen)) { - return false; - } - if (listen(sock, 5)) { // Listen through 5 channels - return false; - } - return true; - }, socket_flags); +#ifdef _WIN32 + auto flags = nonblocking ? 1UL : 0UL; + ioctlsocket(sock, FIONBIO, &flags); +#else + auto flags = fcntl(sock, F_GETFL, 0); + fcntl(sock, F_SETFL, nonblocking ? (flags | O_NONBLOCK) : (flags & (~O_NONBLOCK))); +#endif } -inline socket_t create_client_socket(const char* host, int port) +inline bool is_connection_error() { - return create_socket(host, port, [](socket_t sock, struct addrinfo& ai) -> socket_t { - if (connect(sock, ai.ai_addr, ai.ai_addrlen)) { - return false; - } - return true; - }); +#ifdef _WIN32 + return WSAGetLastError() != WSAEWOULDBLOCK; +#else + return errno != EINPROGRESS; +#endif } -inline bool is_file(const std::string& s) +inline std::string get_remote_addr(socket_t sock) { + struct sockaddr_storage addr; + socklen_t len = sizeof(addr); + + if (!getpeername(sock, (struct sockaddr*)&addr, &len)) { + char ipstr[NI_MAXHOST]; + + if (!getnameinfo((struct sockaddr*)&addr, len, + ipstr, sizeof(ipstr), nullptr, 0, NI_NUMERICHOST)) { + return ipstr; + } + } + + return std::string(); +} + +inline bool is_file(const std::string& path) { struct stat st; - return stat(s.c_str(), &st) >= 0 && S_ISREG(st.st_mode); + return stat(path.c_str(), &st) >= 0 && S_ISREG(st.st_mode); } -inline bool is_dir(const std::string& s) +inline bool is_dir(const std::string& path) { struct stat st; - return stat(s.c_str(), &st) >= 0 && S_ISDIR(st.st_mode); + return stat(path.c_str(), &st) >= 0 && S_ISDIR(st.st_mode); +} + +inline bool is_valid_path(const std::string& path) { + size_t level = 0; + size_t i = 0; + + // Skip slash + while (i < path.size() && path[i] == '/') { + i++; + } + + while (i < path.size()) { + // Read component + auto beg = i; + while (i < path.size() && path[i] != '/') { + i++; + } + + auto len = i - beg; + assert(len > 0); + + if (!path.compare(beg, len, ".")) { + ; + } else if (!path.compare(beg, len, "..")) { + if (level == 0) { + return false; + } + level--; + } else { + level++; + } + + // Skip slash + while (i < path.size() && path[i] == '/') { + i++; + } + } + + return true; } inline void read_file(const std::string& path, std::string& out) @@ -418,19 +718,15 @@ inline std::string file_extension(const std::string& path) return std::string(); } -inline const char* content_type(const std::string& path) +inline const char* find_content_type(const std::string& path) { - auto ext = detail::file_extension(path); + auto ext = file_extension(path); if (ext == "txt") { return "text/plain"; } else if (ext == "html") { return "text/html"; - } else if (ext == "js") { - return "text/javascript"; } else if (ext == "css") { return "text/css"; - } else if (ext == "xml") { - return "text/xml"; } else if (ext == "jpeg" || ext == "jpg") { return "image/jpg"; } else if (ext == "png") { @@ -445,6 +741,10 @@ inline const char* content_type(const std::string& path) return "application/json"; } else if (ext == "pdf") { return "application/pdf"; + } else if (ext == "js") { + return "application/javascript"; + } else if (ext == "xml") { + return "application/xml"; } else if (ext == "xhtml") { return "application/xhtml+xml"; } @@ -455,131 +755,203 @@ inline const char* status_message(int status) { switch (status) { case 200: return "OK"; + case 301: return "Moved Permanently"; + case 302: return "Found"; + case 303: return "See Other"; + case 304: return "Not Modified"; case 400: return "Bad Request"; + case 403: return "Forbidden"; case 404: return "Not Found"; + case 415: return "Unsupported Media Type"; default: case 500: return "Internal Server Error"; } } -inline const char* get_header_value(const MultiMap& map, const char* key, const char* def) +inline bool has_header(const Headers& headers, const char* key) { - auto it = map.find(key); - if (it != map.end()) { + return headers.find(key) != headers.end(); +} + +inline const char* get_header_value( + const Headers& headers, const char* key, size_t id = 0, const char* def = nullptr) +{ + auto it = headers.find(key); + std::advance(it, id); + if (it != headers.end()) { return it->second.c_str(); } return def; } -inline int get_header_value_int(const MultiMap& map, const char* key, int def) +inline int get_header_value_int(const Headers& headers, const char* key, int def = 0) { - auto it = map.find(key); - if (it != map.end()) { + auto it = headers.find(key); + if (it != headers.end()) { return std::stoi(it->second); } return def; } -inline bool read_headers(Stream& strm, MultiMap& headers) +inline bool read_headers(Stream& strm, Headers& headers) { - static std::regex re("(.+?): (.+?)\r\n"); + static std::regex re(R"((.+?):\s*(.+?)\s*\r\n)"); - const auto BUFSIZ_HEADER = 2048; - char buf[BUFSIZ_HEADER]; + const auto bufsiz = 2048; + char buf[bufsiz]; + + stream_line_reader reader(strm, buf, bufsiz); for (;;) { - if (!socket_gets(strm, buf, BUFSIZ_HEADER)) { + if (!reader.getline()) { return false; } - if (!strcmp(buf, "\r\n")) { + if (!strcmp(reader.ptr(), "\r\n")) { break; } std::cmatch m; - if (std::regex_match(buf, m, re)) { + if (std::regex_match(reader.ptr(), m, re)) { auto key = std::string(m[1]); auto val = std::string(m[2]); - headers.insert(std::make_pair(key, val)); + headers.emplace(key, val); } } return true; } -template -bool read_content(Stream& strm, T& x, bool allow_no_content_length) +inline bool read_content_with_length(Stream& strm, std::string& out, size_t len, Progress progress) { - auto len = get_header_value_int(x.headers, "Content-Length", 0); - if (len) { - x.body.assign(len, 0); - auto r = 0; - while (r < len){ - auto r_incr = strm.read(&x.body[r], len - r); - if (r_incr <= 0) { + out.assign(len, 0); + size_t r = 0; + while (r < len){ + auto n = strm.read(&out[r], len - r); + if (n <= 0) { + return false; + } + + r += n; + + if (progress) { + if (!progress(r, len)) { return false; } - r += r_incr; } - } else if (allow_no_content_length) { - for (;;) { - char byte; - auto n = strm.read(&byte, 1); - if (n < 1) { - if (x.body.size() == 0) { - return true; // no body - } else { - break; - } + } + + return true; +} + +inline bool read_content_without_length(Stream& strm, std::string& out) +{ + for (;;) { + char byte; + auto n = strm.read(&byte, 1); + if (n < 0) { + return false; + } else if (n == 0) { + return true; + } + out += byte; + } + + return true; +} + +inline bool read_content_chunked(Stream& strm, std::string& out) +{ + const auto bufsiz = 16; + char buf[bufsiz]; + + stream_line_reader reader(strm, buf, bufsiz); + + if (!reader.getline()) { + return false; + } + + auto chunk_len = std::stoi(reader.ptr(), 0, 16); + + while (chunk_len > 0){ + std::string chunk; + if (!read_content_with_length(strm, chunk, chunk_len, nullptr)) { + return false; + } + + if (!reader.getline()) { + return false; + } + + if (strcmp(reader.ptr(), "\r\n")) { + break; + } + + out += chunk; + + if (!reader.getline()) { + return false; + } + + chunk_len = std::stoi(reader.ptr(), 0, 16); + } + + if (chunk_len == 0) { + // Reader terminator after chunks + if (!reader.getline() || strcmp(reader.ptr(), "\r\n")) + return false; + } + + return true; +} + +template +bool read_content(Stream& strm, T& x, Progress progress = Progress()) +{ + if (has_header(x.headers, "Content-Length")) { + auto len = get_header_value_int(x.headers, "Content-Length", 0); + if (len == 0) { + const auto& encoding = get_header_value(x.headers, "Transfer-Encoding", 0, ""); + if (!strcasecmp(encoding, "chunked")) { + return read_content_chunked(strm, x.body); } - x.body += byte; } + return read_content_with_length(strm, x.body, len, progress); + } else { + const auto& encoding = get_header_value(x.headers, "Transfer-Encoding", 0, ""); + if (!strcasecmp(encoding, "chunked")) { + return read_content_chunked(strm, x.body); + } + return read_content_without_length(strm, x.body); } return true; } template -inline void write_headers(Stream& strm, const T& res) +inline void write_headers(Stream& strm, const T& info) { - strm.write("Connection: close\r\n"); - - for (const auto& x: res.headers) { - if (x.first != "Content-Type" && x.first != "Content-Length") { - socket_printf(strm, "%s: %s\r\n", x.first.c_str(), x.second.c_str()); - } + for (const auto& x: info.headers) { + strm.write_format("%s: %s\r\n", x.first.c_str(), x.second.c_str()); } - - auto t = get_header_value(res.headers, "Content-Type", "text/plain"); - socket_printf(strm, "Content-Type: %s\r\n", t); - socket_printf(strm, "Content-Length: %ld\r\n", res.body.size()); strm.write("\r\n"); } -inline void write_response(Stream& strm, const Request& req, const Response& res) -{ - socket_printf(strm, "HTTP/1.0 %d %s\r\n", res.status, status_message(res.status)); - - write_headers(strm, res); - - if (!res.body.empty() && req.method != "HEAD") { - strm.write(res.body.c_str(), res.body.size()); - } -} - inline std::string encode_url(const std::string& s) { std::string result; for (auto i = 0; s[i]; i++) { switch (s[i]) { - case ' ': result += "+"; break; + case ' ': result += "%20"; break; + case '+': result += "%2B"; break; case '\'': result += "%27"; break; case ',': result += "%2C"; break; case ':': result += "%3A"; break; case ';': result += "%3B"; break; default: - if (s[i] < 0) { + auto c = static_cast(s[i]); + if (c >= 0x80) { result += '%'; char hex[4]; - size_t len = snprintf(hex, sizeof(hex), "%02X", (unsigned char)s[i]); + size_t len = snprintf(hex, sizeof(hex) - 1, "%02X", c); assert(len == 2); result.append(hex, len); } else { @@ -607,18 +979,36 @@ inline bool is_hex(char c, int& v) return false; } -inline int from_hex_to_i(const std::string& s, int i, int cnt, int& val) +inline bool from_hex_to_i(const std::string& s, size_t i, size_t cnt, int& val) { + if (i >= s.size()) { + return false; + } + val = 0; - for (; s[i] && cnt; i++, cnt--) { + for (; cnt; i++, cnt--) { + if (!s[i]) { + return false; + } int v = 0; if (is_hex(s[i], v)) { val = val * 16 + v; } else { - break; + return false; } } - return --i; + return true; +} + +inline std::string from_i_to_hex(uint64_t n) +{ + const char *charset = "0123456789abcdef"; + std::string ret; + do { + ret = charset[n & 15] + ret; + n >>= 4; + } while (n > 0); + return ret; } inline size_t to_utf8(int code, char* buff) @@ -658,32 +1048,30 @@ inline std::string decode_url(const std::string& s) { std::string result; - for (int i = 0; s[i]; i++) { - if (s[i] == '%') { - i++; - assert(s[i]); - - if (s[i] == '%') { - result += s[i]; - } else if (s[i] == 'u') { - // Unicode - i++; - assert(s[i]); - + for (size_t i = 0; i < s.size(); i++) { + if (s[i] == '%' && i + 1 < s.size()) { + if (s[i + 1] == 'u') { int val = 0; - i = from_hex_to_i(s, i, 4, val); - - char buff[4]; - size_t len = to_utf8(val, buff); - - if (len > 0) { - result.append(buff, len); + if (from_hex_to_i(s, i + 2, 4, val)) { + // 4 digits Unicode codes + char buff[4]; + size_t len = to_utf8(val, buff); + if (len > 0) { + result.append(buff, len); + } + i += 5; // 'u0000' + } else { + result += s[i]; } } else { - // HEX int val = 0; - i = from_hex_to_i(s, i, 2, val); - result += val; + if (from_hex_to_i(s, i + 1, 2, val)) { + // 2 digits hex codes + result += val; + i += 2; // '00' + } else { + result += s[i]; + } } } else if (s[i] == '+') { result += ' '; @@ -695,24 +1083,7 @@ inline std::string decode_url(const std::string& s) return result; } -inline void write_request(Stream& strm, const Request& req) -{ - auto path = encode_url(req.path); - socket_printf(strm, "%s %s HTTP/1.0\r\n", req.method.c_str(), path.c_str()); - - write_headers(strm, req); - - if (!req.body.empty()) { - if (req.has_header("application/x-www-form-urlencoded")) { - auto str = encode_url(req.body); - strm.write(str.c_str(), str.size()); - } else { - strm.write(req.body.c_str(), req.body.size()); - } - } -} - -inline void parse_query_text(const std::string& s, Map& params) +inline void parse_query_text(const std::string& s, Params& params) { split(&s[0], &s[s.size()], '&', [&](const char* b, const char* e) { std::string key; @@ -724,11 +1095,215 @@ inline void parse_query_text(const std::string& s, Map& params) val.assign(b, e); } }); - params[key] = detail::decode_url(val); + params.emplace(key, decode_url(val)); }); } -#ifdef _MSC_VER +inline bool parse_multipart_boundary(const std::string& content_type, std::string& boundary) +{ + auto pos = content_type.find("boundary="); + if (pos == std::string::npos) { + return false; + } + + boundary = content_type.substr(pos + 9); + return true; +} + +inline bool parse_multipart_formdata( + const std::string& boundary, const std::string& body, MultipartFiles& files) +{ + static std::string dash = "--"; + static std::string crlf = "\r\n"; + + static std::regex re_content_type( + "Content-Type: (.*?)", std::regex_constants::icase); + + static std::regex re_content_disposition( + "Content-Disposition: form-data; name=\"(.*?)\"(?:; filename=\"(.*?)\")?", + std::regex_constants::icase); + + auto dash_boundary = dash + boundary; + + auto pos = body.find(dash_boundary); + if (pos != 0) { + return false; + } + + pos += dash_boundary.size(); + + auto next_pos = body.find(crlf, pos); + if (next_pos == std::string::npos) { + return false; + } + + pos = next_pos + crlf.size(); + + while (pos < body.size()) { + next_pos = body.find(crlf, pos); + if (next_pos == std::string::npos) { + return false; + } + + std::string name; + MultipartFile file; + + auto header = body.substr(pos, (next_pos - pos)); + + while (pos != next_pos) { + std::smatch m; + if (std::regex_match(header, m, re_content_type)) { + file.content_type = m[1]; + } else if (std::regex_match(header, m, re_content_disposition)) { + name = m[1]; + file.filename = m[2]; + } + + pos = next_pos + crlf.size(); + + next_pos = body.find(crlf, pos); + if (next_pos == std::string::npos) { + return false; + } + + header = body.substr(pos, (next_pos - pos)); + } + + pos = next_pos + crlf.size(); + + next_pos = body.find(crlf + dash_boundary, pos); + + if (next_pos == std::string::npos) { + return false; + } + + file.offset = pos; + file.length = next_pos - pos; + + pos = next_pos + crlf.size() + dash_boundary.size(); + + next_pos = body.find(crlf, pos); + if (next_pos == std::string::npos) { + return false; + } + + files.emplace(name, file); + + pos = next_pos + crlf.size(); + } + + return true; +} + +inline std::string to_lower(const char* beg, const char* end) +{ + std::string out; + auto it = beg; + while (it != end) { + out += ::tolower(*it); + it++; + } + return out; +} + +inline void make_range_header_core(std::string&) {} + +template +inline void make_range_header_core(std::string& field, uint64_t value) +{ + if (!field.empty()) { + field += ", "; + } + field += std::to_string(value) + "-"; +} + +template +inline void make_range_header_core(std::string& field, uint64_t value1, uint64_t value2, Args... args) +{ + if (!field.empty()) { + field += ", "; + } + field += std::to_string(value1) + "-" + std::to_string(value2); + make_range_header_core(field, args...); +} + +#ifdef CPPHTTPLIB_ZLIB_SUPPORT +inline bool can_compress(const std::string& content_type) { + return !content_type.find("text/") || + content_type == "image/svg+xml" || + content_type == "application/javascript" || + content_type == "application/json" || + content_type == "application/xml" || + content_type == "application/xhtml+xml"; +} + +inline void compress(std::string& content) +{ + z_stream strm; + strm.zalloc = Z_NULL; + strm.zfree = Z_NULL; + strm.opaque = Z_NULL; + + auto ret = deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8, Z_DEFAULT_STRATEGY); + if (ret != Z_OK) { + return; + } + + strm.avail_in = content.size(); + strm.next_in = (Bytef *)content.data(); + + std::string compressed; + + const auto bufsiz = 16384; + char buff[bufsiz]; + do { + strm.avail_out = bufsiz; + strm.next_out = (Bytef *)buff; + deflate(&strm, Z_FINISH); + compressed.append(buff, bufsiz - strm.avail_out); + } while (strm.avail_out == 0); + + content.swap(compressed); + + deflateEnd(&strm); +} + +inline void decompress(std::string& content) +{ + z_stream strm; + strm.zalloc = Z_NULL; + strm.zfree = Z_NULL; + strm.opaque = Z_NULL; + + // 15 is the value of wbits, which should be at the maximum possible value to ensure + // that any gzip stream can be decoded. The offset of 16 specifies that the stream + // to decompress will be formatted with a gzip wrapper. + auto ret = inflateInit2(&strm, 16 + 15); + if (ret != Z_OK) { + return; + } + + strm.avail_in = content.size(); + strm.next_in = (Bytef *)content.data(); + + std::string decompressed; + + const auto bufsiz = 16384; + char buff[bufsiz]; + do { + strm.avail_out = bufsiz; + strm.next_out = (Bytef *)buff; + inflate(&strm, Z_NO_FLUSH); + decompressed.append(buff, bufsiz - strm.avail_out); + } while (strm.avail_out == 0); + + content.swap(decompressed); + + inflateEnd(&strm); +} +#endif + +#ifdef _WIN32 class WSInit { public: WSInit() { @@ -746,20 +1321,36 @@ static WSInit wsinit_; } // namespace detail +// Header utilities +template +inline std::pair make_range_header(uint64_t value, Args... args) +{ + std::string field; + detail::make_range_header_core(field, value, args...); + field.insert(0, "bytes="); + return std::make_pair("Range", field); +} + // Request implementation inline bool Request::has_header(const char* key) const { - return headers.find(key) != headers.end(); + return detail::has_header(headers, key); } -inline std::string Request::get_header_value(const char* key) const +inline std::string Request::get_header_value(const char* key, size_t id) const { - return detail::get_header_value(headers, key, ""); + return detail::get_header_value(headers, key, id, ""); +} + +inline size_t Request::get_header_value_count(const char* key) const +{ + auto r = headers.equal_range(key); + return std::distance(r.first, r.second); } inline void Request::set_header(const char* key, const char* val) { - headers.insert(std::make_pair(key, val)); + headers.emplace(key, val); } inline bool Request::has_param(const char* key) const @@ -767,20 +1358,56 @@ inline bool Request::has_param(const char* key) const return params.find(key) != params.end(); } +inline std::string Request::get_param_value(const char* key, size_t id) const +{ + auto it = params.find(key); + std::advance(it, id); + if (it != params.end()) { + return it->second; + } + return std::string(); +} + +inline size_t Request::get_param_value_count(const char* key) const +{ + auto r = params.equal_range(key); + return std::distance(r.first, r.second); +} + +inline bool Request::has_file(const char* key) const +{ + return files.find(key) != files.end(); +} + +inline MultipartFile Request::get_file_value(const char* key) const +{ + auto it = files.find(key); + if (it != files.end()) { + return it->second; + } + return MultipartFile(); +} + // Response implementation inline bool Response::has_header(const char* key) const { return headers.find(key) != headers.end(); } -inline std::string Response::get_header_value(const char* key) const +inline std::string Response::get_header_value(const char* key, size_t id) const { - return detail::get_header_value(headers, key, ""); + return detail::get_header_value(headers, key, id, ""); +} + +inline size_t Response::get_header_value_count(const char* key) const +{ + auto r = headers.equal_range(key); + return std::distance(r.first, r.second); } inline void Response::set_header(const char* key, const char* val) { - headers.insert(std::make_pair(key, val)); + headers.emplace(key, val); } inline void Response::set_redirect(const char* url) @@ -801,6 +1428,37 @@ inline void Response::set_content(const std::string& s, const char* content_type set_header("Content-Type", content_type); } +// Rstream implementation +template +inline void Stream::write_format(const char* fmt, const Args& ...args) +{ + const auto bufsiz = 2048; + char buf[bufsiz]; + +#if defined(_MSC_VER) && _MSC_VER < 1900 + auto n = _snprintf_s(buf, bufsiz, bufsiz - 1, fmt, args...); +#else + auto n = snprintf(buf, bufsiz - 1, fmt, args...); +#endif + if (n > 0) { + if (n >= bufsiz - 1) { + std::vector glowable_buf(bufsiz); + + while (n >= static_cast(glowable_buf.size() - 1)) { + glowable_buf.resize(glowable_buf.size() * 2); +#if defined(_MSC_VER) && _MSC_VER < 1900 + n = _snprintf_s(&glowable_buf[0], glowable_buf.size(), glowable_buf.size() - 1, fmt, args...); +#else + n = snprintf(&glowable_buf[0], glowable_buf.size() - 1, fmt, args...); +#endif + } + write(&glowable_buf[0], n); + } else { + write(buf, n); + } + } +} + // Socket stream implementation inline SocketStream::SocketStream(socket_t sock): sock_(sock) { @@ -825,11 +1483,50 @@ inline int SocketStream::write(const char* ptr) return write(ptr, strlen(ptr)); } +inline std::string SocketStream::get_remote_addr() const { + return detail::get_remote_addr(sock_); +} + +// Buffer stream implementation +inline int BufferStream::read(char* ptr, size_t size) +{ +#if defined(_MSC_VER) && _MSC_VER < 1900 + return static_cast(buffer._Copy_s(ptr, size, size)); +#else + return static_cast(buffer.copy(ptr, size)); +#endif +} + +inline int BufferStream::write(const char* ptr, size_t size) +{ + buffer.append(ptr, size); + return static_cast(size); +} + +inline int BufferStream::write(const char* ptr) +{ + size_t size = strlen(ptr); + buffer.append(ptr, size); + return static_cast(size); +} + +inline std::string BufferStream::get_remote_addr() const { + return ""; +} + +inline const std::string& BufferStream::get_buffer() const { + return buffer; +} + + // HTTP server implementation inline Server::Server() - : svr_sock_(-1) + : keep_alive_max_count_(5) + , is_running_(false) + , svr_sock_(INVALID_SOCKET) + , running_threads_(0) { -#ifndef _MSC_VER +#ifndef _WIN32 signal(SIGPIPE, SIG_IGN); #endif } @@ -838,14 +1535,34 @@ inline Server::~Server() { } -inline void Server::get(const char* pattern, Handler handler) +inline Server& Server::Get(const char* pattern, Handler handler) { get_handlers_.push_back(std::make_pair(std::regex(pattern), handler)); + return *this; } -inline void Server::post(const char* pattern, Handler handler) +inline Server& Server::Post(const char* pattern, Handler handler) { post_handlers_.push_back(std::make_pair(std::regex(pattern), handler)); + return *this; +} + +inline Server& Server::Put(const char* pattern, Handler handler) +{ + put_handlers_.push_back(std::make_pair(std::regex(pattern), handler)); + return *this; +} + +inline Server& Server::Delete(const char* pattern, Handler handler) +{ + delete_handlers_.push_back(std::make_pair(std::regex(pattern), handler)); + return *this; +} + +inline Server& Server::Options(const char* pattern, Handler handler) +{ + options_handlers_.push_back(std::make_pair(std::regex(pattern), handler)); + return *this; } inline bool Server::set_base_dir(const char* path) @@ -867,61 +1584,58 @@ inline void Server::set_logger(Logger logger) logger_ = logger; } +inline void Server::set_keep_alive_max_count(size_t count) +{ + keep_alive_max_count_ = count; +} + +inline int Server::bind_to_any_port(const char* host, int socket_flags) +{ + return bind_internal(host, 0, socket_flags); +} + +inline bool Server::listen_after_bind() { + return listen_internal(); +} + inline bool Server::listen(const char* host, int port, int socket_flags) { - svr_sock_ = detail::create_server_socket(host, port, socket_flags); - if (svr_sock_ == -1) { + if (bind_internal(host, port, socket_flags) < 0) return false; - } + return listen_internal(); +} - auto ret = true; - - for (;;) { - socket_t sock = accept(svr_sock_, NULL, NULL); - - if (sock == -1) { - if (svr_sock_ != -1) { - detail::close_socket(svr_sock_); - ret = false; - } else { - ; // The server socket was closed by user. - } - break; - } - - // TODO: should be async - read_and_close_socket(sock); - } - - return ret; +inline bool Server::is_running() const +{ + return is_running_; } inline void Server::stop() { - detail::shutdown_socket(svr_sock_); - detail::close_socket(svr_sock_); - svr_sock_ = -1; + if (is_running_) { + assert(svr_sock_ != INVALID_SOCKET); + auto sock = svr_sock_; + svr_sock_ = INVALID_SOCKET; + detail::shutdown_socket(sock); + detail::close_socket(sock); + } } -inline bool Server::read_request_line(Stream& strm, Request& req) +inline bool Server::parse_request_line(const char* s, Request& req) { - const auto BUFSIZ_REQUESTLINE = 2048; - char buf[BUFSIZ_REQUESTLINE]; - if (!detail::socket_gets(strm, buf, BUFSIZ_REQUESTLINE)) { - return false; - } - - static std::regex re("(GET|HEAD|POST) ([^?]+)(?:\\?(.+?))? HTTP/1\\.[01]\r\n"); + static std::regex re("(GET|HEAD|POST|PUT|DELETE|OPTIONS) (([^?]+)(?:\\?(.+?))?) (HTTP/1\\.[01])\r\n"); std::cmatch m; - if (std::regex_match(buf, m, re)) { + if (std::regex_match(s, m, re)) { + req.version = std::string(m[5]); req.method = std::string(m[1]); - req.path = detail::decode_url(m[2]); + req.target = std::string(m[2]); + req.path = detail::decode_url(m[3]); // Parse query text - auto len = std::distance(m[3].first, m[3].second); + auto len = std::distance(m[4].first, m[4].second); if (len > 0) { - detail::parse_query_text(m[3], req.params); + detail::parse_query_text(m[4], req.params); } return true; @@ -930,9 +1644,90 @@ inline bool Server::read_request_line(Stream& strm, Request& req) return false; } +inline void Server::write_response(Stream& strm, bool last_connection, const Request& req, Response& res) +{ + assert(res.status != -1); + + if (400 <= res.status && error_handler_) { + error_handler_(req, res); + } + + // Response line + strm.write_format("HTTP/1.1 %d %s\r\n", + res.status, + detail::status_message(res.status)); + + // Headers + if (last_connection || + req.get_header_value("Connection") == "close") { + res.set_header("Connection", "close"); + } + + if (!last_connection && + req.get_header_value("Connection") == "Keep-Alive") { + res.set_header("Connection", "Keep-Alive"); + } + + if (res.body.empty()) { + if (!res.has_header("Content-Length")) { + if (res.streamcb) { + // Streamed response + res.set_header("Transfer-Encoding", "chunked"); + } else { + res.set_header("Content-Length", "0"); + } + } + } else { +#ifdef CPPHTTPLIB_ZLIB_SUPPORT + // TODO: 'Accpet-Encoding' has gzip, not gzip;q=0 + const auto& encodings = req.get_header_value("Accept-Encoding"); + if (encodings.find("gzip") != std::string::npos && + detail::can_compress(res.get_header_value("Content-Type"))) { + detail::compress(res.body); + res.set_header("Content-Encoding", "gzip"); + } +#endif + + if (!res.has_header("Content-Type")) { + res.set_header("Content-Type", "text/plain"); + } + + auto length = std::to_string(res.body.size()); + res.set_header("Content-Length", length.c_str()); + } + + detail::write_headers(strm, res); + + // Body + if (req.method != "HEAD") { + if (!res.body.empty()) { + strm.write(res.body.c_str(), res.body.size()); + } else if (res.streamcb) { + bool chunked_response = !res.has_header("Content-Length"); + uint64_t offset = 0; + bool data_available = true; + while (data_available) { + std::string chunk = res.streamcb(offset); + offset += chunk.size(); + data_available = !chunk.empty(); + // Emit chunked response header and footer for each chunk + if (chunked_response) + chunk = detail::from_i_to_hex(chunk.size()) + "\r\n" + chunk + "\r\n"; + if (strm.write(chunk.c_str(), chunk.size()) < 0) + break; // Stop on error + } + } + } + + // Log + if (logger_) { + logger_(req, res); + } +} + inline bool Server::handle_file_request(Request& req, Response& res) { - if (!base_dir_.empty()) { + if (!base_dir_.empty() && detail::is_valid_path(req.path)) { std::string path = base_dir_ + req.path; if (!path.empty() && path.back() == '/') { @@ -941,7 +1736,7 @@ inline bool Server::handle_file_request(Request& req, Response& res) if (detail::is_file(path)) { detail::read_file(path, res.body); - auto type = detail::content_type(path); + auto type = detail::find_content_type(path); if (type) { res.set_header("Content-Type", type); } @@ -953,6 +1748,108 @@ inline bool Server::handle_file_request(Request& req, Response& res) return false; } +inline socket_t Server::create_server_socket(const char* host, int port, int socket_flags) const +{ + return detail::create_socket(host, port, + [](socket_t sock, struct addrinfo& ai) -> bool { + if (::bind(sock, ai.ai_addr, ai.ai_addrlen)) { + return false; + } + if (::listen(sock, 5)) { // Listen through 5 channels + return false; + } + return true; + }, socket_flags); +} + +inline int Server::bind_internal(const char* host, int port, int socket_flags) +{ + if (!is_valid()) { + return -1; + } + + svr_sock_ = create_server_socket(host, port, socket_flags); + if (svr_sock_ == INVALID_SOCKET) { + return -1; + } + + if (port == 0) { + struct sockaddr_storage address; + socklen_t len = sizeof(address); + if (getsockname(svr_sock_, reinterpret_cast(&address), &len) == -1) { + return -1; + } + if (address.ss_family == AF_INET) { + return ntohs(reinterpret_cast(&address)->sin_port); + } else if (address.ss_family == AF_INET6) { + return ntohs(reinterpret_cast(&address)->sin6_port); + } else { + return -1; + } + } else { + return port; + } +} + +inline bool Server::listen_internal() +{ + auto ret = true; + + is_running_ = true; + + for (;;) { + auto val = detail::select_read(svr_sock_, 0, 100000); + + if (val == 0) { // Timeout + if (svr_sock_ == INVALID_SOCKET) { + // The server socket was closed by 'stop' method. + break; + } + continue; + } + + socket_t sock = accept(svr_sock_, NULL, NULL); + + if (sock == INVALID_SOCKET) { + if (svr_sock_ != INVALID_SOCKET) { + detail::close_socket(svr_sock_); + ret = false; + } else { + ; // The server socket was closed by user. + } + break; + } + + // TODO: Use thread pool... + std::thread([=]() { + { + std::lock_guard guard(running_threads_mutex_); + running_threads_++; + } + + read_and_close_socket(sock); + + { + std::lock_guard guard(running_threads_mutex_); + running_threads_--; + } + }).detach(); + } + + // TODO: Use thread pool... + for (;;) { + std::this_thread::sleep_for(std::chrono::milliseconds(10)); + std::lock_guard guard(running_threads_mutex_); + if (!running_threads_) { + break; + } + } + + is_running_ = false; + + return ret; +} + inline bool Server::routing(Request& req, Response& res) { if (req.method == "GET" && handle_file_request(req, res)) { @@ -963,6 +1860,12 @@ inline bool Server::routing(Request& req, Response& res) return dispatch_request(req, res, get_handlers_); } else if (req.method == "POST") { return dispatch_request(req, res, post_handlers_); + } else if (req.method == "PUT") { + return dispatch_request(req, res, put_handlers_); + } else if (req.method == "DELETE") { + return dispatch_request(req, res, delete_handlers_); + } else if (req.method == "OPTIONS") { + return dispatch_request(req, res, options_handlers_); } return false; } @@ -981,25 +1884,66 @@ inline bool Server::dispatch_request(Request& req, Response& res, Handlers& hand return false; } -inline void Server::process_request(Stream& strm) +inline bool Server::process_request(Stream& strm, bool last_connection, bool& connection_close) { + const auto bufsiz = 2048; + char buf[bufsiz]; + + detail::stream_line_reader reader(strm, buf, bufsiz); + + // Connection has been closed on client + if (!reader.getline()) { + return false; + } + Request req; Response res; - if (!read_request_line(strm, req) || - !detail::read_headers(strm, req.headers)) { - // TODO: - return; + res.version = "HTTP/1.1"; + + // Request line and headers + if (!parse_request_line(reader.ptr(), req) || !detail::read_headers(strm, req.headers)) { + res.status = 400; + write_response(strm, last_connection, req, res); + return true; } - if (req.method == "POST") { - if (!detail::read_content(strm, req, false)) { - // TODO: - return; + if (req.get_header_value("Connection") == "close") { + connection_close = true; + } + + req.set_header("REMOTE_ADDR", strm.get_remote_addr().c_str()); + + // Body + if (req.method == "POST" || req.method == "PUT") { + if (!detail::read_content(strm, req)) { + res.status = 400; + write_response(strm, last_connection, req, res); + return true; } - static std::string type = "application/x-www-form-urlencoded"; - if (!req.get_header_value("Content-Type").compare(0, type.size(), type)) { + + const auto& content_type = req.get_header_value("Content-Type"); + + if (req.get_header_value("Content-Encoding") == "gzip") { +#ifdef CPPHTTPLIB_ZLIB_SUPPORT + detail::decompress(req.body); +#else + res.status = 415; + write_response(strm, last_connection, req, res); + return true; +#endif + } + + if (!content_type.find("application/x-www-form-urlencoded")) { detail::parse_query_text(req.body, req.params); + } else if(!content_type.find("multipart/form-data")) { + std::string boundary; + if (!detail::parse_multipart_boundary(content_type, boundary) || + !detail::parse_multipart_formdata(boundary, req.body, req.files)) { + res.status = 400; + write_response(strm, last_connection, req, res); + return true; + } } } @@ -1010,31 +1954,33 @@ inline void Server::process_request(Stream& strm) } else { res.status = 404; } - assert(res.status != -1); - if (400 <= res.status && error_handler_) { - error_handler_(req, res); - } + write_response(strm, last_connection, req, res); + return true; +} - detail::write_response(strm, req, res); - - if (logger_) { - logger_(req, res); - } +inline bool Server::is_valid() const +{ + return true; } inline bool Server::read_and_close_socket(socket_t sock) { - return detail::read_and_close_socket(sock, [this](Stream& strm) { - process_request(strm); - return true; - }); + return detail::read_and_close_socket( + sock, + keep_alive_max_count_, + [this](Stream& strm, bool last_connection, bool& connection_close) { + return process_request(strm, last_connection, connection_close); + }); } // HTTP client implementation -inline Client::Client(const char* host, int port) +inline Client::Client( + const char* host, int port, time_t timeout_sec) : host_(host) , port_(port) + , timeout_sec_(timeout_sec) + , host_and_port_(host_ + ":" + std::to_string(port_)) { } @@ -1042,100 +1988,228 @@ inline Client::~Client() { } +inline bool Client::is_valid() const +{ + return true; +} + +inline socket_t Client::create_client_socket() const +{ + return detail::create_socket(host_.c_str(), port_, + [=](socket_t sock, struct addrinfo& ai) -> bool { + detail::set_nonblocking(sock, true); + + auto ret = connect(sock, ai.ai_addr, ai.ai_addrlen); + if (ret < 0) { + if (detail::is_connection_error() || + !detail::wait_until_socket_is_ready(sock, timeout_sec_, 0)) { + detail::close_socket(sock); + return false; + } + } + + detail::set_nonblocking(sock, false); + return true; + }); +} + inline bool Client::read_response_line(Stream& strm, Response& res) { - const auto BUFSIZ_RESPONSELINE = 2048; - char buf[BUFSIZ_RESPONSELINE]; - if (!detail::socket_gets(strm, buf, BUFSIZ_RESPONSELINE)) { + const auto bufsiz = 2048; + char buf[bufsiz]; + + detail::stream_line_reader reader(strm, buf, bufsiz); + + if (!reader.getline()) { return false; } - const static std::regex re("HTTP/1\\.[01] (\\d+?) .+\r\n"); + const static std::regex re("(HTTP/1\\.[01]) (\\d+?) .+\r\n"); std::cmatch m; - if (std::regex_match(buf, m, re)) { - res.status = std::stoi(std::string(m[1])); + if (std::regex_match(reader.ptr(), m, re)) { + res.version = std::string(m[1]); + res.status = std::stoi(std::string(m[2])); } return true; } -inline bool Client::send(const Request& req, Response& res) +inline bool Client::send(Request& req, Response& res) { - auto sock = detail::create_client_socket(host_.c_str(), port_); - if (sock == -1) { + if (req.path.empty()) { + return false; + } + + auto sock = create_client_socket(); + if (sock == INVALID_SOCKET) { return false; } return read_and_close_socket(sock, req, res); } -inline bool Client::process_request(Stream& strm, const Request& req, Response& res) +inline void Client::write_request(Stream& strm, Request& req) +{ + BufferStream bstrm; + + // Request line + auto path = detail::encode_url(req.path); + + bstrm.write_format("%s %s HTTP/1.1\r\n", + req.method.c_str(), + path.c_str()); + + // Headers + if (is_ssl()) { + if (port_ == 443) { + req.set_header("Host", host_.c_str()); + } else { + req.set_header("Host", host_and_port_.c_str()); + } + } else { + if (port_ == 80) { + req.set_header("Host", host_.c_str()); + } else { + req.set_header("Host", host_and_port_.c_str()); + } + } + + if (!req.has_header("Accept")) { + req.set_header("Accept", "*/*"); + } + + if (!req.has_header("User-Agent")) { + req.set_header("User-Agent", "cpp-httplib/0.2"); + } + + // TODO: Support KeepAlive connection + // if (!req.has_header("Connection")) { + req.set_header("Connection", "close"); + // } + + if (req.body.empty()) { + if (req.method == "POST" || req.method == "PUT") { + req.set_header("Content-Length", "0"); + } + } else { + if (!req.has_header("Content-Type")) { + req.set_header("Content-Type", "text/plain"); + } + + auto length = std::to_string(req.body.size()); + req.set_header("Content-Length", length.c_str()); + } + + detail::write_headers(bstrm, req); + + // Body + if (!req.body.empty()) { + bstrm.write(req.body.c_str(), req.body.size()); + } + + // Flush buffer + auto& data = bstrm.get_buffer(); + strm.write(data.data(), data.size()); +} + +inline bool Client::process_request(Stream& strm, Request& req, Response& res, bool& connection_close) { // Send request - detail::write_request(strm, req); + write_request(strm, req); - // Receive response - if (!read_response_line(strm, res) || - !detail::read_headers(strm, res.headers)) { + // Receive response and headers + if (!read_response_line(strm, res) || !detail::read_headers(strm, res.headers)) { return false; } + + if (res.get_header_value("Connection") == "close" || res.version == "HTTP/1.0") { + connection_close = true; + } + + // Body if (req.method != "HEAD") { - if (!detail::read_content(strm, res, true)) { + if (!detail::read_content(strm, res, req.progress)) { return false; } + + if (res.get_header_value("Content-Encoding") == "gzip") { +#ifdef CPPHTTPLIB_ZLIB_SUPPORT + detail::decompress(res.body); +#else + return false; +#endif + } } return true; } -inline bool Client::read_and_close_socket(socket_t sock, const Request& req, Response& res) +inline bool Client::read_and_close_socket(socket_t sock, Request& req, Response& res) { - return detail::read_and_close_socket(sock, [&](Stream& strm) { - return process_request(strm, req, res); - }); + return detail::read_and_close_socket( + sock, + 0, + [&](Stream& strm, bool /*last_connection*/, bool& connection_close) { + return process_request(strm, req, res, connection_close); + }); } -inline void Client::add_default_headers(Request& req) +inline bool Client::is_ssl() const { - req.set_header("Host", host_.c_str()); - req.set_header("Accept", "*/*"); - req.set_header("User-Agent", "cpp-httplib/0.1"); + return false; } -inline std::shared_ptr Client::get(const char* path) +inline std::shared_ptr Client::Get(const char* path, Progress progress) +{ + return Get(path, Headers(), progress); +} + +inline std::shared_ptr Client::Get(const char* path, const Headers& headers, Progress progress) { Request req; req.method = "GET"; req.path = path; - add_default_headers(req); + req.headers = headers; + req.progress = progress; auto res = std::make_shared(); return send(req, *res) ? res : nullptr; } -inline std::shared_ptr Client::head(const char* path) +inline std::shared_ptr Client::Head(const char* path) +{ + return Head(path, Headers()); +} + +inline std::shared_ptr Client::Head(const char* path, const Headers& headers) { Request req; req.method = "HEAD"; + req.headers = headers; req.path = path; - add_default_headers(req); auto res = std::make_shared(); return send(req, *res) ? res : nullptr; } -inline std::shared_ptr Client::post( +inline std::shared_ptr Client::Post( const char* path, const std::string& body, const char* content_type) +{ + return Post(path, Headers(), body, content_type); +} + +inline std::shared_ptr Client::Post( + const char* path, const Headers& headers, const std::string& body, const char* content_type) { Request req; req.method = "POST"; + req.headers = headers; req.path = path; - add_default_headers(req); - req.set_header("Content-Type", content_type); + req.headers.emplace("Content-Type", content_type); req.body = body; auto res = std::make_shared(); @@ -1143,8 +2217,12 @@ inline std::shared_ptr Client::post( return send(req, *res) ? res : nullptr; } -inline std::shared_ptr Client::post( - const char* path, const Map& params) +inline std::shared_ptr Client::Post(const char* path, const Params& params) +{ + return Post(path, Headers(), params); +} + +inline std::shared_ptr Client::Post(const char* path, const Headers& headers, const Params& params) { std::string query; for (auto it = params.begin(); it != params.end(); ++it) { @@ -1156,7 +2234,63 @@ inline std::shared_ptr Client::post( query += it->second; } - return post(path, query, "application/x-www-form-urlencoded"); + return Post(path, headers, query, "application/x-www-form-urlencoded"); +} + +inline std::shared_ptr Client::Put( + const char* path, const std::string& body, const char* content_type) +{ + return Put(path, Headers(), body, content_type); +} + +inline std::shared_ptr Client::Put( + const char* path, const Headers& headers, const std::string& body, const char* content_type) +{ + Request req; + req.method = "PUT"; + req.headers = headers; + req.path = path; + + req.headers.emplace("Content-Type", content_type); + req.body = body; + + auto res = std::make_shared(); + + return send(req, *res) ? res : nullptr; +} + +inline std::shared_ptr Client::Delete(const char* path) +{ + return Delete(path, Headers()); +} + +inline std::shared_ptr Client::Delete(const char* path, const Headers& headers) +{ + Request req; + req.method = "DELETE"; + req.path = path; + req.headers = headers; + + auto res = std::make_shared(); + + return send(req, *res) ? res : nullptr; +} + +inline std::shared_ptr Client::Options(const char* path) +{ + return Options(path, Headers()); +} + +inline std::shared_ptr Client::Options(const char* path, const Headers& headers) +{ + Request req; + req.method = "OPTIONS"; + req.path = path; + req.headers = headers; + + auto res = std::make_shared(); + + return send(req, *res) ? res : nullptr; } /* @@ -1166,9 +2300,23 @@ inline std::shared_ptr Client::post( namespace detail { template -inline bool read_and_close_socket_ssl(socket_t sock, SSL_CTX* ctx, U SSL_connect_or_accept, V setup, T callback) +inline bool read_and_close_socket_ssl( + socket_t sock, size_t keep_alive_max_count, + // TODO: OpenSSL 1.0.2 occasionally crashes... + // The upcoming 1.1.0 is going to be thread safe. + SSL_CTX* ctx, std::mutex& ctx_mutex, + U SSL_connect_or_accept, V setup, + T callback) { - auto ssl = SSL_new(ctx); + SSL* ssl = nullptr; + { + std::lock_guard guard(ctx_mutex); + + ssl = SSL_new(ctx); + if (!ssl) { + return false; + } + } auto bio = BIO_new_socket(sock, BIO_NOCLOSE); SSL_set_bio(ssl, bio, bio); @@ -1177,12 +2325,40 @@ inline bool read_and_close_socket_ssl(socket_t sock, SSL_CTX* ctx, U SSL_connect SSL_connect_or_accept(ssl); - SSLSocketStream strm(ssl); - auto ret = callback(strm); + bool ret = false; + + if (keep_alive_max_count > 0) { + auto count = keep_alive_max_count; + while (count > 0 && + detail::select_read(sock, + CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND, + CPPHTTPLIB_KEEPALIVE_TIMEOUT_USECOND) > 0) { + SSLSocketStream strm(sock, ssl); + auto last_connection = count == 1; + auto connection_close = false; + + ret = callback(strm, last_connection, connection_close); + if (!ret || connection_close) { + break; + } + + count--; + } + } else { + SSLSocketStream strm(sock, ssl); + auto dummy_connection_close = false; + ret = callback(strm, true, dummy_connection_close); + } SSL_shutdown(ssl); - SSL_free(ssl); + + { + std::lock_guard guard(ctx_mutex); + SSL_free(ssl); + } + close_socket(sock); + return ret; } @@ -1199,7 +2375,8 @@ static SSLInit sslinit_; } // namespace detail // SSL socket stream implementation -inline SSLSocketStream::SSLSocketStream(SSL* ssl): ssl_(ssl) +inline SSLSocketStream::SSLSocketStream(socket_t sock, SSL* ssl) + : sock_(sock), ssl_(ssl) { } @@ -1222,6 +2399,10 @@ inline int SSLSocketStream::write(const char* ptr) return write(ptr, strlen(ptr)); } +inline std::string SSLSocketStream::get_remote_addr() const { + return detail::get_remote_addr(sock_); +} + // SSL HTTP server implementation inline SSLServer::SSLServer(const char* cert_path, const char* private_key_path) { @@ -1237,7 +2418,7 @@ inline SSLServer::SSLServer(const char* cert_path, const char* private_key_path) // SSL_CTX_set_tmp_ecdh(ctx_, ecdh); // EC_KEY_free(ecdh); - if (SSL_CTX_use_certificate_file(ctx_, cert_path, SSL_FILETYPE_PEM) != 1 || + if (SSL_CTX_use_certificate_chain_file(ctx_, cert_path) != 1 || SSL_CTX_use_PrivateKey_file(ctx_, private_key_path, SSL_FILETYPE_PEM) != 1) { SSL_CTX_free(ctx_); ctx_ = nullptr; @@ -1252,21 +2433,27 @@ inline SSLServer::~SSLServer() } } +inline bool SSLServer::is_valid() const +{ + return ctx_; +} + inline bool SSLServer::read_and_close_socket(socket_t sock) { return detail::read_and_close_socket_ssl( - sock, ctx_, + sock, + keep_alive_max_count_, + ctx_, ctx_mutex_, SSL_accept, - [](SSL* ssl) {}, - [this](Stream& strm) { - process_request(strm); - return true; + [](SSL* /*ssl*/) {}, + [this](Stream& strm, bool last_connection, bool& connection_close) { + return process_request(strm, last_connection, connection_close); }); } // SSL HTTP client implementation -inline SSLClient::SSLClient(const char* host, int port) - : Client(host, port) +inline SSLClient::SSLClient(const char* host, int port, time_t timeout_sec) + : Client(host, port, timeout_sec) { ctx_ = SSL_CTX_new(SSLv23_client_method()); } @@ -1278,22 +2465,33 @@ inline SSLClient::~SSLClient() } } -inline bool SSLClient::read_and_close_socket(socket_t sock, const Request& req, Response& res) +inline bool SSLClient::is_valid() const { - return detail::read_and_close_socket_ssl( - sock, ctx_, + return ctx_; +} + +inline bool SSLClient::read_and_close_socket(socket_t sock, Request& req, Response& res) +{ + return is_valid() && detail::read_and_close_socket_ssl( + sock, 0, + ctx_, ctx_mutex_, SSL_connect, [&](SSL* ssl) { SSL_set_tlsext_host_name(ssl, host_.c_str()); }, - [&](Stream& strm) { - return process_request(strm, req, res); + [&](Stream& strm, bool /*last_connection*/, bool& connection_close) { + return process_request(strm, req, res, connection_close); }); } + +inline bool SSLClient::is_ssl() const +{ + return true; +} #endif } // namespace httplib -#endif +#endif //CPPHTTPLIB_HTTPLIB_H // vim: et ts=4 sw=4 cin cino={1s ff=unix diff --git a/test/Makefile b/test/Makefile index 3672ccb..0a72252 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,17 +1,20 @@ CC = clang++ -CFLAGS = -std=c++14 -DGTEST_USE_OWN_TR1_TUPLE -I.. -I. -#OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto +#CC = g++ + +CFLAGS = -ggdb -O0 -std=c++11 -DGTEST_USE_OWN_TR1_TUPLE -I.. -I. -Wall -Wextra -Wtype-limits +OPENSSL_SUPPORT = -DCPPHTTPLIB_OPENSSL_SUPPORT -I/usr/local/opt/openssl/include -L/usr/local/opt/openssl/lib -lssl -lcrypto +ZLIB_SUPPORT = -DCPPHTTPLIB_ZLIB_SUPPORT -lz all : test ./test -test : test.cc ../httplib.h - $(CC) -o test $(CFLAGS) test.cc gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) +test : test.cc ../httplib.h Makefile cert.pem + $(CC) -o test $(CFLAGS) test.cc gtest/gtest-all.cc gtest/gtest_main.cc $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) -lpthread -pem: +cert.pem: openssl genrsa 2048 > key.pem - openssl req -new -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem + openssl req -new -batch -config test.conf -key key.pem | openssl x509 -days 3650 -req -signkey key.pem > cert.pem clean: - rm test *.pem + rm -f test *.pem diff --git a/test/image.jpg b/test/image.jpg new file mode 100644 index 0000000..f74b495 Binary files /dev/null and b/test/image.jpg differ diff --git a/test/test.cc b/test/test.cc index 98f0954..d87f104 100644 --- a/test/test.cc +++ b/test/test.cc @@ -20,6 +20,11 @@ using namespace httplib; const char* HOST = "localhost"; const int PORT = 1234; +const string LONG_QUERY_VALUE = string(25000, '@'); +const string LONG_QUERY_URL = "/long-query-value?key=" + LONG_QUERY_VALUE; + +const std::string JSON_DATA = "{\"hello\":\"world\"}"; + #ifdef _WIN32 TEST(StartupTest, WSAStartup) { @@ -32,7 +37,7 @@ TEST(StartupTest, WSAStartup) TEST(SplitTest, ParseQueryString) { string s = "key1=val1&key2=val2&key3=val3"; - map dic; + Params dic; detail::split(s.c_str(), s.c_str() + s.size(), '&', [&](const char* b, const char* e) { string key, val; @@ -43,72 +48,260 @@ TEST(SplitTest, ParseQueryString) val.assign(b, e); } }); - dic[key] = val; + dic.emplace(key, val); }); - EXPECT_EQ("val1", dic["key1"]); - EXPECT_EQ("val2", dic["key2"]); - EXPECT_EQ("val3", dic["key3"]); + EXPECT_EQ("val1", dic.find("key1")->second); + EXPECT_EQ("val2", dic.find("key2")->second); + EXPECT_EQ("val3", dic.find("key3")->second); } TEST(ParseQueryTest, ParseQueryString) { string s = "key1=val1&key2=val2&key3=val3"; - map dic; + Params dic; detail::parse_query_text(s, dic); - EXPECT_EQ("val1", dic["key1"]); - EXPECT_EQ("val2", dic["key2"]); - EXPECT_EQ("val3", dic["key3"]); -} - -TEST(SocketTest, OpenClose) -{ - socket_t sock = detail::create_server_socket(HOST, PORT, 0); - ASSERT_NE(-1, sock); - - auto ret = detail::close_socket(sock); - EXPECT_EQ(0, ret); -} - -TEST(SocketTest, OpenCloseWithAI_PASSIVE) -{ - socket_t sock = detail::create_server_socket(nullptr, PORT, AI_PASSIVE); - ASSERT_NE(-1, sock); - - auto ret = detail::close_socket(sock); - EXPECT_EQ(0, ret); + EXPECT_EQ("val1", dic.find("key1")->second); + EXPECT_EQ("val2", dic.find("key2")->second); + EXPECT_EQ("val3", dic.find("key3")->second); } TEST(GetHeaderValueTest, DefaultValue) { - MultiMap map = {{"Dummy","Dummy"}}; - auto val = detail::get_header_value(map, "Content-Type", "text/plain"); - ASSERT_STREQ("text/plain", val); + Headers headers = {{"Dummy","Dummy"}}; + auto val = detail::get_header_value(headers, "Content-Type", 0, "text/plain"); + EXPECT_STREQ("text/plain", val); } TEST(GetHeaderValueTest, DefaultValueInt) { - MultiMap map = {{"Dummy","Dummy"}}; - auto val = detail::get_header_value_int(map, "Content-Length", 100); + Headers headers = {{"Dummy","Dummy"}}; + auto val = detail::get_header_value_int(headers, "Content-Length", 100); EXPECT_EQ(100, val); } TEST(GetHeaderValueTest, RegularValue) { - MultiMap map = {{"Content-Type", "text/html"}, {"Dummy", "Dummy"}}; - auto val = detail::get_header_value(map, "Content-Type", "text/plain"); - ASSERT_STREQ("text/html", val); + Headers headers = {{"Content-Type", "text/html"}, {"Dummy", "Dummy"}}; + auto val = detail::get_header_value(headers, "Content-Type", 0, "text/plain"); + EXPECT_STREQ("text/html", val); } TEST(GetHeaderValueTest, RegularValueInt) { - MultiMap map = {{"Content-Length", "100"}, {"Dummy", "Dummy"}}; - auto val = detail::get_header_value_int(map, "Content-Length", 0); + Headers headers = {{"Content-Length", "100"}, {"Dummy", "Dummy"}}; + auto val = detail::get_header_value_int(headers, "Content-Length", 0); EXPECT_EQ(100, val); } +TEST(GetHeaderValueTest, Range) +{ + { + Headers headers = { make_range_header(1) }; + auto val = detail::get_header_value(headers, "Range", 0, 0); + EXPECT_STREQ("bytes=1-", val); + } + + { + Headers headers = { make_range_header(1, 10) }; + auto val = detail::get_header_value(headers, "Range", 0, 0); + EXPECT_STREQ("bytes=1-10", val); + } + + { + Headers headers = { make_range_header(1, 10, 100) }; + auto val = detail::get_header_value(headers, "Range", 0, 0); + EXPECT_STREQ("bytes=1-10, 100-", val); + } + + { + Headers headers = { make_range_header(1, 10, 100, 200) }; + auto val = detail::get_header_value(headers, "Range", 0, 0); + EXPECT_STREQ("bytes=1-10, 100-200", val); + } +} + +TEST(ChunkedEncodingTest, FromHTTPWatch) +{ + auto host = "www.httpwatch.com"; + auto sec = 2; + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + auto port = 443; + httplib::SSLClient cli(host, port, sec); +#else + auto port = 80; + httplib::Client cli(host, port, sec); +#endif + + auto res = cli.Get("/httpgallery/chunked/chunkedimage.aspx?0.4153841143030137"); + ASSERT_TRUE(res != nullptr); + + std::string out; + httplib::detail::read_file("./image.jpg", out); + + EXPECT_EQ(200, res->status); + EXPECT_EQ(out, res->body); +} + +TEST(RangeTest, FromHTTPBin) +{ + auto host = "httpbin.org"; + auto sec = 5; + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + auto port = 443; + httplib::SSLClient cli(host, port, sec); +#else + auto port = 80; + httplib::Client cli(host, port, sec); +#endif + + { + httplib::Headers headers; + auto res = cli.Get("/range/32", headers); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(res->body, "abcdefghijklmnopqrstuvwxyzabcdef"); + EXPECT_EQ(200, res->status); + } + + { + httplib::Headers headers = { httplib::make_range_header(1) }; + auto res = cli.Get("/range/32", headers); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(res->body, "bcdefghijklmnopqrstuvwxyzabcdef"); + EXPECT_EQ(206, res->status); + } + + { + httplib::Headers headers = { httplib::make_range_header(1, 10) }; + auto res = cli.Get("/range/32", headers); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(res->body, "bcdefghijk"); + EXPECT_EQ(206, res->status); + } +} + +TEST(ConnectionErrorTest, InvalidHost) +{ + auto host = "abcde.com"; + auto sec = 2; + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + auto port = 443; + httplib::SSLClient cli(host, port, sec); +#else + auto port = 80; + httplib::Client cli(host, port, sec); +#endif + + auto res = cli.Get("/"); + ASSERT_TRUE(res == nullptr); +} + +TEST(ConnectionErrorTest, InvalidPort) +{ + auto host = "localhost"; + auto sec = 2; + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + auto port = 44380; + httplib::SSLClient cli(host, port, sec); +#else + auto port = 8080; + httplib::Client cli(host, port, sec); +#endif + + auto res = cli.Get("/"); + ASSERT_TRUE(res == nullptr); +} + +TEST(ConnectionErrorTest, Timeout) +{ + auto host = "google.com"; + auto sec = 2; + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + auto port = 44380; + httplib::SSLClient cli(host, port, sec); +#else + auto port = 8080; + httplib::Client cli(host, port, sec); +#endif + + auto res = cli.Get("/"); + ASSERT_TRUE(res == nullptr); +} + +TEST(CancelTest, NoCancel) { + auto host = "httpbin.org"; + auto sec = 5; + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + auto port = 443; + httplib::SSLClient cli(host, port, sec); +#else + auto port = 80; + httplib::Client cli(host, port, sec); +#endif + + httplib::Headers headers; + auto res = cli.Get("/range/32", headers, [](uint64_t, uint64_t) { + return true; + }); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(res->body, "abcdefghijklmnopqrstuvwxyzabcdef"); + EXPECT_EQ(200, res->status); +} + +TEST(CancelTest, WithCancelSmallPayload) { + auto host = "httpbin.org"; + auto sec = 5; + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + auto port = 443; + httplib::SSLClient cli(host, port, sec); +#else + auto port = 80; + httplib::Client cli(host, port, sec); +#endif + + httplib::Headers headers; + auto res = cli.Get("/range/32", headers, [](uint64_t, uint64_t) { + return false; + }); + ASSERT_TRUE(res == nullptr); +} + +TEST(CancelTest, WithCancelLargePayload) { + auto host = "httpbin.org"; + auto sec = 5; + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + auto port = 443; + httplib::SSLClient cli(host, port, sec); +#else + auto port = 80; + httplib::Client cli(host, port, sec); +#endif + + uint32_t count = 0; + httplib::Headers headers; + auto res = cli.Get("/range/65536", headers, [&count](uint64_t, uint64_t) { + return (count++ == 0); + }); + ASSERT_TRUE(res == nullptr); +} + +TEST(Server, BindAndListenSeparately) { + Server svr; + int port = svr.bind_to_any_port("localhost"); + ASSERT_TRUE(port > 0); + svr.stop(); +} + class ServerTest : public ::testing::Test { protected: ServerTest() @@ -116,57 +309,178 @@ protected: #ifdef CPPHTTPLIB_OPENSSL_SUPPORT , svr_(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE) #endif - , up_(false) {} + {} virtual void SetUp() { svr_.set_base_dir("./www"); - svr_.get("/hi", [&](const Request& req, Response& res) { - res.set_content("Hello World!", "text/plain"); - }); + svr_.Get("/hi", [&](const Request& /*req*/, Response& res) { + res.set_content("Hello World!", "text/plain"); + }) + .Get("/slow", [&](const Request& /*req*/, Response& res) { + msleep(2000); + res.set_content("slow", "text/plain"); + }) + .Get("/remote_addr", [&](const Request& req, Response& res) { + auto remote_addr = req.headers.find("REMOTE_ADDR")->second; + res.set_content(remote_addr.c_str(), "text/plain"); + }) + .Get("/endwith%", [&](const Request& /*req*/, Response& res) { + res.set_content("Hello World!", "text/plain"); + }) + .Get("/", [&](const Request& /*req*/, Response& res) { + res.set_redirect("/hi"); + }) + .Post("/person", [&](const Request& req, Response& res) { + if (req.has_param("name") && req.has_param("note")) { + persons_[req.get_param_value("name")] = req.get_param_value("note"); + } else { + res.status = 400; + } + }) + .Get("/person/(.*)", [&](const Request& req, Response& res) { + string name = req.matches[1]; + if (persons_.find(name) != persons_.end()) { + auto note = persons_[name]; + res.set_content(note, "text/plain"); + } else { + res.status = 404; + } + }) + .Post("/x-www-form-urlencoded-json", [&](const Request& req, Response& res) { + auto json = req.get_param_value("json"); + ASSERT_EQ(JSON_DATA, json); + res.set_content(json, "appliation/json"); + res.status = 200; + }) + .Get("/streamedchunked", [&](const Request& /*req*/, Response& res) { + res.streamcb = [] (uint64_t offset) { + if (offset < 3) + return "a"; + if (offset < 6) + return "b"; + return ""; + }; + }) + .Get("/streamed", [&](const Request& /*req*/, Response& res) { + res.set_header("Content-Length", "6"); + res.streamcb = [] (uint64_t offset) { + if (offset < 3) + return "a"; + if (offset < 6) + return "b"; + return ""; + }; + }) + .Post("/chunked", [&](const Request& req, Response& /*res*/) { + EXPECT_EQ(req.body, "dechunked post body"); + }) + .Post("/largechunked", [&](const Request& req, Response& /*res*/) { + std::string expected(6 * 30 * 1024u, 'a'); + EXPECT_EQ(req.body, expected); + }) + .Post("/multipart", [&](const Request& req, Response& /*res*/) { + EXPECT_EQ(5u, req.files.size()); + ASSERT_TRUE(!req.has_file("???")); - svr_.get("/", [&](const Request& req, Response& res) { - res.set_redirect("/hi"); - }); + { + const auto& file = req.get_file_value("text1"); + EXPECT_EQ("", file.filename); + EXPECT_EQ("text default", req.body.substr(file.offset, file.length)); + } - svr_.post("/person", [&](const Request& req, Response& res) { - if (req.has_param("name") && req.has_param("note")) { - persons_[req.params.at("name")] = req.params.at("note"); - } else { - res.status = 400; - } - }); + { + const auto& file = req.get_file_value("text2"); + EXPECT_EQ("", file.filename); + EXPECT_EQ("aωb", req.body.substr(file.offset, file.length)); + } - svr_.get("/person/(.*)", [&](const Request& req, Response& res) { - string name = req.matches[1]; - if (persons_.find(name) != persons_.end()) { - auto note = persons_[name]; - res.set_content(note, "text/plain"); - } else { - res.status = 404; - } - }); + { + const auto& file = req.get_file_value("file1"); + EXPECT_EQ("hello.txt", file.filename); + EXPECT_EQ("text/plain", file.content_type); + EXPECT_EQ("h\ne\n\nl\nl\no\n", req.body.substr(file.offset, file.length)); + } - svr_.get("/stop", [&](const Request& req, Response& res) { - svr_.stop(); - }); + { + const auto& file = req.get_file_value("file3"); + EXPECT_EQ("", file.filename); + EXPECT_EQ("application/octet-stream", file.content_type); + EXPECT_EQ(0u, file.length); + } + }) + .Post("/empty", [&](const Request& req, Response& res) { + EXPECT_EQ(req.body, ""); + res.set_content("empty", "text/plain"); + }) + .Put("/put", [&](const Request& req, Response& res) { + EXPECT_EQ(req.body, "PUT"); + res.set_content(req.body, "text/plain"); + }) + .Delete("/delete", [&](const Request& /*req*/, Response& res) { + res.set_content("DELETE", "text/plain"); + }) + .Options(R"(\*)", [&](const Request& /*req*/, Response& res) { + res.set_header("Allow", "GET, POST, HEAD, OPTIONS"); + }) + .Get("/request-target", [&](const Request& req, Response& /*res*/) { + EXPECT_EQ("/request-target?aaa=bbb&ccc=ddd", req.target); + EXPECT_EQ("bbb", req.get_param_value("aaa")); + EXPECT_EQ("ddd", req.get_param_value("ccc")); + }) + .Get("/long-query-value", [&](const Request& req, Response& /*res*/) { + EXPECT_EQ(LONG_QUERY_URL, req.target); + EXPECT_EQ(LONG_QUERY_VALUE, req.get_param_value("key")); + }) + .Get("/array-param", [&](const Request& req, Response& /*res*/) { + EXPECT_EQ(3u, req.get_param_value_count("array")); + EXPECT_EQ("value1", req.get_param_value("array", 0)); + EXPECT_EQ("value2", req.get_param_value("array", 1)); + EXPECT_EQ("value3", req.get_param_value("array", 2)); + }) +#ifdef CPPHTTPLIB_ZLIB_SUPPORT + .Get("/gzip", [&](const Request& /*req*/, Response& res) { + res.set_content("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890", "text/plain"); + }) + .Get("/nogzip", [&](const Request& /*req*/, Response& res) { + res.set_content("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890", "application/octet-stream"); + }) + .Post("/gzipmultipart", [&](const Request& req, Response& /*res*/) { + EXPECT_EQ(2u, req.files.size()); + ASSERT_TRUE(!req.has_file("???")); + + { + const auto& file = req.get_file_value("key1"); + EXPECT_EQ("", file.filename); + EXPECT_EQ("test", req.body.substr(file.offset, file.length)); + } + + { + const auto& file = req.get_file_value("key2"); + EXPECT_EQ("", file.filename); + EXPECT_EQ("--abcdefg123", req.body.substr(file.offset, file.length)); + } + }) +#endif + ; persons_["john"] = "programmer"; - f_ = async([&](){ - up_ = true; - svr_.listen(HOST, PORT); + t_ = thread([&](){ + ASSERT_TRUE(svr_.listen(HOST, PORT)); }); - while (!up_) { + while (!svr_.is_running()) { msleep(1); } } virtual void TearDown() { - //svr_.stop(); // NOTE: This causes dead lock on Windows. - cli_.get("/stop"); - f_.get(); + svr_.stop(); + for (auto& t: request_threads_) { + t.join(); + } + t_.join(); } map persons_; @@ -177,22 +491,25 @@ protected: Client cli_; Server svr_; #endif - future f_; - bool up_; + thread t_; + std::vector request_threads_; }; TEST_F(ServerTest, GetMethod200) { - auto res = cli_.get("/hi"); + auto res = cli_.Get("/hi"); ASSERT_TRUE(res != nullptr); + EXPECT_EQ("HTTP/1.1", res->version); EXPECT_EQ(200, res->status); EXPECT_EQ("text/plain", res->get_header_value("Content-Type")); + EXPECT_EQ(1, res->get_header_value_count("Content-Type")); + EXPECT_EQ("close", res->get_header_value("Connection")); EXPECT_EQ("Hello World!", res->body); } TEST_F(ServerTest, GetMethod302) { - auto res = cli_.get("/"); + auto res = cli_.Get("/"); ASSERT_TRUE(res != nullptr); EXPECT_EQ(302, res->status); EXPECT_EQ("/hi", res->get_header_value("Location")); @@ -200,14 +517,14 @@ TEST_F(ServerTest, GetMethod302) TEST_F(ServerTest, GetMethod404) { - auto res = cli_.get("/invalid"); + auto res = cli_.Get("/invalid"); ASSERT_TRUE(res != nullptr); EXPECT_EQ(404, res->status); } TEST_F(ServerTest, HeadMethod200) { - auto res = cli_.head("/hi"); + auto res = cli_.Head("/hi"); ASSERT_TRUE(res != nullptr); EXPECT_EQ(200, res->status); EXPECT_EQ("text/plain", res->get_header_value("Content-Type")); @@ -216,7 +533,7 @@ TEST_F(ServerTest, HeadMethod200) TEST_F(ServerTest, HeadMethod404) { - auto res = cli_.head("/invalid"); + auto res = cli_.Head("/invalid"); ASSERT_TRUE(res != nullptr); EXPECT_EQ(404, res->status); EXPECT_EQ("", res->body); @@ -224,7 +541,7 @@ TEST_F(ServerTest, HeadMethod404) TEST_F(ServerTest, GetMethodPersonJohn) { - auto res = cli_.get("/person/john"); + auto res = cli_.Get("/person/john"); ASSERT_TRUE(res != nullptr); EXPECT_EQ(200, res->status); EXPECT_EQ("text/plain", res->get_header_value("Content-Type")); @@ -233,15 +550,15 @@ TEST_F(ServerTest, GetMethodPersonJohn) TEST_F(ServerTest, PostMethod1) { - auto res = cli_.get("/person/john1"); + auto res = cli_.Get("/person/john1"); ASSERT_TRUE(res != nullptr); ASSERT_EQ(404, res->status); - res = cli_.post("/person", "name=john1¬e=coder", "application/x-www-form-urlencoded"); + res = cli_.Post("/person", "name=john1¬e=coder", "application/x-www-form-urlencoded"); ASSERT_TRUE(res != nullptr); ASSERT_EQ(200, res->status); - res = cli_.get("/person/john1"); + res = cli_.Get("/person/john1"); ASSERT_TRUE(res != nullptr); ASSERT_EQ(200, res->status); ASSERT_EQ("text/plain", res->get_header_value("Content-Type")); @@ -250,28 +567,48 @@ TEST_F(ServerTest, PostMethod1) TEST_F(ServerTest, PostMethod2) { - auto res = cli_.get("/person/john2"); + auto res = cli_.Get("/person/john2"); ASSERT_TRUE(res != nullptr); ASSERT_EQ(404, res->status); - Map params; - params["name"] = "john2"; - params["note"] = "coder"; + Params params; + params.emplace("name", "john2"); + params.emplace("note", "coder"); - res = cli_.post("/person", params); + res = cli_.Post("/person", params); ASSERT_TRUE(res != nullptr); ASSERT_EQ(200, res->status); - res = cli_.get("/person/john2"); + res = cli_.Get("/person/john2"); ASSERT_TRUE(res != nullptr); ASSERT_EQ(200, res->status); ASSERT_EQ("text/plain", res->get_header_value("Content-Type")); ASSERT_EQ("coder", res->body); } +TEST_F(ServerTest, PostWwwFormUrlEncodedJson) +{ + Params params; + params.emplace("json", JSON_DATA); + + auto res = cli_.Post("/x-www-form-urlencoded-json", params); + + ASSERT_TRUE(res != nullptr); + ASSERT_EQ(200, res->status); + ASSERT_EQ(JSON_DATA, res->body); +} + +TEST_F(ServerTest, PostEmptyContent) +{ + auto res = cli_.Post("/empty", "", "text/plain"); + ASSERT_TRUE(res != nullptr); + ASSERT_EQ(200, res->status); + ASSERT_EQ("empty", res->body); +} + TEST_F(ServerTest, GetMethodDir) { - auto res = cli_.get("/dir/"); + auto res = cli_.Get("/dir/"); ASSERT_TRUE(res != nullptr); EXPECT_EQ(200, res->status); EXPECT_EQ("text/html", res->get_header_value("Content-Type")); @@ -290,19 +627,411 @@ TEST_F(ServerTest, GetMethodDir) TEST_F(ServerTest, GetMethodDirTest) { - auto res = cli_.get("/dir/test.html"); + auto res = cli_.Get("/dir/test.html"); ASSERT_TRUE(res != nullptr); EXPECT_EQ(200, res->status); EXPECT_EQ("text/html", res->get_header_value("Content-Type")); EXPECT_EQ("test.html", res->body); } +TEST_F(ServerTest, GetMethodDirTestWithDoubleDots) +{ + auto res = cli_.Get("/dir/../dir/test.html"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); + EXPECT_EQ("text/html", res->get_header_value("Content-Type")); + EXPECT_EQ("test.html", res->body); +} + +TEST_F(ServerTest, GetMethodInvalidPath) +{ + auto res = cli_.Get("/dir/../test.html"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(404, res->status); +} + +TEST_F(ServerTest, GetMethodOutOfBaseDir) +{ + auto res = cli_.Get("/../www/dir/test.html"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(404, res->status); +} + +TEST_F(ServerTest, GetMethodOutOfBaseDir2) +{ + auto res = cli_.Get("/dir/../../www/dir/test.html"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(404, res->status); +} + TEST_F(ServerTest, InvalidBaseDir) { EXPECT_EQ(false, svr_.set_base_dir("invalid_dir")); EXPECT_EQ(true, svr_.set_base_dir(".")); } +TEST_F(ServerTest, EmptyRequest) +{ + auto res = cli_.Get(""); + ASSERT_TRUE(res == nullptr); +} + +TEST_F(ServerTest, LongRequest) +{ + auto res = cli_.Get("/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/__ok__"); + + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(404, res->status); +} + +TEST_F(ServerTest, TooLongRequest) +{ + auto res = cli_.Get("/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/TooLongRequest/__ng___"); + + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(404, res->status); +} + +TEST_F(ServerTest, LongHeader) +{ + Request req; + req.method = "GET"; + req.path = "/hi"; + + std::string host_and_port; + host_and_port += HOST; + host_and_port += ":"; + host_and_port += std::to_string(PORT); + + req.headers.emplace("Host", host_and_port.c_str()); + req.headers.emplace("Accept", "*/*"); + req.headers.emplace("User-Agent", "cpp-httplib/0.1"); + + req.headers.emplace("Header-Name", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); + + auto res = std::make_shared(); + auto ret = cli_.send(req, *res); + + ASSERT_TRUE(ret); + EXPECT_EQ(200, res->status); +} + +TEST_F(ServerTest, LongQueryValue) +{ + auto res = cli_.Get(LONG_QUERY_URL.c_str()); + + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); +} + +TEST_F(ServerTest, TooLongHeader) +{ + Request req; + req.method = "GET"; + req.path = "/hi"; + + std::string host_and_port; + host_and_port += HOST; + host_and_port += ":"; + host_and_port += std::to_string(PORT); + + req.headers.emplace("Host", host_and_port.c_str()); + req.headers.emplace("Accept", "*/*"); + req.headers.emplace("User-Agent", "cpp-httplib/0.1"); + + req.headers.emplace("Header-Name", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"); + + auto res = std::make_shared(); + auto ret = cli_.send(req, *res); + + ASSERT_TRUE(ret); + EXPECT_EQ(200, res->status); +} + +TEST_F(ServerTest, PercentEncoding) +{ + auto res = cli_.Get("/e%6edwith%"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); +} + +TEST_F(ServerTest, PercentEncodingUnicode) +{ + auto res = cli_.Get("/e%u006edwith%"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); +} + +TEST_F(ServerTest, InvalidPercentEncoding) +{ + auto res = cli_.Get("/%endwith%"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(404, res->status); +} + +TEST_F(ServerTest, InvalidPercentEncodingUnicode) +{ + auto res = cli_.Get("/%uendwith%"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(404, res->status); +} + +TEST_F(ServerTest, EndWithPercentCharacterInQuery) +{ + auto res = cli_.Get("/hello?aaa=bbb%"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(404, res->status); +} + +TEST_F(ServerTest, MultipartFormData) +{ + Request req; + req.method = "POST"; + req.path = "/multipart"; + + std::string host_and_port; + host_and_port += HOST; + host_and_port += ":"; + host_and_port += std::to_string(PORT); + + req.headers.emplace("Host", host_and_port.c_str()); + req.headers.emplace("Accept", "*/*"); + req.headers.emplace("User-Agent", "cpp-httplib/0.1"); + req.headers.emplace("Content-Type", "multipart/form-data; boundary=----WebKitFormBoundarysBREP3G013oUrLB4"); + + req.body = "------WebKitFormBoundarysBREP3G013oUrLB4\r\nContent-Disposition: form-data; name=\"text1\"\r\n\r\ntext default\r\n------WebKitFormBoundarysBREP3G013oUrLB4\r\nContent-Disposition: form-data; name=\"text2\"\r\n\r\naωb\r\n------WebKitFormBoundarysBREP3G013oUrLB4\r\nContent-Disposition: form-data; name=\"file1\"; filename=\"hello.txt\"\r\nContent-Type: text/plain\r\n\r\nh\ne\n\nl\nl\no\n\r\n------WebKitFormBoundarysBREP3G013oUrLB4\r\nContent-Disposition: form-data; name=\"file2\"; filename=\"world.json\"\r\nContent-Type: application/json\r\n\r\n{\n \"world\", true\n}\n\r\n------WebKitFormBoundarysBREP3G013oUrLB4\r\ncontent-disposition: form-data; name=\"file3\"; filename=\"\"\r\ncontent-type: application/octet-stream\r\n\r\n\r\n------WebKitFormBoundarysBREP3G013oUrLB4--\r\n"; + + auto res = std::make_shared(); + auto ret = cli_.send(req, *res); + + ASSERT_TRUE(ret); + EXPECT_EQ(200, res->status); +} + +TEST_F(ServerTest, CaseInsensitiveHeaderName) +{ + auto res = cli_.Get("/hi"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); + EXPECT_EQ("text/plain", res->get_header_value("content-type")); + EXPECT_EQ("Hello World!", res->body); +} + +TEST_F(ServerTest, CaseInsensitiveTransferEncoding) +{ + Request req; + req.method = "POST"; + req.path = "/chunked"; + + std::string host_and_port; + host_and_port += HOST; + host_and_port += ":"; + host_and_port += std::to_string(PORT); + + req.headers.emplace("Host", host_and_port.c_str()); + req.headers.emplace("Accept", "*/*"); + req.headers.emplace("User-Agent", "cpp-httplib/0.1"); + req.headers.emplace("Content-Type", "text/plain"); + req.headers.emplace("Content-Length", "0"); + req.headers.emplace("Transfer-Encoding", "Chunked"); // Note, "Chunked" rather than typical "chunked". + + // Client does not chunk, so make a chunked body manually. + req.body = "4\r\ndech\r\nf\r\nunked post body\r\n0\r\n\r\n"; + + auto res = std::make_shared(); + auto ret = cli_.send(req, *res); + + ASSERT_TRUE(ret); + EXPECT_EQ(200, res->status); +} + +TEST_F(ServerTest, GetStreamed) +{ + auto res = cli_.Get("/streamed"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); + EXPECT_EQ("6", res->get_header_value("Content-Length")); + EXPECT_TRUE(res->body == "aaabbb"); +} + +TEST_F(ServerTest, GetStreamedChunked) +{ + auto res = cli_.Get("/streamedchunked"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); + EXPECT_TRUE(res->body == "aaabbb"); +} + +TEST_F(ServerTest, LargeChunkedPost) { + Request req; + req.method = "POST"; + req.path = "/largechunked"; + + std::string host_and_port; + host_and_port += HOST; + host_and_port += ":"; + host_and_port += std::to_string(PORT); + + req.headers.emplace("Host", host_and_port.c_str()); + req.headers.emplace("Accept", "*/*"); + req.headers.emplace("User-Agent", "cpp-httplib/0.1"); + req.headers.emplace("Content-Type", "text/plain"); + req.headers.emplace("Content-Length", "0"); + req.headers.emplace("Transfer-Encoding", "chunked"); + + std::string long_string(30 * 1024u, 'a'); + std::string chunk = "7800\r\n" + long_string + "\r\n"; + + // Attempt to make a large enough post to exceed OS buffers, to test that + // the server handles short reads if the full chunk data isn't available. + req.body = chunk + chunk + chunk + chunk + chunk + chunk + "0\r\n\r\n"; + + auto res = std::make_shared(); + auto ret = cli_.send(req, *res); + + ASSERT_TRUE(ret); + EXPECT_EQ(200, res->status); +} + +TEST_F(ServerTest, GetMethodRemoteAddr) +{ + auto res = cli_.Get("/remote_addr"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); + EXPECT_EQ("text/plain", res->get_header_value("Content-Type")); + EXPECT_TRUE(res->body == "::1" || res->body == "127.0.0.1"); +} + +TEST_F(ServerTest, SlowRequest) +{ + request_threads_.push_back(std::thread([=]() { auto res = cli_.Get("/slow"); })); + request_threads_.push_back(std::thread([=]() { auto res = cli_.Get("/slow"); })); + request_threads_.push_back(std::thread([=]() { auto res = cli_.Get("/slow"); })); + msleep(100); +} + +TEST_F(ServerTest, Put) +{ + auto res = cli_.Put("/put", "PUT", "text/plain"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); + EXPECT_EQ("PUT", res->body); +} + +TEST_F(ServerTest, Delete) +{ + auto res = cli_.Delete("/delete"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); + EXPECT_EQ("DELETE", res->body); +} + +TEST_F(ServerTest, Options) +{ + auto res = cli_.Options("*"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); + EXPECT_EQ("GET, POST, HEAD, OPTIONS", res->get_header_value("Allow")); + EXPECT_TRUE(res->body.empty()); +} + +TEST_F(ServerTest, URL) +{ + auto res = cli_.Get("/request-target?aaa=bbb&ccc=ddd"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); +} + +TEST_F(ServerTest, ArrayParam) +{ + auto res = cli_.Get("/array-param?array=value1&array=value2&array=value3"); + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(200, res->status); +} + +#ifdef CPPHTTPLIB_ZLIB_SUPPORT +TEST_F(ServerTest, Gzip) +{ + Headers headers; + headers.emplace("Accept-Encoding", "gzip, deflate"); + auto res = cli_.Get("/gzip", headers); + + ASSERT_TRUE(res != nullptr); + EXPECT_EQ("gzip", res->get_header_value("Content-Encoding")); + EXPECT_EQ("text/plain", res->get_header_value("Content-Type")); + EXPECT_EQ("33", res->get_header_value("Content-Length")); + EXPECT_EQ("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890", res->body); + EXPECT_EQ(200, res->status); +} + +TEST_F(ServerTest, NoGzip) +{ + Headers headers; + headers.emplace("Accept-Encoding", "gzip, deflate"); + auto res = cli_.Get("/nogzip", headers); + + ASSERT_TRUE(res != nullptr); + EXPECT_EQ(false, res->has_header("Content-Encoding")); + EXPECT_EQ("application/octet-stream", res->get_header_value("Content-Type")); + EXPECT_EQ("100", res->get_header_value("Content-Length")); + EXPECT_EQ("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890", res->body); + EXPECT_EQ(200, res->status); +} + +TEST_F(ServerTest, MultipartFormDataGzip) +{ + Request req; + req.method = "POST"; + req.path = "/gzipmultipart"; + + std::string host_and_port; + host_and_port += HOST; + host_and_port += ":"; + host_and_port += std::to_string(PORT); + + req.headers.emplace("Host", host_and_port.c_str()); + req.headers.emplace("Accept", "*/*"); + req.headers.emplace("User-Agent", "cpp-httplib/0.1"); + req.headers.emplace("Content-Type", "multipart/form-data; boundary=------------------------fcba8368a9f48c0f"); + req.headers.emplace("Content-Encoding", "gzip"); + + // compressed_body generated by creating input.txt to this file: + /* + --------------------------fcba8368a9f48c0f + Content-Disposition: form-data; name="key1" + + test + --------------------------fcba8368a9f48c0f + Content-Disposition: form-data; name="key2" + + --abcdefg123 + --------------------------fcba8368a9f48c0f-- + */ + // then running unix2dos input.txt; gzip -9 -c input.txt | xxd -i. + uint8_t compressed_body[] = { + 0x1f, 0x8b, 0x08, 0x08, 0x48, 0xf1, 0xd4, 0x5a, 0x02, 0x03, 0x69, 0x6e, + 0x70, 0x75, 0x74, 0x2e, 0x74, 0x78, 0x74, 0x00, 0xd3, 0xd5, 0xc5, 0x05, + 0xd2, 0x92, 0x93, 0x12, 0x2d, 0x8c, 0xcd, 0x2c, 0x12, 0x2d, 0xd3, 0x4c, + 0x2c, 0x92, 0x0d, 0xd2, 0x78, 0xb9, 0x9c, 0xf3, 0xf3, 0x4a, 0x52, 0xf3, + 0x4a, 0x74, 0x5d, 0x32, 0x8b, 0x0b, 0xf2, 0x8b, 0x33, 0x4b, 0x32, 0xf3, + 0xf3, 0xac, 0x14, 0xd2, 0xf2, 0x8b, 0x72, 0x75, 0x53, 0x12, 0x4b, 0x12, + 0xad, 0x15, 0xf2, 0x12, 0x73, 0x53, 0x6d, 0x95, 0xb2, 0x53, 0x2b, 0x0d, + 0x95, 0x78, 0xb9, 0x78, 0xb9, 0x4a, 0x52, 0x8b, 0x4b, 0x78, 0xb9, 0x74, + 0x69, 0x61, 0x81, 0x11, 0xd8, 0x02, 0x5d, 0xdd, 0xc4, 0xa4, 0xe4, 0x94, + 0xd4, 0xb4, 0x74, 0x43, 0x23, 0x63, 0x52, 0x2c, 0xd2, 0xd5, 0xe5, 0xe5, + 0x02, 0x00, 0xff, 0x0e, 0x72, 0xdf, 0xf8, 0x00, 0x00, 0x00 + }; + + req.body = std::string((char*)compressed_body, sizeof(compressed_body) / sizeof(compressed_body[0])); + + auto res = std::make_shared(); + auto ret = cli_.send(req, *res); + + ASSERT_TRUE(ret); + EXPECT_EQ(200, res->status); +} +#endif + class ServerTestWithAI_PASSIVE : public ::testing::Test { protected: ServerTestWithAI_PASSIVE() @@ -310,31 +1039,25 @@ protected: #ifdef CPPHTTPLIB_OPENSSL_SUPPORT , svr_(SERVER_CERT_FILE, SERVER_PRIVATE_KEY_FILE) #endif - , up_(false) {} + {} virtual void SetUp() { - svr_.get("/hi", [&](const Request& req, Response& res) { + svr_.Get("/hi", [&](const Request& /*req*/, Response& res) { res.set_content("Hello World!", "text/plain"); }); - svr_.get("/stop", [&](const Request& req, Response& res) { - svr_.stop(); + t_ = thread([&]() { + ASSERT_TRUE(svr_.listen(nullptr, PORT, AI_PASSIVE)); }); - f_ = async([&](){ - up_ = true; - svr_.listen(nullptr, PORT, AI_PASSIVE); - }); - - while (!up_) { + while (!svr_.is_running()) { msleep(1); } } virtual void TearDown() { - //svr_.stop(); // NOTE: This causes dead lock on Windows. - cli_.get("/stop"); - f_.get(); + svr_.stop(); + t_.join(); } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT @@ -344,24 +1067,57 @@ protected: Client cli_; Server svr_; #endif - future f_; - bool up_; + thread t_; }; TEST_F(ServerTestWithAI_PASSIVE, GetMethod200) { - auto res = cli_.get("/hi"); + auto res = cli_.Get("/hi"); ASSERT_TRUE(res != nullptr); EXPECT_EQ(200, res->status); EXPECT_EQ("text/plain", res->get_header_value("Content-Type")); EXPECT_EQ("Hello World!", res->body); } +class ServerUpDownTest : public ::testing::Test { +protected: + ServerUpDownTest() + : cli_(HOST, PORT) + {} + + virtual void SetUp() { + t_ = thread([&](){ + svr_.bind_to_any_port(HOST); + msleep(500); + ASSERT_TRUE(svr_.listen_after_bind()); + }); + + while (!svr_.is_running()) { + msleep(1); + } + } + + virtual void TearDown() { + svr_.stop(); + t_.join(); + } + + Client cli_; + Server svr_; + thread t_; +}; + +TEST_F(ServerUpDownTest, QuickStartStop) +{ + // Should not crash, especially when run with + // --gtest_filter=ServerUpDownTest.QuickStartStop --gtest_repeat=1000 +} + #ifdef CPPHTTPLIB_OPENSSL_SUPPORT TEST(SSLClientTest, ServerNameIndication) { SSLClient cli("httpbin.org", 443); - auto res = cli.get("/get"); + auto res = cli.Get("/get"); ASSERT_TRUE(res != nullptr); ASSERT_EQ(200, res->status); } diff --git a/test/test.conf b/test/test.conf new file mode 100644 index 0000000..b4ae121 --- /dev/null +++ b/test/test.conf @@ -0,0 +1,18 @@ +[req] +default_bits = 2048 +distinguished_name = req_distinguished_name +attributes = req_attributes +prompt = no +output_password = mypass + +[req_distinguished_name] +C = US +ST = Test State or Province +L = Test Locality +O = Organization Name +OU = Organizational Unit Name +CN = Common Name +emailAddress = test@email.address + +[req_attributes] +challengePassword = 1234 diff --git a/test/test.vcxproj b/test/test.vcxproj index b19fd4c..3f15c7c 100644 --- a/test/test.vcxproj +++ b/test/test.vcxproj @@ -22,31 +22,32 @@ {6B3E6769-052D-4BC0-9D2C-E9127C3DBB26} Win32Proj test + 8.1 Application true - v140 + v141 Unicode Application true - v140 + v141 Unicode Application false - v140 + v141 true Unicode Application false - v140 + v141 true Unicode diff --git a/test/test.xcodeproj/project.pbxproj b/test/test.xcodeproj/project.pbxproj deleted file mode 100644 index abff30e..0000000 --- a/test/test.xcodeproj/project.pbxproj +++ /dev/null @@ -1,248 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - BAA4BF2517280236003EF6AD /* test.cc in Sources */ = {isa = PBXBuildFile; fileRef = BAA4BF2417280236003EF6AD /* test.cc */; }; - BAF46809172813BB0069D928 /* gtest-all.cc in Sources */ = {isa = PBXBuildFile; fileRef = BAF46806172813BB0069D928 /* gtest-all.cc */; }; - BAF4680A172813BB0069D928 /* gtest_main.cc in Sources */ = {isa = PBXBuildFile; fileRef = BAF46808172813BB0069D928 /* gtest_main.cc */; }; -/* End PBXBuildFile section */ - -/* Begin PBXCopyFilesBuildPhase section */ - BAE5F9C51727F08F001D0075 /* CopyFiles */ = { - isa = PBXCopyFilesBuildPhase; - buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; - files = ( - ); - runOnlyForDeploymentPostprocessing = 1; - }; -/* End PBXCopyFilesBuildPhase section */ - -/* Begin PBXFileReference section */ - BAA4BF2417280236003EF6AD /* test.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test.cc; sourceTree = SOURCE_ROOT; }; - BAE5F9C71727F08F001D0075 /* test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = test; sourceTree = BUILT_PRODUCTS_DIR; }; - BAF46806172813BB0069D928 /* gtest-all.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "gtest-all.cc"; sourceTree = ""; }; - BAF46807172813BB0069D928 /* gtest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gtest.h; sourceTree = ""; }; - BAF46808172813BB0069D928 /* gtest_main.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gtest_main.cc; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - BAE5F9C41727F08F001D0075 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - BAE5F9BE1727F08F001D0075 = { - isa = PBXGroup; - children = ( - BAE5F9C91727F08F001D0075 /* test */, - BAE5F9C81727F08F001D0075 /* Products */, - ); - sourceTree = ""; - }; - BAE5F9C81727F08F001D0075 /* Products */ = { - isa = PBXGroup; - children = ( - BAE5F9C71727F08F001D0075 /* test */, - ); - name = Products; - sourceTree = ""; - }; - BAE5F9C91727F08F001D0075 /* test */ = { - isa = PBXGroup; - children = ( - BAF46805172813BB0069D928 /* gtest */, - BAA4BF2417280236003EF6AD /* test.cc */, - ); - path = test; - sourceTree = ""; - }; - BAF46805172813BB0069D928 /* gtest */ = { - isa = PBXGroup; - children = ( - BAF46806172813BB0069D928 /* gtest-all.cc */, - BAF46807172813BB0069D928 /* gtest.h */, - BAF46808172813BB0069D928 /* gtest_main.cc */, - ); - path = gtest; - sourceTree = SOURCE_ROOT; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - BAE5F9C61727F08F001D0075 /* test */ = { - isa = PBXNativeTarget; - buildConfigurationList = BAE5F9D01727F08F001D0075 /* Build configuration list for PBXNativeTarget "test" */; - buildPhases = ( - BAE5F9C31727F08F001D0075 /* Sources */, - BAE5F9C41727F08F001D0075 /* Frameworks */, - BAE5F9C51727F08F001D0075 /* CopyFiles */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = test; - productName = test; - productReference = BAE5F9C71727F08F001D0075 /* test */; - productType = "com.apple.product-type.tool"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - BAE5F9BF1727F08F001D0075 /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0460; - ORGANIZATIONNAME = "Yuji Hirose"; - }; - buildConfigurationList = BAE5F9C21727F08F001D0075 /* Build configuration list for PBXProject "test" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = BAE5F9BE1727F08F001D0075; - productRefGroup = BAE5F9C81727F08F001D0075 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - BAE5F9C61727F08F001D0075 /* test */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXSourcesBuildPhase section */ - BAE5F9C31727F08F001D0075 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - BAA4BF2517280236003EF6AD /* test.cc in Sources */, - BAF46809172813BB0069D928 /* gtest-all.cc in Sources */, - BAF4680A172813BB0069D928 /* gtest_main.cc in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - BAE5F9CE1727F08F001D0075 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - GTEST_USE_OWN_TR1_TUPLE, - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "../**", - "./**", - ); - MACOSX_DEPLOYMENT_TARGET = 10.7; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = ""; - }; - name = Debug; - }; - BAE5F9CF1727F08F001D0075 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_PREPROCESSOR_DEFINITIONS = GTEST_USE_OWN_TR1_TUPLE; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = ( - "../**", - "./**", - ); - MACOSX_DEPLOYMENT_TARGET = 10.7; - SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = ""; - }; - name = Release; - }; - BAE5F9D11727F08F001D0075 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - BAE5F9D21727F08F001D0075 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - BAE5F9C21727F08F001D0075 /* Build configuration list for PBXProject "test" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - BAE5F9CE1727F08F001D0075 /* Debug */, - BAE5F9CF1727F08F001D0075 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - BAE5F9D01727F08F001D0075 /* Build configuration list for PBXNativeTarget "test" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - BAE5F9D11727F08F001D0075 /* Debug */, - BAE5F9D21727F08F001D0075 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = BAE5F9BF1727F08F001D0075 /* Project object */; -} diff --git a/test/test.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/test/test.xcodeproj/project.xcworkspace/contents.xcworkspacedata deleted file mode 100644 index d683bc9..0000000 --- a/test/test.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ /dev/null @@ -1,7 +0,0 @@ - - - - -