diff --git a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java index 583966a7..0e15973a 100644 --- a/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java +++ b/sop-common/sop-gateway-common/src/main/java/com/gitee/sop/gatewaycommon/gateway/filter/IndexFilter.java @@ -76,7 +76,7 @@ public class IndexFilter implements WebFilter { if (enableRestful && path.startsWith(EnvironmentKeys.SOP_RESTFUL_PATH.getValue())) { return chain.filter(exchange); } - if (Objects.equals(path, indexPath)) { + if (Objects.equals(path, indexPath) || "".equals(path)) { if (request.getMethod() == HttpMethod.POST) { ServerRequest serverRequest = ServerWebExchangeUtil.createReadBodyRequest(exchange); // 读取请求体中的内容 @@ -140,9 +140,10 @@ public class IndexFilter implements WebFilter { validator.validate(apiParam); this.afterValidate(exchange, apiParam); } catch (ApiException e) { - log.error("验证失败，url:{}, ip:{}, params:{}, errorMsg:{}", + log.error("验证失败, errorMsg:{}，url:{}, ip:{}, params:{}", + e.getMessage(), exchange.getRequest().getURI().toString(), - apiParam.fetchIp(), apiParam.toJSONString(), e.getMessage()); + apiParam.fetchIp(), apiParam.toJSONString()); ServerWebExchangeUtil.setThrowable(exchange, e); } } diff --git a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ApiArgumentResolver.java b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ApiArgumentResolver.java index 19a9db5b..8b741ea4 100644 --- a/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ApiArgumentResolver.java +++ b/sop-common/sop-service-common/src/main/java/com/gitee/sop/servercommon/param/ApiArgumentResolver.java @@ -205,7 +205,7 @@ public class ApiArgumentResolver implements SopHandlerMethodArgumentResolver { try { param = JSON.parseObject(bizContent, parameterType); } catch (Exception e) { - log.error("非json参数，biz_content:{}, requestParams:{}", bizContent, requestParams); + log.error("非json参数, \nbiz_content:{}\nrequestParams:{}", bizContent, requestParams, e); // 否则认为是 aa=1&bb=33 形式 Map query = OpenUtil.parseQueryToMap(bizContent); param = new JSONObject(query).toJavaObject(parameterType); diff --git a/sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/Example1001_BaseController.java b/sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/Example1001_BaseController.java index 498ffc29..38737f8a 100644 --- a/sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/Example1001_BaseController.java +++ b/sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/Example1001_BaseController.java @@ -7,6 +7,7 @@ import com.gitee.sop.servercommon.annotation.Open; import com.gitee.sop.servercommon.bean.OpenContext; import com.gitee.sop.servercommon.bean.ServiceContext; import com.gitee.sop.servercommon.exception.ServiceException; +import com.gitee.sop.storyweb.controller.param.ArrayElementParam; import com.gitee.sop.storyweb.controller.param.CategoryParam; import com.gitee.sop.storyweb.controller.param.LargeTextParam; import com.gitee.sop.storyweb.controller.param.MemberInfoGetParam; @@ -159,6 +160,16 @@ public class Example1001_BaseController { return result; } + @ApiOperation(value = "接收数组", notes = "接收数组") + @Open(value = "story.listparam") + @PostMapping(value = "/get/listparam/v1") + public StoryResult listparam(@RequestBody ArrayElementParam story) { + StoryResult result = new StoryResult(); + result.setId(11L); + result.setName(JSON.toJSONString(story)); + return result; + } + @Open(value = "story.get.large") @RequestMapping("/get/large/v1") public StoryResult getStoryLarge(LargeTextParam param) { diff --git a/sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/param/ArrayElementParam.java b/sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/param/ArrayElementParam.java new file mode 100644 index 00000000..0f2073bd --- /dev/null +++ b/sop-example/sop-story/src/main/java/com/gitee/sop/storyweb/controller/param/ArrayElementParam.java @@ -0,0 +1,20 @@ +package com.gitee.sop.storyweb.controller.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author tanghc + */ +@Data +public class ArrayElementParam { + + @ApiModelProperty(value = "名字", required = true, example = "白雪公主", position = 1) + private String name; + + @ApiModelProperty(value = "数组", required = true, dataType = "List", example = "白雪公主", position = 2) + private List list; + +} diff --git a/sop-sdk/sdk-c++/CMakeLists.txt b/sop-sdk/sdk-c++/CMakeLists.txt index afb33d11..c73938ef 100644 --- a/sop-sdk/sdk-c++/CMakeLists.txt +++ b/sop-sdk/sdk-c++/CMakeLists.txt @@ -17,13 +17,8 @@ set(LIB_SRC request/MemberInfoGetRequest.hpp thirdparty/base64/base64.h thirdparty/base64/base64.cpp - thirdparty/CJsonObject/cJSON.c - thirdparty/CJsonObject/cJSON.h - thirdparty/CJsonObject/CJsonObject.hpp - thirdparty/CJsonObject/CJsonObject.cpp - thirdparty/x2struct/x2struct.hpp common/sign.cpp common/tool.cpp common/sha256.cpp - request/BaseRequest.cpp response/BaseResponse.h response/MemberInfoGetResponse.h) + request/BaseRequest.cpp) # openssl安装路径 set(OPENSSL_INC_DIR /usr/local/opt/openssl/include) @@ -35,8 +30,16 @@ link_libraries(ssl crypto) # 添加类库 add_library(lib ${LIB_SRC}) +# jsoncpp +add_library(jsoncpp SHARED IMPORTED) +set_target_properties(jsoncpp PROPERTIES + IMPORTED_LOCATION "/usr/local/lib/libjsoncpp.dylib" + INTERFACE_INCLUDE_DIRECTORIES "/usr/local/include/json" + ) + # 添加可执行文件 add_executable(sdk_cxx main.cpp) # 可执行文件依赖lib库 -target_link_libraries(sdk_cxx lib ssl) \ No newline at end of file +target_link_libraries(sdk_cxx lib ssl) +target_link_libraries(sdk_cxx jsoncpp) \ No newline at end of file diff --git a/sop-sdk/sdk-c++/common/OpenClient.cpp b/sop-sdk/sdk-c++/common/OpenClient.cpp index fbb48e61..74c69ab3 100644 --- a/sop-sdk/sdk-c++/common/OpenClient.cpp +++ b/sop-sdk/sdk-c++/common/OpenClient.cpp @@ -1,10 +1,9 @@ +#include #include "OpenClient.h" #include "httplib.h" #include "tool.h" #include "sign.h" -#include "../thirdparty/CJsonObject/CJsonObject.hpp" - httplib::Headers headers = { {"Accept-Encoding", "identity"} }; @@ -13,59 +12,51 @@ const string ERROR_NODE = "error_response"; OpenClient::OpenClient(const string &appId, const string &privateKeyFilePath, const string &url) { this->appId = appId; + this->url = url; this->privateKeyFilePath = privateKeyFilePath; - - char *_url = const_cast(url.c_str()); - char *host; - int port; - char *path; - tool::parse_url(_url, &host, &port, &path); - this->hostInfo = HostInfo{ - host = host, - port = port, - path = path - }; } -neb::CJsonObject OpenClient::execute(BaseRequest *request) { +Json::Value OpenClient::execute(BaseRequest *request) { return this->execute(request, ""); } -neb::CJsonObject OpenClient::execute(BaseRequest *request, const string &token) { +Json::Value OpenClient::execute(BaseRequest *request, const string &token) { string method = request->getMethod(); string version = request->getVersion(); RequestType requestType = request->getRequestType(); map bizModel = request->bizModel; // 创建HTTP请求客户端 - httplib::Client cli(this->hostInfo.host, this->hostInfo.port); +// httplib::Client cli(this->hostInfo.host, this->hostInfo.port); + httplib::Client cli(this->url.c_str()); + const char *url = this->url.c_str(); // 构建请求参数 map allParams = this->buildParams(request, token); - char *path = this->hostInfo.path; string responseBody; // 如果有文件上传 if (!request->getFiles().empty()) { httplib::MultipartFormDataItems items = OpenClient::getMultipartFormDataItems( allParams, request->getFiles()); - responseBody = cli.Post(path, headers, items)->body; + responseBody = cli.Post(url, headers, items)->body; } else { switch (requestType) { case GET: { - responseBody = cli.Get(path, allParams, headers)->body; + string fullPath = this->url + "?" + OpenClient::getQuery(allParams); + responseBody = cli.Get(fullPath.c_str())->body; break; } case POST_FORM: { - responseBody = cli.Post(path, headers, OpenClient::getParams(allParams))->body; + responseBody = cli.Post(url, headers, OpenClient::getParams(allParams))->body; break; } case POST_JSON: { string json = tool::mapToJson(allParams); - responseBody = cli.Post(path, json, "application/json")->body; + responseBody = cli.Post(url, json, "application/json")->body; break; } case POST_FILE: { httplib::MultipartFormDataItems items = OpenClient::getMultipartFormDataItems( allParams, request->getFiles()); - responseBody = cli.Post(path, headers, items)->body; + responseBody = cli.Post(url, headers, items)->body; } } } @@ -82,6 +73,19 @@ httplib::Params OpenClient::getParams(map allParams) { return params; } +string OpenClient::getQuery(map allParams) { + string query; + map::iterator it; + int i = 0; + for (it = allParams.begin(); it != allParams.end(); ++it) { + if (i++ > 0) { + query.append("&"); + } + query.append(it->first).append("=").append(tool::url_encode(it->second)); + } + return query; +} + map OpenClient::buildParams(BaseRequest *request, const string &token) { map allParams; allParams["app_id"] = this->appId; @@ -90,15 +94,12 @@ map OpenClient::buildParams(BaseRequest *request, const string & allParams["sign_type"] = "RSA2"; allParams["timestamp"] = tool::getTime(); allParams["version"] = request->getVersion(); + allParams["biz_content"] = tool::mapToJson(request->bizModel); if (!token.empty()) { allParams["app_auth_token"] = token; } - map bizModel = request->bizModel; - - allParams.insert(bizModel.begin(), bizModel.end()); - // 生成签名 string sign = signutil::createSign(allParams, this->privateKeyFilePath, "RSA2"); allParams["sign"] = sign; @@ -121,13 +122,16 @@ OpenClient::getMultipartFormDataItems(map allParams, vectorgetMethod(); string nodeName = tool::replace(method.c_str(),".","_") + "_response"; - data = oJson[nodeName]; + data = root[nodeName]; } return data; } diff --git a/sop-sdk/sdk-c++/common/OpenClient.h b/sop-sdk/sdk-c++/common/OpenClient.h index df28b1c3..2695feba 100644 --- a/sop-sdk/sdk-c++/common/OpenClient.h +++ b/sop-sdk/sdk-c++/common/OpenClient.h @@ -2,18 +2,12 @@ #define SDK_CXX_OPENCLIENT_H #include +#include #include "httplib.h" #include "../request/BaseRequest.h" -#include "../thirdparty/CJsonObject/CJsonObject.hpp" using namespace std; -struct HostInfo { - string host; - int port; - char *path; -}; - /** * 请求客户端 */ @@ -21,6 +15,7 @@ class OpenClient { private: /** 应用id */ string appId; + string url; /** 私钥文件路径 */ string privateKeyFilePath; @@ -39,19 +34,17 @@ public: * @param token token * @return 返回响应结果 */ - neb::CJsonObject execute(BaseRequest *request, const string& token); + Json::Value execute(BaseRequest *request, const string& token); /** * 发送请求 * @param request 请求对象，BaseRequest的子类 * @return 返回响应结果 */ - neb::CJsonObject execute(BaseRequest *request); + Json::Value execute(BaseRequest *request); private: - HostInfo hostInfo; - map buildParams(BaseRequest *request, const string& token); static httplib::MultipartFormDataItems @@ -59,7 +52,9 @@ private: static httplib::Params getParams(map params); - static neb::CJsonObject parseResponse(const string& responseBody,BaseRequest *request); + static string getQuery(map params); + + static Json::Value parseResponse(const string& responseBody,BaseRequest *request); }; diff --git a/sop-sdk/sdk-c++/common/httplib.h b/sop-sdk/sdk-c++/common/httplib.h index 20cfd729..c4037084 100644 --- a/sop-sdk/sdk-c++/common/httplib.h +++ b/sop-sdk/sdk-c++/common/httplib.h @@ -16,10 +16,6 @@ #define CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND 5 #endif -#ifndef CPPHTTPLIB_KEEPALIVE_TIMEOUT_USECOND -#define CPPHTTPLIB_KEEPALIVE_TIMEOUT_USECOND 0 -#endif - #ifndef CPPHTTPLIB_KEEPALIVE_MAX_COUNT #define CPPHTTPLIB_KEEPALIVE_MAX_COUNT 5 #endif @@ -72,10 +68,18 @@ #define CPPHTTPLIB_PAYLOAD_MAX_LENGTH ((std::numeric_limits::max)()) #endif +#ifndef CPPHTTPLIB_TCP_NODELAY +#define CPPHTTPLIB_TCP_NODELAY false +#endif + #ifndef CPPHTTPLIB_RECV_BUFSIZ #define CPPHTTPLIB_RECV_BUFSIZ size_t(4096u) #endif +#ifndef CPPHTTPLIB_COMPRESSION_BUFSIZ +#define CPPHTTPLIB_COMPRESSION_BUFSIZ size_t(16384u) +#endif + #ifndef CPPHTTPLIB_THREAD_POOL_COUNT #define CPPHTTPLIB_THREAD_POOL_COUNT \ ((std::max)(8u, std::thread::hardware_concurrency() > 0 \ @@ -83,22 +87,12 @@ : 0)) #endif -// Prefer gnu::deprecated, otherwise gcc complains if we use -// [[deprecated]] together with pedantic. -#ifndef CPPHTTPLIB_DEPRECATED -#if defined(__has_cpp_attribute) -#if __has_cpp_attribute(gnu::deprecated) -#define CPPHTTPLIB_DEPRECATED [[gnu::deprecated]] -#else -#if __has_cpp_attribute(deprecated) -#define CPPHTTPLIB_DEPRECATED [[deprecated]] -#else -#define CPPHTTPLIB_DEPRECATED -#endif -#endif -#else -#define CPPHTTPLIB_DEPRECATED +#ifndef CPPHTTPLIB_RECV_FLAGS +#define CPPHTTPLIB_RECV_FLAGS 0 #endif + +#ifndef CPPHTTPLIB_SEND_FLAGS +#define CPPHTTPLIB_SEND_FLAGS 0 #endif /* @@ -140,6 +134,8 @@ using ssize_t = int; #include #include + +#include #include #ifndef WSA_FLAG_NO_HANDLE_INHERIT @@ -148,6 +144,8 @@ using ssize_t = int; #ifdef _MSC_VER #pragma comment(lib, "ws2_32.lib") +#pragma comment(lib, "crypt32.lib") +#pragma comment(lib, "cryptui.lib") #endif #ifndef strcasecmp @@ -166,6 +164,10 @@ using socket_t = SOCKET; #include #include #include +#ifdef __linux__ +#include +#endif +#include #ifdef CPPHTTPLIB_USE_POLL #include #endif @@ -179,15 +181,18 @@ using socket_t = int; #define INVALID_SOCKET (-1) #endif //_WIN32 +#include #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include @@ -195,6 +200,7 @@ using socket_t = int; #include #include #include +#include #include #include #include @@ -205,13 +211,16 @@ using socket_t = int; #include #include -#include +#if defined(_WIN32) && defined(OPENSSL_USE_APPLINK) +#include +#endif + #include #include -// #if OPENSSL_VERSION_NUMBER < 0x1010100fL -// #error Sorry, OpenSSL versions prior to 1.1.1 are not supported -// #endif +#if OPENSSL_VERSION_NUMBER < 0x1010100fL +#error Sorry, OpenSSL versions prior to 1.1.1 are not supported +#endif #if OPENSSL_VERSION_NUMBER < 0x10100000L #include @@ -224,6 +233,12 @@ inline const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1) { #ifdef CPPHTTPLIB_ZLIB_SUPPORT #include #endif + +#ifdef CPPHTTPLIB_BROTLI_SUPPORT +#include +#include +#endif + /* * Declaration */ @@ -231,11 +246,34 @@ namespace httplib { namespace detail { +/* + * Backport std::make_unique from C++14. + * + * NOTE: This code came up with the following stackoverflow post: + * https://stackoverflow.com/questions/10149840/c-arrays-and-make-unique + * + */ + +template +typename std::enable_if::value, std::unique_ptr>::type +make_unique(Args &&... args) { + return std::unique_ptr(new T(std::forward(args)...)); +} + +template +typename std::enable_if::value, std::unique_ptr>::type +make_unique(std::size_t n) { + typedef typename std::remove_extent::type RT; + return std::unique_ptr(new RT[n]); +} + 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); }); + return std::lexicographical_compare(s1.begin(), s1.end(), s2.begin(), + s2.end(), + [](unsigned char c1, unsigned char c2) { + return ::tolower(c1) < ::tolower(c2); + }); } }; @@ -277,7 +315,7 @@ public: private: class data_sink_streambuf : public std::streambuf { public: - data_sink_streambuf(DataSink &sink) : sink_(sink) {} + explicit data_sink_streambuf(DataSink &sink) : sink_(sink) {} protected: std::streamsize xsputn(const char *s, std::streamsize n) { @@ -295,9 +333,13 @@ private: using ContentProvider = std::function; -using ChunkedContentProvider = +using ContentProviderWithoutLength = std::function; +using ContentReceiverWithProgress = + std::function; + using ContentReceiver = std::function; @@ -311,14 +353,17 @@ public: ContentReceiver receiver)>; ContentReader(Reader reader, MultipartReader multipart_reader) - : reader_(reader), multipart_reader_(multipart_reader) {} + : reader_(std::move(reader)), + multipart_reader_(std::move(multipart_reader)) {} bool operator()(MultipartContentHeader header, ContentReceiver receiver) const { - return multipart_reader_(header, receiver); + return multipart_reader_(std::move(header), std::move(receiver)); } - bool operator()(ContentReceiver receiver) const { return reader_(receiver); } + bool operator()(ContentReceiver receiver) const { + return reader_(std::move(receiver)); + } Reader reader_; MultipartReader multipart_reader_; @@ -330,7 +375,6 @@ using Ranges = std::vector; struct Request { std::string method; std::string path; - std::string query; Headers headers; std::string body; @@ -346,19 +390,17 @@ struct Request { Match matches; // for client - size_t redirect_count = CPPHTTPLIB_REDIRECT_MAX_COUNT; ResponseHandler response_handler; - ContentReceiver content_receiver; - size_t content_length = 0; - ContentProvider content_provider; + ContentReceiverWithProgress content_receiver; Progress progress; - #ifdef CPPHTTPLIB_OPENSSL_SUPPORT const SSL *ssl; #endif bool has_header(const char *key) const; std::string get_header_value(const char *key, size_t id = 0) const; + template + T 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_header(const char *key, const std::string &val); @@ -373,32 +415,45 @@ struct Request { MultipartFormData get_file_value(const char *key) const; // private members... + size_t redirect_count_ = CPPHTTPLIB_REDIRECT_MAX_COUNT; + size_t content_length_ = 0; + ContentProvider content_provider_; + bool is_chunked_content_provider_ = false; size_t authorization_count_ = 0; }; struct Response { std::string version; int status = -1; + std::string reason; Headers headers; std::string body; + std::string location; // Redirect location bool has_header(const char *key) const; std::string get_header_value(const char *key, size_t id = 0) const; + template + T 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_header(const char *key, const std::string &val); void set_redirect(const char *url, int status = 302); + void set_redirect(const std::string &url, int status = 302); void set_content(const char *s, size_t n, const char *content_type); - void set_content(std::string s, const char *content_type); + void set_content(const std::string &s, const char *content_type); + + void set_content_provider( + size_t length, const char *content_type, ContentProvider provider, + const std::function &resource_releaser = nullptr); void set_content_provider( - size_t length, ContentProvider provider, - std::function resource_releaser = [] {}); + const char *content_type, ContentProviderWithoutLength provider, + const std::function &resource_releaser = nullptr); void set_chunked_content_provider( - ChunkedContentProvider provider, - std::function resource_releaser = [] {}); + const char *content_type, ContentProviderWithoutLength provider, + const std::function &resource_releaser = nullptr); Response() = default; Response(const Response &) = default; @@ -415,6 +470,7 @@ struct Response { size_t content_length_ = 0; ContentProvider content_provider_; std::function content_provider_resource_releaser_; + bool is_chunked_content_provider_ = false; }; class Stream { @@ -427,6 +483,7 @@ public: virtual ssize_t read(char *ptr, size_t size) = 0; virtual ssize_t write(const char *ptr, size_t size) = 0; virtual void get_remote_ip_and_port(std::string &ip, int &port) const = 0; + virtual socket_t socket() const = 0; template ssize_t write_format(const char *fmt, const Args &... args); @@ -459,7 +516,7 @@ public: void enqueue(std::function fn) override { std::unique_lock lock(mutex_); - jobs_.push_back(fn); + jobs_.push_back(std::move(fn)); cond_.notify_one(); } @@ -540,8 +597,20 @@ inline void default_socket_options(socket_t sock) { class Server { public: using Handler = std::function; + + using ExceptionHandler = + std::function; + + enum class HandlerResponse { + Handled, + Unhandled, + }; + using HandlerWithResponse = + std::function; + using HandlerWithContentReader = std::function; + using Expect100ContinueHandler = std::function; @@ -552,36 +621,57 @@ public: virtual bool is_valid() const; Server &Get(const char *pattern, Handler handler); + Server &Get(const char *pattern, size_t pattern_len, Handler handler); Server &Post(const char *pattern, Handler handler); + Server &Post(const char *pattern, size_t pattern_len, Handler handler); Server &Post(const char *pattern, HandlerWithContentReader handler); + Server &Post(const char *pattern, size_t pattern_len, + HandlerWithContentReader handler); Server &Put(const char *pattern, Handler handler); + Server &Put(const char *pattern, size_t pattern_len, Handler handler); Server &Put(const char *pattern, HandlerWithContentReader handler); + Server &Put(const char *pattern, size_t pattern_len, + HandlerWithContentReader handler); Server &Patch(const char *pattern, Handler handler); + Server &Patch(const char *pattern, size_t pattern_len, Handler handler); Server &Patch(const char *pattern, HandlerWithContentReader handler); + Server &Patch(const char *pattern, size_t pattern_len, + HandlerWithContentReader handler); Server &Delete(const char *pattern, Handler handler); + Server &Delete(const char *pattern, size_t pattern_len, Handler handler); Server &Delete(const char *pattern, HandlerWithContentReader handler); + Server &Delete(const char *pattern, size_t pattern_len, + HandlerWithContentReader handler); Server &Options(const char *pattern, Handler handler); + Server &Options(const char *pattern, size_t pattern_len, Handler handler); - CPPHTTPLIB_DEPRECATED bool set_base_dir(const char *dir, - const char *mount_point = nullptr); - bool set_mount_point(const char *mount_point, const char *dir); + bool set_base_dir(const char *dir, const char *mount_point = nullptr); + bool set_mount_point(const char *mount_point, const char *dir, + Headers headers = Headers()); bool remove_mount_point(const char *mount_point); - void set_file_extension_and_mimetype_mapping(const char *ext, - const char *mime); - void set_file_request_handler(Handler handler); + Server &set_file_extension_and_mimetype_mapping(const char *ext, + const char *mime); + Server &set_file_request_handler(Handler handler); - void set_error_handler(Handler handler); - void set_expect_100_continue_handler(Expect100ContinueHandler handler); - void set_logger(Logger logger); + Server &set_error_handler(HandlerWithResponse handler); + Server &set_error_handler(Handler handler); + Server &set_exception_handler(ExceptionHandler handler); + Server &set_pre_routing_handler(HandlerWithResponse handler); + Server &set_post_routing_handler(Handler handler); - void set_socket_options(SocketOptions socket_options); + Server &set_expect_100_continue_handler(Expect100ContinueHandler handler); + Server &set_logger(Logger logger); - void set_keep_alive_max_count(size_t count); - void set_read_timeout(time_t sec, time_t usec = 0); - void set_write_timeout(time_t sec, time_t usec = 0); - void set_idle_interval(time_t sec, time_t usec = 0); + Server &set_tcp_nodelay(bool on); + Server &set_socket_options(SocketOptions socket_options); + + Server &set_keep_alive_max_count(size_t count); + Server &set_keep_alive_timeout(time_t sec); + Server &set_read_timeout(time_t sec, time_t usec = 0); + Server &set_write_timeout(time_t sec, time_t usec = 0); + Server &set_idle_interval(time_t sec, time_t usec = 0); - void set_payload_max_length(size_t length); + Server &set_payload_max_length(size_t length); bool bind_to_port(const char *host, int port, int socket_flags = 0); int bind_to_any_port(const char *host, int socket_flags = 0); @@ -601,6 +691,7 @@ protected: std::atomic svr_sock_; size_t keep_alive_max_count_ = CPPHTTPLIB_KEEPALIVE_MAX_COUNT; + time_t keep_alive_timeout_sec_ = CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND; time_t read_timeout_sec_ = CPPHTTPLIB_READ_TIMEOUT_SECOND; time_t read_timeout_usec_ = CPPHTTPLIB_READ_TIMEOUT_USECOND; time_t write_timeout_sec_ = CPPHTTPLIB_WRITE_TIMEOUT_SECOND; @@ -620,15 +711,24 @@ private: bool listen_internal(); bool routing(Request &req, Response &res, Stream &strm); - bool handle_file_request(Request &req, Response &res, bool head = false); - bool dispatch_request(Request &req, Response &res, Handlers &handlers); - bool dispatch_request_for_content_reader(Request &req, Response &res, - ContentReader content_reader, - HandlersForContentReader &handlers); + bool handle_file_request(const Request &req, Response &res, + bool head = false); + bool dispatch_request(Request &req, Response &res, const Handlers &handlers); + bool + dispatch_request_for_content_reader(Request &req, Response &res, + ContentReader content_reader, + const HandlersForContentReader &handlers); bool parse_request_line(const char *s, Request &req); + void apply_ranges(const Request &req, Response &res, + std::string &content_type, std::string &boundary); bool write_response(Stream &strm, bool close_connection, const Request &req, Response &res); + bool write_response_with_content(Stream &strm, bool close_connection, + const Request &req, Response &res); + bool write_response_core(Stream &strm, bool close_connection, + const Request &req, Response &res, + bool need_apply_ranges); bool write_content_with_provider(Stream &strm, const Request &req, Response &res, const std::string &boundary, const std::string &content_type); @@ -645,8 +745,14 @@ private: virtual bool process_and_close_socket(socket_t sock); + struct MountPointEntry { + std::string mount_point; + std::string base_dir; + Headers headers; + }; + std::vector base_dirs_; + std::atomic is_running_; - std::vector> base_dirs_; std::map file_extension_and_mimetype_map_; Handler file_request_handler_; Handlers get_handlers_; @@ -659,158 +765,211 @@ private: Handlers delete_handlers_; HandlersForContentReader delete_handlers_for_content_reader_; Handlers options_handlers_; - Handler error_handler_; + HandlerWithResponse error_handler_; + ExceptionHandler exception_handler_; + HandlerWithResponse pre_routing_handler_; + Handler post_routing_handler_; Logger logger_; Expect100ContinueHandler expect_100_continue_handler_; + + bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY; SocketOptions socket_options_ = default_socket_options; }; -class Client { -public: - explicit Client(const std::string &host); - - explicit Client(const std::string &host, int port); - - explicit Client(const std::string &host, int port, - const std::string &client_cert_path, - const std::string &client_key_path); - - virtual ~Client(); - - virtual bool is_valid() const; - - std::shared_ptr Get(const char *path); - - std::shared_ptr Get(const char *path, const Headers &headers); - - std::shared_ptr Get(const char *path, Progress progress); - - std::shared_ptr Get(const char *path, const Headers &headers, - Progress progress); - - std::shared_ptr Get(const char *path, std::map params, const Headers &headers); - - std::shared_ptr Get(const char *path, - ContentReceiver content_receiver); - - std::shared_ptr Get(const char *path, const Headers &headers, - ContentReceiver content_receiver); - - std::shared_ptr - Get(const char *path, ContentReceiver content_receiver, Progress progress); - - std::shared_ptr Get(const char *path, const Headers &headers, - ContentReceiver content_receiver, - Progress progress); - - std::shared_ptr Get(const char *path, const Headers &headers, - ResponseHandler response_handler, - ContentReceiver content_receiver); - - std::shared_ptr Get(const char *path, const Headers &headers, - ResponseHandler response_handler, - ContentReceiver content_receiver, - Progress progress); - - std::shared_ptr Head(const char *path); - - std::shared_ptr Head(const char *path, const Headers &headers); - - std::shared_ptr Post(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 Headers &headers, - const std::string &body, - const char *content_type); - - std::shared_ptr Post(const char *path, size_t content_length, - ContentProvider content_provider, - const char *content_type); - - std::shared_ptr Post(const char *path, const Headers &headers, - size_t content_length, - ContentProvider content_provider, - const char *content_type); - - std::shared_ptr Post(const char *path, const Params ¶ms); - - std::shared_ptr Post(const char *path, const Headers &headers, - const Params ¶ms); - - std::shared_ptr Post(const char *path, - const MultipartFormDataItems &items); - - std::shared_ptr Post(const char *path, const Headers &headers, - const MultipartFormDataItems &items); - - std::shared_ptr Put(const char *path); - - 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 Put(const char *path, size_t content_length, - ContentProvider content_provider, - const char *content_type); - - std::shared_ptr Put(const char *path, const Headers &headers, - size_t content_length, - ContentProvider content_provider, - const char *content_type); - - std::shared_ptr Put(const char *path, const Params ¶ms); - - std::shared_ptr Put(const char *path, const Headers &headers, - const Params ¶ms); - - std::shared_ptr Patch(const char *path, const std::string &body, - const char *content_type); - - std::shared_ptr Patch(const char *path, const Headers &headers, - const std::string &body, - const char *content_type); - - std::shared_ptr Patch(const char *path, size_t content_length, - ContentProvider content_provider, - const char *content_type); +enum Error { + Success = 0, + Unknown, + Connection, + BindIPAddress, + Read, + Write, + ExceedRedirectCount, + Canceled, + SSLConnection, + SSLLoadingCerts, + SSLServerVerification, + UnsupportedMultipartBoundaryChars, + Compression, +}; - std::shared_ptr Patch(const char *path, const Headers &headers, - size_t content_length, - ContentProvider content_provider, - const char *content_type); +class Result { +public: + Result(std::unique_ptr &&res, Error err, + Headers &&request_headers = Headers{}) + : res_(std::move(res)), err_(err), + request_headers_(std::move(request_headers)) {} + // Response + operator bool() const { return res_ != nullptr; } + bool operator==(std::nullptr_t) const { return res_ == nullptr; } + bool operator!=(std::nullptr_t) const { return res_ != nullptr; } + const Response &value() const { return *res_; } + Response &value() { return *res_; } + const Response &operator*() const { return *res_; } + Response &operator*() { return *res_; } + const Response *operator->() const { return res_.get(); } + Response *operator->() { return res_.get(); } + + // Error + Error error() const { return err_; } + + // Request Headers + bool has_request_header(const char *key) const; + std::string get_request_header_value(const char *key, size_t id = 0) const; + template + T get_request_header_value(const char *key, size_t id = 0) const; + size_t get_request_header_value_count(const char *key) const; - std::shared_ptr Delete(const char *path); +private: + std::unique_ptr res_; + Error err_; + Headers request_headers_; +}; - std::shared_ptr Delete(const char *path, const std::string &body, - const char *content_type); +class ClientImpl { +public: + explicit ClientImpl(const std::string &host); - std::shared_ptr Delete(const char *path, const Headers &headers); + explicit ClientImpl(const std::string &host, int port); - std::shared_ptr Delete(const char *path, const Headers &headers, - const std::string &body, - const char *content_type); + explicit ClientImpl(const std::string &host, int port, + const std::string &client_cert_path, + const std::string &client_key_path); - std::shared_ptr Options(const char *path); + virtual ~ClientImpl(); - std::shared_ptr Options(const char *path, const Headers &headers); + virtual bool is_valid() const; - bool send(const Request &req, Response &res); + Result Get(const char *path); + Result Get(const char *path, const Headers &headers); + Result Get(const char *path, Progress progress); + Result Get(const char *path, const Headers &headers, Progress progress); + Result Get(const char *path, ContentReceiver content_receiver); + Result Get(const char *path, const Headers &headers, + ContentReceiver content_receiver); + Result Get(const char *path, ContentReceiver content_receiver, + Progress progress); + Result Get(const char *path, const Headers &headers, + ContentReceiver content_receiver, Progress progress); + Result Get(const char *path, ResponseHandler response_handler, + ContentReceiver content_receiver); + Result Get(const char *path, const Headers &headers, + ResponseHandler response_handler, + ContentReceiver content_receiver); + Result Get(const char *path, ResponseHandler response_handler, + ContentReceiver content_receiver, Progress progress); + Result Get(const char *path, const Headers &headers, + ResponseHandler response_handler, ContentReceiver content_receiver, + Progress progress); + + Result Get(const char *path, const Params ¶ms, const Headers &headers, + Progress progress = nullptr); + Result Get(const char *path, const Params ¶ms, const Headers &headers, + ContentReceiver content_receiver, Progress progress = nullptr); + Result Get(const char *path, const Params ¶ms, const Headers &headers, + ResponseHandler response_handler, ContentReceiver content_receiver, + Progress progress = nullptr); + + Result Head(const char *path); + Result Head(const char *path, const Headers &headers); + + Result Post(const char *path); + Result Post(const char *path, const char *body, size_t content_length, + const char *content_type); + Result Post(const char *path, const Headers &headers, const char *body, + size_t content_length, const char *content_type); + Result Post(const char *path, const std::string &body, + const char *content_type); + Result Post(const char *path, const Headers &headers, const std::string &body, + const char *content_type); + Result Post(const char *path, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Post(const char *path, ContentProviderWithoutLength content_provider, + const char *content_type); + Result Post(const char *path, const Headers &headers, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Post(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type); + Result Post(const char *path, const Params ¶ms); + Result Post(const char *path, const Headers &headers, const Params ¶ms); + Result Post(const char *path, const MultipartFormDataItems &items); + Result Post(const char *path, const Headers &headers, + const MultipartFormDataItems &items); + Result Post(const char *path, const Headers &headers, + const MultipartFormDataItems &items, const std::string &boundary); + + Result Put(const char *path); + Result Put(const char *path, const char *body, size_t content_length, + const char *content_type); + Result Put(const char *path, const Headers &headers, const char *body, + size_t content_length, const char *content_type); + Result Put(const char *path, const std::string &body, + const char *content_type); + Result Put(const char *path, const Headers &headers, const std::string &body, + const char *content_type); + Result Put(const char *path, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Put(const char *path, ContentProviderWithoutLength content_provider, + const char *content_type); + Result Put(const char *path, const Headers &headers, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Put(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type); + Result Put(const char *path, const Params ¶ms); + Result Put(const char *path, const Headers &headers, const Params ¶ms); + + Result Patch(const char *path); + Result Patch(const char *path, const char *body, size_t content_length, + const char *content_type); + Result Patch(const char *path, const Headers &headers, const char *body, + size_t content_length, const char *content_type); + Result Patch(const char *path, const std::string &body, + const char *content_type); + Result Patch(const char *path, const Headers &headers, + const std::string &body, const char *content_type); + Result Patch(const char *path, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Patch(const char *path, ContentProviderWithoutLength content_provider, + const char *content_type); + Result Patch(const char *path, const Headers &headers, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Patch(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type); + + Result Delete(const char *path); + Result Delete(const char *path, const Headers &headers); + Result Delete(const char *path, const char *body, size_t content_length, + const char *content_type); + Result Delete(const char *path, const Headers &headers, const char *body, + size_t content_length, const char *content_type); + Result Delete(const char *path, const std::string &body, + const char *content_type); + Result Delete(const char *path, const Headers &headers, + const std::string &body, const char *content_type); + + Result Options(const char *path); + Result Options(const char *path, const Headers &headers); + + bool send(Request &req, Response &res, Error &error); + Result send(const Request &req); size_t is_socket_open() const; void stop(); - CPPHTTPLIB_DEPRECATED void set_timeout_sec(time_t timeout_sec); + void set_default_headers(Headers headers); + + void set_tcp_nodelay(bool on); + void set_socket_options(SocketOptions socket_options); + void set_connection_timeout(time_t sec, time_t usec = 0); void set_read_timeout(time_t sec, time_t usec = 0); void set_write_timeout(time_t sec, time_t usec = 0); void set_basic_auth(const char *username, const char *password); + void set_bearer_token_auth(const char *token); #ifdef CPPHTTPLIB_OPENSSL_SUPPORT void set_digest_auth(const char *username, const char *password); #endif @@ -826,10 +985,15 @@ public: void set_proxy(const char *host, int port); void set_proxy_basic_auth(const char *username, const char *password); + void set_proxy_bearer_token_auth(const char *token); #ifdef CPPHTTPLIB_OPENSSL_SUPPORT void set_proxy_digest_auth(const char *username, const char *password); #endif +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + void enable_server_certificate_verification(bool enabled); +#endif + void set_logger(Logger logger); protected: @@ -842,11 +1006,32 @@ protected: bool is_open() const { return sock != INVALID_SOCKET; } }; - virtual bool create_and_connect_socket(Socket &socket); - virtual void close_socket(Socket &socket, bool process_socket_ret); + Result send_(Request &&req); + + virtual bool create_and_connect_socket(Socket &socket, Error &error); + + // All of: + // shutdown_ssl + // shutdown_socket + // close_socket + // should ONLY be called when socket_mutex_ is locked. + // Also, shutdown_ssl and close_socket should also NOT be called concurrently + // with a DIFFERENT thread sending requests using that socket. + virtual void shutdown_ssl(Socket &socket, bool shutdown_gracefully); + void shutdown_socket(Socket &socket); + void close_socket(Socket &socket); - bool process_request(Stream &strm, const Request &req, Response &res, - bool close_connection); + // Similar to shutdown_ssl and close_socket, this should NOT be called + // concurrently with a DIFFERENT thread sending requests from the socket + void lock_socket_and_shutdown_and_close(); + + bool process_request(Stream &strm, Request &req, Response &res, + bool close_connection, Error &error); + + bool write_content_with_provider(Stream &strm, const Request &req, + Error &error); + + void copy_settings(const ClientImpl &rhs); // Socket endoint information const std::string host_; @@ -858,6 +1043,14 @@ protected: mutable std::mutex socket_mutex_; std::recursive_mutex request_mutex_; + // These are all protected under socket_mutex + size_t socket_requests_in_flight_ = 0; + std::thread::id socket_requests_are_from_thread_ = std::thread::id(); + bool socket_should_be_closed_when_request_is_done_ = false; + + // Default headers + Headers default_headers_; + // Settings std::string client_cert_path_; std::string client_key_path_; @@ -871,6 +1064,7 @@ protected: std::string basic_auth_username_; std::string basic_auth_password_; + std::string bearer_token_auth_token_; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT std::string digest_auth_username_; std::string digest_auth_password_; @@ -879,115 +1073,250 @@ protected: bool keep_alive_ = false; bool follow_location_ = false; + bool tcp_nodelay_ = CPPHTTPLIB_TCP_NODELAY; + SocketOptions socket_options_ = nullptr; + bool compress_ = false; bool decompress_ = true; std::string interface_; std::string proxy_host_; - int proxy_port_; + int proxy_port_ = -1; std::string proxy_basic_auth_username_; std::string proxy_basic_auth_password_; + std::string proxy_bearer_token_auth_token_; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT std::string proxy_digest_auth_username_; std::string proxy_digest_auth_password_; #endif - Logger logger_; - - void copy_settings(const Client &rhs) { - client_cert_path_ = rhs.client_cert_path_; - client_key_path_ = rhs.client_key_path_; - connection_timeout_sec_ = rhs.connection_timeout_sec_; - read_timeout_sec_ = rhs.read_timeout_sec_; - read_timeout_usec_ = rhs.read_timeout_usec_; - write_timeout_sec_ = rhs.write_timeout_sec_; - write_timeout_usec_ = rhs.write_timeout_usec_; - basic_auth_username_ = rhs.basic_auth_username_; - basic_auth_password_ = rhs.basic_auth_password_; -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - digest_auth_username_ = rhs.digest_auth_username_; - digest_auth_password_ = rhs.digest_auth_password_; -#endif - keep_alive_ = rhs.keep_alive_; - follow_location_ = rhs.follow_location_; - compress_ = rhs.compress_; - decompress_ = rhs.decompress_; - interface_ = rhs.interface_; - proxy_host_ = rhs.proxy_host_; - proxy_port_ = rhs.proxy_port_; - proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_; - proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_; - proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_; + bool server_certificate_verification_ = true; #endif - logger_ = rhs.logger_; - } + + Logger logger_; private: - socket_t create_client_socket() const; - bool read_response_line(Stream &strm, Response &res); - bool write_request(Stream &strm, const Request &req, bool close_connection); - bool redirect(const Request &req, Response &res); - bool handle_request(Stream &strm, const Request &req, Response &res, - bool close_connection); - - std::shared_ptr send_with_content_provider( + socket_t create_client_socket(Error &error) const; + bool read_response_line(Stream &strm, const Request &req, Response &res); + bool write_request(Stream &strm, Request &req, bool close_connection, + Error &error); + bool redirect(Request &req, Response &res, Error &error); + bool handle_request(Stream &strm, Request &req, Response &res, + bool close_connection, Error &error); + std::unique_ptr send_with_content_provider( + Request &req, + // const char *method, const char *path, const Headers &headers, + const char *body, size_t content_length, ContentProvider content_provider, + ContentProviderWithoutLength content_provider_without_length, + const char *content_type, Error &error); + Result send_with_content_provider( const char *method, const char *path, const Headers &headers, - const std::string &body, size_t content_length, - ContentProvider content_provider, const char *content_type); + const char *body, size_t content_length, ContentProvider content_provider, + ContentProviderWithoutLength content_provider_without_length, + const char *content_type); - virtual bool process_socket(Socket &socket, + virtual bool process_socket(const Socket &socket, std::function callback); virtual bool is_ssl() const; }; -inline void Get(std::vector &requests, const char *path, - const Headers &headers) { - Request req; - req.method = "GET"; - req.path = path; - req.headers = headers; - requests.emplace_back(std::move(req)); -} +class Client { +public: + // Universal interface + explicit Client(const char *scheme_host_port); -inline void Get(std::vector &requests, const char *path) { - Get(requests, path, Headers()); -} + explicit Client(const char *scheme_host_port, + const std::string &client_cert_path, + const std::string &client_key_path); -inline void Post(std::vector &requests, const char *path, - const Headers &headers, const std::string &body, - const char *content_type) { - Request req; - req.method = "POST"; - req.path = path; - req.headers = headers; - if (content_type) { req.headers.emplace("Content-Type", content_type); } - req.body = body; - requests.emplace_back(std::move(req)); -} + // HTTP only interface + explicit Client(const std::string &host, int port); -inline void Post(std::vector &requests, const char *path, - const std::string &body, const char *content_type) { - Post(requests, path, Headers(), body, content_type); -} + explicit Client(const std::string &host, int port, + const std::string &client_cert_path, + const std::string &client_key_path); -inline void Post(std::vector &requests, const char *path, - size_t content_length, ContentProvider content_provider, - const char *content_type) { - Request req; - req.method = "POST"; - req.headers = Headers(); - req.path = path; - req.content_length = content_length; - req.content_provider = content_provider; + ~Client(); + + bool is_valid() const; + + Result Get(const char *path); + Result Get(const char *path, const Headers &headers); + Result Get(const char *path, Progress progress); + Result Get(const char *path, const Headers &headers, Progress progress); + Result Get(const char *path, ContentReceiver content_receiver); + Result Get(const char *path, const Headers &headers, + ContentReceiver content_receiver); + Result Get(const char *path, ContentReceiver content_receiver, + Progress progress); + Result Get(const char *path, const Headers &headers, + ContentReceiver content_receiver, Progress progress); + Result Get(const char *path, ResponseHandler response_handler, + ContentReceiver content_receiver); + Result Get(const char *path, const Headers &headers, + ResponseHandler response_handler, + ContentReceiver content_receiver); + Result Get(const char *path, const Headers &headers, + ResponseHandler response_handler, ContentReceiver content_receiver, + Progress progress); + Result Get(const char *path, ResponseHandler response_handler, + ContentReceiver content_receiver, Progress progress); + + Result Get(const char *path, const Params ¶ms, const Headers &headers, + Progress progress = nullptr); + Result Get(const char *path, const Params ¶ms, const Headers &headers, + ContentReceiver content_receiver, Progress progress = nullptr); + Result Get(const char *path, const Params ¶ms, const Headers &headers, + ResponseHandler response_handler, ContentReceiver content_receiver, + Progress progress = nullptr); + + Result Head(const char *path); + Result Head(const char *path, const Headers &headers); + + Result Post(const char *path); + Result Post(const char *path, const char *body, size_t content_length, + const char *content_type); + Result Post(const char *path, const Headers &headers, const char *body, + size_t content_length, const char *content_type); + Result Post(const char *path, const std::string &body, + const char *content_type); + Result Post(const char *path, const Headers &headers, const std::string &body, + const char *content_type); + Result Post(const char *path, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Post(const char *path, ContentProviderWithoutLength content_provider, + const char *content_type); + Result Post(const char *path, const Headers &headers, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Post(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type); + Result Post(const char *path, const Params ¶ms); + Result Post(const char *path, const Headers &headers, const Params ¶ms); + Result Post(const char *path, const MultipartFormDataItems &items); + Result Post(const char *path, const Headers &headers, + const MultipartFormDataItems &items); + Result Post(const char *path, const Headers &headers, + const MultipartFormDataItems &items, const std::string &boundary); + Result Put(const char *path); + Result Put(const char *path, const char *body, size_t content_length, + const char *content_type); + Result Put(const char *path, const Headers &headers, const char *body, + size_t content_length, const char *content_type); + Result Put(const char *path, const std::string &body, + const char *content_type); + Result Put(const char *path, const Headers &headers, const std::string &body, + const char *content_type); + Result Put(const char *path, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Put(const char *path, ContentProviderWithoutLength content_provider, + const char *content_type); + Result Put(const char *path, const Headers &headers, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Put(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type); + Result Put(const char *path, const Params ¶ms); + Result Put(const char *path, const Headers &headers, const Params ¶ms); + Result Patch(const char *path); + Result Patch(const char *path, const char *body, size_t content_length, + const char *content_type); + Result Patch(const char *path, const Headers &headers, const char *body, + size_t content_length, const char *content_type); + Result Patch(const char *path, const std::string &body, + const char *content_type); + Result Patch(const char *path, const Headers &headers, + const std::string &body, const char *content_type); + Result Patch(const char *path, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Patch(const char *path, ContentProviderWithoutLength content_provider, + const char *content_type); + Result Patch(const char *path, const Headers &headers, size_t content_length, + ContentProvider content_provider, const char *content_type); + Result Patch(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type); + + Result Delete(const char *path); + Result Delete(const char *path, const Headers &headers); + Result Delete(const char *path, const char *body, size_t content_length, + const char *content_type); + Result Delete(const char *path, const Headers &headers, const char *body, + size_t content_length, const char *content_type); + Result Delete(const char *path, const std::string &body, + const char *content_type); + Result Delete(const char *path, const Headers &headers, + const std::string &body, const char *content_type); + + Result Options(const char *path); + Result Options(const char *path, const Headers &headers); + + bool send(Request &req, Response &res, Error &error); + Result send(const Request &req); - if (content_type) { req.headers.emplace("Content-Type", content_type); } + size_t is_socket_open() const; - requests.emplace_back(std::move(req)); -} + void stop(); + + void set_default_headers(Headers headers); + + void set_tcp_nodelay(bool on); + void set_socket_options(SocketOptions socket_options); + + void set_connection_timeout(time_t sec, time_t usec = 0); + void set_read_timeout(time_t sec, time_t usec = 0); + void set_write_timeout(time_t sec, time_t usec = 0); + + void set_basic_auth(const char *username, const char *password); + void set_bearer_token_auth(const char *token); +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + void set_digest_auth(const char *username, const char *password); +#endif + + void set_keep_alive(bool on); + void set_follow_location(bool on); + + void set_compress(bool on); + + void set_decompress(bool on); + + void set_interface(const char *intf); + + void set_proxy(const char *host, int port); + void set_proxy_basic_auth(const char *username, const char *password); + void set_proxy_bearer_token_auth(const char *token); +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + void set_proxy_digest_auth(const char *username, const char *password); +#endif + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + void enable_server_certificate_verification(bool enabled); +#endif + + void set_logger(Logger logger); + + // SSL +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + void set_ca_cert_path(const char *ca_cert_file_path, + const char *ca_cert_dir_path = nullptr); + + void set_ca_cert_store(X509_STORE *ca_cert_store); + + long get_openssl_verify_result() const; + + SSL_CTX *ssl_context() const; +#endif + +private: + std::unique_ptr cli_; + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + bool is_ssl_ = false; +#endif +}; #ifdef CPPHTTPLIB_OPENSSL_SUPPORT class SSLServer : public Server { @@ -1010,7 +1339,7 @@ private: std::mutex ctx_mutex_; }; -class SSLClient : public Client { +class SSLClient : public ClientImpl { public: explicit SSLClient(const std::string &host); @@ -1032,22 +1361,23 @@ public: void set_ca_cert_store(X509_STORE *ca_cert_store); - void enable_server_certificate_verification(bool enabled); - long get_openssl_verify_result() const; SSL_CTX *ssl_context() const; private: - bool create_and_connect_socket(Socket &socket) override; - void close_socket(Socket &socket, bool process_socket_ret) override; + bool create_and_connect_socket(Socket &socket, Error &error) override; + void shutdown_ssl(Socket &socket, bool shutdown_gracefully) override; - bool process_socket(Socket &socket, + bool process_socket(const Socket &socket, std::function callback) override; bool is_ssl() const override; - bool connect_with_proxy(Socket &sock, Response &res, bool &success); - bool initialize_ssl(Socket &socket); + bool connect_with_proxy(Socket &sock, Response &res, bool &success, + Error &error); + bool initialize_ssl(Socket &socket, Error &error); + + bool load_certs(); bool verify_host(X509 *server_cert) const; bool verify_host_with_subject_alt_name(X509 *server_cert) const; @@ -1056,403 +1386,56 @@ private: SSL_CTX *ctx_; std::mutex ctx_mutex_; + std::once_flag initialize_cert_; + std::vector host_components_; std::string ca_cert_file_path_; std::string ca_cert_dir_path_; - X509_STORE *ca_cert_store_ = nullptr; - bool server_certificate_verification_ = false; long verify_result_ = 0; - friend class Client; + friend class ClientImpl; }; #endif -class Client2 { -public: - explicit Client2(const char *scheme_host_port) - : Client2(scheme_host_port, std::string(), std::string()) {} - - explicit Client2(const char *scheme_host_port, - const std::string &client_cert_path, - const std::string &client_key_path) { - const static std::regex re(R"(^(https?)://([^:/?#]+)(?::(\d+))?)"); +// ---------------------------------------------------------------------------- - std::cmatch m; - if (std::regex_match(scheme_host_port, m, re)) { - auto scheme = m[1].str(); - auto host = m[2].str(); - auto port_str = m[3].str(); +/* + * Implementation + */ - auto port = !port_str.empty() ? std::stoi(port_str) - : (scheme == "https" ? 443 : 80); +namespace detail { - if (scheme == "https") { -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - is_ssl_ = true; - cli_ = std::make_shared(host.c_str(), port, client_cert_path, - client_key_path); -#endif - } else { - cli_ = std::make_shared(host.c_str(), port, client_cert_path, - client_key_path); - } - } +inline bool is_hex(char c, int &v) { + if (0x20 <= c && isdigit(c)) { + v = c - '0'; + return true; + } else if ('A' <= c && c <= 'F') { + v = c - 'A' + 10; + return true; + } else if ('a' <= c && c <= 'f') { + v = c - 'a' + 10; + return true; } + return false; +} - ~Client2() {} - - bool is_valid() const { return cli_ != nullptr; } - - std::shared_ptr Get(const char *path) { return cli_->Get(path); } +inline bool from_hex_to_i(const std::string &s, size_t i, size_t cnt, + int &val) { + if (i >= s.size()) { return false; } - std::shared_ptr Get(const char *path, const Headers &headers) { - return cli_->Get(path, headers); + val = 0; + for (; cnt; i++, cnt--) { + if (!s[i]) { return false; } + int v = 0; + if (is_hex(s[i], v)) { + val = val * 16 + v; + } else { + return false; + } } - - std::shared_ptr Get(const char *path, Progress progress) { - return cli_->Get(path, progress); - } - - std::shared_ptr Get(const char *path, const Headers &headers, - Progress progress) { - return cli_->Get(path, headers, progress); - } - - std::shared_ptr Get(const char *path, - ContentReceiver content_receiver) { - return cli_->Get(path, content_receiver); - } - - std::shared_ptr Get(const char *path, const Headers &headers, - ContentReceiver content_receiver) { - return cli_->Get(path, headers, content_receiver); - } - - std::shared_ptr - Get(const char *path, ContentReceiver content_receiver, Progress progress) { - return cli_->Get(path, content_receiver, progress); - } - - std::shared_ptr Get(const char *path, const Headers &headers, - ContentReceiver content_receiver, - Progress progress) { - return cli_->Get(path, headers, content_receiver, progress); - } - - std::shared_ptr Get(const char *path, const Headers &headers, - ResponseHandler response_handler, - ContentReceiver content_receiver) { - return cli_->Get(path, headers, response_handler, content_receiver); - } - - std::shared_ptr Get(const char *path, const Headers &headers, - ResponseHandler response_handler, - ContentReceiver content_receiver, - Progress progress) { - return cli_->Get(path, headers, response_handler, content_receiver, - progress); - } - - std::shared_ptr Head(const char *path) { return cli_->Head(path); } - - std::shared_ptr Head(const char *path, const Headers &headers) { - return cli_->Head(path, headers); - } - - std::shared_ptr Post(const char *path) { return cli_->Post(path); } - - std::shared_ptr Post(const char *path, const std::string &body, - const char *content_type) { - return cli_->Post(path, body, content_type); - } - - std::shared_ptr Post(const char *path, const Headers &headers, - const std::string &body, - const char *content_type) { - return cli_->Post(path, headers, body, content_type); - } - - std::shared_ptr Post(const char *path, size_t content_length, - ContentProvider content_provider, - const char *content_type) { - return cli_->Post(path, content_length, content_provider, content_type); - } - - std::shared_ptr Post(const char *path, const Headers &headers, - size_t content_length, - ContentProvider content_provider, - const char *content_type) { - return cli_->Post(path, headers, content_length, content_provider, - content_type); - } - - std::shared_ptr Post(const char *path, const Params ¶ms) { - return cli_->Post(path, params); - } - - std::shared_ptr Post(const char *path, const Headers &headers, - const Params ¶ms) { - return cli_->Post(path, headers, params); - } - - std::shared_ptr Post(const char *path, - const MultipartFormDataItems &items) { - return cli_->Post(path, items); - } - - std::shared_ptr Post(const char *path, const Headers &headers, - const MultipartFormDataItems &items) { - return cli_->Post(path, headers, items); - } - - std::shared_ptr Put(const char *path) { return cli_->Put(path); } - - std::shared_ptr Put(const char *path, const std::string &body, - const char *content_type) { - return cli_->Put(path, body, content_type); - } - - std::shared_ptr Put(const char *path, const Headers &headers, - const std::string &body, - const char *content_type) { - return cli_->Put(path, headers, body, content_type); - } - - std::shared_ptr Put(const char *path, size_t content_length, - ContentProvider content_provider, - const char *content_type) { - return cli_->Put(path, content_length, content_provider, content_type); - } - - std::shared_ptr Put(const char *path, const Headers &headers, - size_t content_length, - ContentProvider content_provider, - const char *content_type) { - return cli_->Put(path, headers, content_length, content_provider, - content_type); - } - - std::shared_ptr Put(const char *path, const Params ¶ms) { - return cli_->Put(path, params); - } - - std::shared_ptr Put(const char *path, const Headers &headers, - const Params ¶ms) { - return cli_->Put(path, headers, params); - } - - std::shared_ptr Patch(const char *path, const std::string &body, - const char *content_type) { - return cli_->Patch(path, body, content_type); - } - - std::shared_ptr Patch(const char *path, const Headers &headers, - const std::string &body, - const char *content_type) { - return cli_->Patch(path, headers, body, content_type); - } - - std::shared_ptr Patch(const char *path, size_t content_length, - ContentProvider content_provider, - const char *content_type) { - return cli_->Patch(path, content_length, content_provider, content_type); - } - - std::shared_ptr Patch(const char *path, const Headers &headers, - size_t content_length, - ContentProvider content_provider, - const char *content_type) { - return cli_->Patch(path, headers, content_length, content_provider, - content_type); - } - - std::shared_ptr Delete(const char *path) { - return cli_->Delete(path); - } - - std::shared_ptr Delete(const char *path, const std::string &body, - const char *content_type) { - return cli_->Delete(path, body, content_type); - } - - std::shared_ptr Delete(const char *path, const Headers &headers) { - return cli_->Delete(path, headers); - } - - std::shared_ptr Delete(const char *path, const Headers &headers, - const std::string &body, - const char *content_type) { - return cli_->Delete(path, headers, body, content_type); - } - - std::shared_ptr Options(const char *path) { - return cli_->Options(path); - } - - std::shared_ptr Options(const char *path, const Headers &headers) { - return cli_->Options(path, headers); - } - - bool send(const Request &req, Response &res) { return cli_->send(req, res); } - - bool is_socket_open() { return cli_->is_socket_open(); } - - void stop() { cli_->stop(); } - - Client2 &set_connection_timeout(time_t sec, time_t usec) { - cli_->set_connection_timeout(sec, usec); - return *this; - } - - Client2 &set_read_timeout(time_t sec, time_t usec) { - cli_->set_read_timeout(sec, usec); - return *this; - } - - Client2 &set_basic_auth(const char *username, const char *password) { - cli_->set_basic_auth(username, password); - return *this; - } - -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - Client2 &set_digest_auth(const char *username, const char *password) { - cli_->set_digest_auth(username, password); - return *this; - } -#endif - - Client2 &set_keep_alive(bool on) { - cli_->set_keep_alive(on); - return *this; - } - - Client2 &set_follow_location(bool on) { - cli_->set_follow_location(on); - return *this; - } - - Client2 &set_compress(bool on) { - cli_->set_compress(on); - return *this; - } - - Client2 &set_decompress(bool on) { - cli_->set_decompress(on); - return *this; - } - - Client2 &set_interface(const char *intf) { - cli_->set_interface(intf); - return *this; - } - - Client2 &set_proxy(const char *host, int port) { - cli_->set_proxy(host, port); - return *this; - } - - Client2 &set_proxy_basic_auth(const char *username, const char *password) { - cli_->set_proxy_basic_auth(username, password); - return *this; - } - -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - Client2 &set_proxy_digest_auth(const char *username, const char *password) { - cli_->set_proxy_digest_auth(username, password); - return *this; - } -#endif - - Client2 &set_logger(Logger logger) { - cli_->set_logger(logger); - return *this; - } - - // SSL -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - Client2 &set_ca_cert_path(const char *ca_cert_file_path, - const char *ca_cert_dir_path = nullptr) { - if (is_ssl_) { - static_cast(*cli_).set_ca_cert_path(ca_cert_file_path, - ca_cert_dir_path); - } - return *this; - } - - Client2 &set_ca_cert_store(X509_STORE *ca_cert_store) { - if (is_ssl_) { - static_cast(*cli_).set_ca_cert_store(ca_cert_store); - } - return *this; - } - - Client2 &enable_server_certificate_verification(bool enabled) { - if (is_ssl_) { - static_cast(*cli_).enable_server_certificate_verification( - enabled); - } - return *this; - } - - long get_openssl_verify_result() const { - if (is_ssl_) { - return static_cast(*cli_).get_openssl_verify_result(); - } - return -1; // NOTE: -1 doesn't match any of X509_V_ERR_??? - } - - SSL_CTX *ssl_context() const { - if (is_ssl_) { return static_cast(*cli_).ssl_context(); } - return nullptr; - } -#endif - -private: -#ifdef CPPHTTPLIB_OPENSSL_SUPPORT - bool is_ssl_ = false; -#endif - std::shared_ptr cli_; -}; - -// ---------------------------------------------------------------------------- - -/* - * Implementation - */ - -namespace detail { - -inline bool is_hex(char c, int &v) { - if (0x20 <= c && isdigit(c)) { - v = c - '0'; - return true; - } else if ('A' <= c && c <= 'F') { - v = c - 'A' + 10; - return true; - } else if ('a' <= c && c <= 'f') { - v = c - 'a' + 10; - return true; - } - return false; -} - -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 (; cnt; i++, cnt--) { - if (!s[i]) { return false; } - int v = 0; - if (is_hex(s[i], v)) { - val = val * 16 + v; - } else { - return false; - } - } - return true; -} + return true; +} inline std::string from_i_to_hex(size_t n) { const char *charset = "0123456789abcdef"; @@ -1573,6 +1556,95 @@ inline bool is_valid_path(const std::string &path) { return true; } +inline std::string encode_query_param(const std::string &value) { + std::ostringstream escaped; + escaped.fill('0'); + escaped << std::hex; + + for (auto c : value) { + if (std::isalnum(static_cast(c)) || c == '-' || c == '_' || + c == '.' || c == '!' || c == '~' || c == '*' || c == '\'' || c == '(' || + c == ')') { + escaped << c; + } else { + escaped << std::uppercase; + escaped << '%' << std::setw(2) + << static_cast(static_cast(c)); + escaped << std::nouppercase; + } + } + + return escaped.str(); +} + +inline std::string encode_url(const std::string &s) { + std::string result; + + for (size_t i = 0; s[i]; i++) { + switch (s[i]) { + case ' ': result += "%20"; break; + case '+': result += "%2B"; break; + case '\r': result += "%0D"; break; + case '\n': result += "%0A"; break; + case '\'': result += "%27"; break; + case ',': result += "%2C"; break; + // case ':': result += "%3A"; break; // ok? probably... + case ';': result += "%3B"; break; + default: + auto c = static_cast(s[i]); + if (c >= 0x80) { + result += '%'; + char hex[4]; + auto len = snprintf(hex, sizeof(hex) - 1, "%02X", c); + assert(len == 2); + result.append(hex, static_cast(len)); + } else { + result += s[i]; + } + break; + } + } + + return result; +} + +inline std::string decode_url(const std::string &s, + bool convert_plus_to_space) { + std::string result; + + for (size_t i = 0; i < s.size(); i++) { + if (s[i] == '%' && i + 1 < s.size()) { + if (s[i + 1] == 'u') { + int val = 0; + 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 { + int val = 0; + if (from_hex_to_i(s, i + 1, 2, val)) { + // 2 digits hex codes + result += static_cast(val); + i += 2; // '00' + } else { + result += s[i]; + } + } + } else if (convert_plus_to_space && s[i] == '+') { + result += ' '; + } else { + result += s[i]; + } + } + + return result; +} + inline void read_file(const std::string &path, std::string &out) { std::ifstream fs(path, std::ios_base::binary); fs.seekg(0, std::ios_base::end); @@ -1589,19 +1661,41 @@ inline std::string file_extension(const std::string &path) { return std::string(); } +inline bool is_space_or_tab(char c) { return c == ' ' || c == '\t'; } + +inline std::pair trim(const char *b, const char *e, size_t left, + size_t right) { + while (b + left < e && is_space_or_tab(b[left])) { + left++; + } + while (right > 0 && is_space_or_tab(b[right - 1])) { + right--; + } + return std::make_pair(left, right); +} + +inline std::string trim_copy(const std::string &s) { + auto r = trim(s.data(), s.data() + s.size(), 0, s.size()); + return s.substr(r.first, r.second - r.first); +} + template void split(const char *b, const char *e, char d, Fn fn) { - int i = 0; - int beg = 0; + size_t i = 0; + size_t beg = 0; - while (e ? (b + i != e) : (b[i] != '\0')) { + while (e ? (b + i < e) : (b[i] != '\0')) { if (b[i] == d) { - fn(&b[beg], &b[i]); + auto r = trim(b, e, beg, i); + if (r.first < r.second) { fn(&b[r.first], &b[r.second]); } beg = i + 1; } i++; } - if (i) { fn(&b[beg], &b[i]); } + if (i) { + auto r = trim(b, e, beg, i); + if (r.first < r.second) { fn(&b[r.first], &b[r.second]); } + } } // NOTE: until the read size reaches `fixed_buffer_size`, use `fixed_buffer` @@ -1704,10 +1798,14 @@ inline ssize_t select_read(socket_t sock, time_t sec, time_t usec) { pfd_read.fd = sock; pfd_read.events = POLLIN; - auto timeout = static_cast(sec * 1000 + usec); + auto timeout = static_cast(sec * 1000 + usec / 1000); return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); }); #else +#ifndef _WIN32 + if (sock >= FD_SETSIZE) { return 1; } +#endif + fd_set fds; FD_ZERO(&fds); FD_SET(sock, &fds); @@ -1732,6 +1830,10 @@ inline ssize_t select_write(socket_t sock, time_t sec, time_t usec) { return handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); }); #else +#ifndef _WIN32 + if (sock >= FD_SETSIZE) { return 1; } +#endif + fd_set fds; FD_ZERO(&fds); FD_SET(sock, &fds); @@ -1752,7 +1854,7 @@ inline bool wait_until_socket_is_ready(socket_t sock, time_t sec, time_t usec) { pfd_read.fd = sock; pfd_read.events = POLLIN | POLLOUT; - auto timeout = static_cast(sec * 1000 + usec); + auto timeout = static_cast(sec * 1000 + usec / 1000); auto poll_res = handle_EINTR([&]() { return poll(&pfd_read, 1, timeout); }); @@ -1765,6 +1867,10 @@ inline bool wait_until_socket_is_ready(socket_t sock, time_t sec, time_t usec) { } return false; #else +#ifndef _WIN32 + if (sock >= FD_SETSIZE) { return false; } +#endif + fd_set fdsr; FD_ZERO(&fdsr); FD_SET(sock, &fdsr); @@ -1802,6 +1908,7 @@ public: ssize_t read(char *ptr, size_t size) override; ssize_t write(const char *ptr, size_t size) override; void get_remote_ip_and_port(std::string &ip, int &port) const override; + socket_t socket() const override; private: socket_t sock_; @@ -1824,6 +1931,7 @@ public: ssize_t read(char *ptr, size_t size) override; ssize_t write(const char *ptr, size_t size) override; void get_remote_ip_and_port(std::string &ip, int &port) const override; + socket_t socket() const override; private: socket_t sock_; @@ -1845,6 +1953,7 @@ public: ssize_t read(char *ptr, size_t size) override; ssize_t write(const char *ptr, size_t size) override; void get_remote_ip_and_port(std::string &ip, int &port) const override; + socket_t socket() const override; const std::string &get_buffer() const; @@ -1853,7 +1962,7 @@ private: size_t position = 0; }; -inline bool keep_alive(socket_t sock) { +inline bool keep_alive(socket_t sock, time_t keep_alive_timeout_sec) { using namespace std::chrono; auto start = steady_clock::now(); while (true) { @@ -1863,8 +1972,7 @@ inline bool keep_alive(socket_t sock) { } else if (val == 0) { auto current = steady_clock::now(); auto duration = duration_cast(current - start); - auto timeout = CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND * 100 + - CPPHTTPLIB_KEEPALIVE_TIMEOUT_SECOND; + auto timeout = keep_alive_timeout_sec * 1000; if (duration.count() > timeout) { return false; } std::this_thread::sleep_for(std::chrono::milliseconds(1)); } else { @@ -1874,13 +1982,13 @@ inline bool keep_alive(socket_t sock) { } template -inline bool process_server_socket_core(socket_t sock, - size_t keep_alive_max_count, - T callback) { +inline bool +process_server_socket_core(socket_t sock, size_t keep_alive_max_count, + time_t keep_alive_timeout_sec, T callback) { assert(keep_alive_max_count > 0); auto ret = false; auto count = keep_alive_max_count; - while (count > 0 && keep_alive(sock)) { + while (count > 0 && keep_alive(sock, keep_alive_timeout_sec)) { auto close_connection = count == 1; auto connection_closed = false; ret = callback(close_connection, connection_closed); @@ -1891,14 +1999,14 @@ inline bool process_server_socket_core(socket_t sock, } template -inline bool process_server_socket(socket_t sock, size_t keep_alive_max_count, - time_t read_timeout_sec, - time_t read_timeout_usec, - time_t write_timeout_sec, - time_t write_timeout_usec, T callback) { +inline bool +process_server_socket(socket_t sock, size_t keep_alive_max_count, + time_t keep_alive_timeout_sec, time_t read_timeout_sec, + time_t read_timeout_usec, time_t write_timeout_sec, + time_t write_timeout_usec, T callback) { return process_server_socket_core( - sock, keep_alive_max_count, - [&](bool close_connection, bool connection_closed) { + sock, keep_alive_max_count, keep_alive_timeout_sec, + [&](bool close_connection, bool &connection_closed) { SocketStream strm(sock, read_timeout_sec, read_timeout_usec, write_timeout_sec, write_timeout_usec); return callback(strm, close_connection, connection_closed); @@ -1925,7 +2033,7 @@ inline int shutdown_socket(socket_t sock) { template socket_t create_socket(const char *host, int port, int socket_flags, - SocketOptions socket_options, + bool tcp_nodelay, SocketOptions socket_options, BindOrConnect bind_or_connect) { // Get address info struct addrinfo hints; @@ -1940,6 +2048,9 @@ socket_t create_socket(const char *host, int port, int socket_flags, auto service = std::to_string(port); if (getaddrinfo(host, service.c_str(), &hints, &result)) { +#ifdef __linux__ + res_init(); +#endif return INVALID_SOCKET; } @@ -1974,6 +2085,12 @@ socket_t create_socket(const char *host, int port, int socket_flags, if (fcntl(sock, F_SETFD, FD_CLOEXEC) == -1) { continue; } #endif + if (tcp_nodelay) { + int yes = 1; + setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast(&yes), + sizeof(yes)); + } + if (socket_options) { socket_options(sock); } if (rp->ai_family == AF_INET6) { @@ -2038,7 +2155,11 @@ inline bool bind_ip_address(socket_t sock, const char *host) { return ret; } -#ifndef _WIN32 +#if !defined _WIN32 && !defined ANDROID +#define USE_IF2IP +#endif + +#ifdef USE_IF2IP inline std::string if2ip(const std::string &ifn) { struct ifaddrs *ifap; getifaddrs(&ifap); @@ -2060,17 +2181,21 @@ inline std::string if2ip(const std::string &ifn) { #endif inline socket_t create_client_socket(const char *host, int port, + bool tcp_nodelay, SocketOptions socket_options, time_t timeout_sec, time_t timeout_usec, - const std::string &intf) { - return create_socket( - host, port, 0, socket_options, + const std::string &intf, Error &error) { + auto sock = create_socket( + host, port, 0, tcp_nodelay, std::move(socket_options), [&](socket_t sock, struct addrinfo &ai) -> bool { if (!intf.empty()) { -#ifndef _WIN32 +#ifdef USE_IF2IP auto ip = if2ip(intf); if (ip.empty()) { ip = intf; } - if (!bind_ip_address(sock, ip.c_str())) { return false; } + if (!bind_ip_address(sock, ip.c_str())) { + error = Error::BindIPAddress; + return false; + } #endif } @@ -2078,17 +2203,28 @@ inline socket_t create_client_socket(const char *host, int port, auto ret = ::connect(sock, ai.ai_addr, static_cast(ai.ai_addrlen)); + if (ret < 0) { if (is_connection_error() || !wait_until_socket_is_ready(sock, timeout_sec, timeout_usec)) { close_socket(sock); + error = Error::Connection; return false; } } set_nonblocking(sock, false); + error = Error::Success; return true; }); + + if (sock != INVALID_SOCKET) { + error = Error::Success; + } else { + if (error == Error::Success) { error = Error::Connection; } + } + + return sock; } inline void get_remote_ip_and_port(const struct sockaddr_storage &addr, @@ -2119,6 +2255,25 @@ inline void get_remote_ip_and_port(socket_t sock, std::string &ip, int &port) { } } +inline constexpr unsigned int str2tag_core(const char *s, size_t l, + unsigned int h) { + return (l == 0) ? h + : str2tag_core(s + 1, l - 1, + (h * 33) ^ static_cast(*s)); +} + +inline unsigned int str2tag(const std::string &s) { + return str2tag_core(s.data(), s.size(), 0); +} + +namespace udl { + +inline constexpr unsigned int operator"" _(const char *s, size_t l) { + return str2tag_core(s, l, 0); +} + +} // namespace udl + inline const char * find_content_type(const std::string &path, const std::map &user_data) { @@ -2127,36 +2282,60 @@ find_content_type(const std::string &path, auto it = user_data.find(ext); if (it != user_data.end()) { return it->second.c_str(); } - if (ext == "txt") { - return "text/plain"; - } else if (ext == "html" || ext == "htm") { - return "text/html"; - } else if (ext == "css") { - return "text/css"; - } else if (ext == "jpeg" || ext == "jpg") { - return "image/jpg"; - } else if (ext == "png") { - return "image/png"; - } else if (ext == "gif") { - return "image/gif"; - } else if (ext == "svg") { - return "image/svg+xml"; - } else if (ext == "ico") { - return "image/x-icon"; - } else if (ext == "json") { - return "application/json"; - } else if (ext == "pdf") { - return "application/pdf"; - } else if (ext == "js") { - return "application/javascript"; - } else if (ext == "wasm") { - return "application/wasm"; - } else if (ext == "xml") { - return "application/xml"; - } else if (ext == "xhtml") { - return "application/xhtml+xml"; + using udl::operator""_; + + switch (str2tag(ext)) { + default: return nullptr; + case "css"_: return "text/css"; + case "csv"_: return "text/csv"; + case "txt"_: return "text/plain"; + case "vtt"_: return "text/vtt"; + case "htm"_: + case "html"_: return "text/html"; + + case "apng"_: return "image/apng"; + case "avif"_: return "image/avif"; + case "bmp"_: return "image/bmp"; + case "gif"_: return "image/gif"; + case "png"_: return "image/png"; + case "svg"_: return "image/svg+xml"; + case "webp"_: return "image/webp"; + case "ico"_: return "image/x-icon"; + case "tif"_: return "image/tiff"; + case "tiff"_: return "image/tiff"; + case "jpg"_: + case "jpeg"_: return "image/jpeg"; + + case "mp4"_: return "video/mp4"; + case "mpeg"_: return "video/mpeg"; + case "webm"_: return "video/webm"; + + case "mp3"_: return "audio/mp3"; + case "mpga"_: return "audio/mpeg"; + case "weba"_: return "audio/webm"; + case "wav"_: return "audio/wave"; + + case "otf"_: return "font/otf"; + case "ttf"_: return "font/ttf"; + case "woff"_: return "font/woff"; + case "woff2"_: return "font/woff2"; + + case "7z"_: return "application/x-7z-compressed"; + case "atom"_: return "application/atom+xml"; + case "pdf"_: return "application/pdf"; + case "js"_: + case "mjs"_: return "application/javascript"; + case "json"_: return "application/json"; + case "rss"_: return "application/rss+xml"; + case "tar"_: return "application/x-tar"; + case "xht"_: + case "xhtml"_: return "application/xhtml+xml"; + case "xslt"_: return "application/xslt+xml"; + case "xml"_: return "application/xml"; + case "gz"_: return "application/gzip"; + case "zip"_: return "application/zip"; + case "wasm"_: return "application/wasm"; } - return nullptr; } inline const char *status_message(int status) { @@ -2229,99 +2408,269 @@ inline const char *status_message(int status) { } } -#ifdef CPPHTTPLIB_ZLIB_SUPPORT -inline bool can_compress(const std::string &content_type) { - return !content_type.find("text/") || content_type == "image/svg+xml" || +inline bool can_compress_content_type(const std::string &content_type) { + return (!content_type.find("text/") && content_type != "text/event-stream") || + content_type == "image/svg+xml" || content_type == "application/javascript" || content_type == "application/json" || content_type == "application/xml" || content_type == "application/xhtml+xml"; } -inline bool compress(std::string &content) { - z_stream strm; - strm.zalloc = Z_NULL; - strm.zfree = Z_NULL; - strm.opaque = Z_NULL; +enum class EncodingType { None = 0, Gzip, Brotli }; - auto ret = deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8, - Z_DEFAULT_STRATEGY); - if (ret != Z_OK) { return false; } +inline EncodingType encoding_type(const Request &req, const Response &res) { + auto ret = + detail::can_compress_content_type(res.get_header_value("Content-Type")); + if (!ret) { return EncodingType::None; } - strm.avail_in = static_cast(content.size()); - strm.next_in = - const_cast(reinterpret_cast(content.data())); + const auto &s = req.get_header_value("Accept-Encoding"); + (void)(s); - std::string compressed; +#ifdef CPPHTTPLIB_BROTLI_SUPPORT + // TODO: 'Accept-Encoding' has br, not br;q=0 + ret = s.find("br") != std::string::npos; + if (ret) { return EncodingType::Brotli; } +#endif - std::array buff{}; - do { - strm.avail_out = buff.size(); - strm.next_out = reinterpret_cast(buff.data()); - ret = deflate(&strm, Z_FINISH); - assert(ret != Z_STREAM_ERROR); - compressed.append(buff.data(), buff.size() - strm.avail_out); - } while (strm.avail_out == 0); +#ifdef CPPHTTPLIB_ZLIB_SUPPORT + // TODO: 'Accept-Encoding' has gzip, not gzip;q=0 + ret = s.find("gzip") != std::string::npos; + if (ret) { return EncodingType::Gzip; } +#endif - assert(ret == Z_STREAM_END); - assert(strm.avail_in == 0); + return EncodingType::None; +} - content.swap(compressed); +class compressor { +public: + virtual ~compressor(){}; - deflateEnd(&strm); - return true; -} + typedef std::function Callback; + virtual bool compress(const char *data, size_t data_length, bool last, + Callback callback) = 0; +}; class decompressor { public: - decompressor() { - std::memset(&strm, 0, sizeof(strm)); - strm.zalloc = Z_NULL; - strm.zfree = Z_NULL; - strm.opaque = Z_NULL; + virtual ~decompressor() {} + + virtual bool is_valid() const = 0; + + typedef std::function Callback; + virtual bool decompress(const char *data, size_t data_length, + Callback callback) = 0; +}; + +class nocompressor : public compressor { +public: + ~nocompressor(){}; + + bool compress(const char *data, size_t data_length, bool /*last*/, + Callback callback) override { + if (!data_length) { return true; } + return callback(data, data_length); + } +}; + +#ifdef CPPHTTPLIB_ZLIB_SUPPORT +class gzip_compressor : public compressor { +public: + gzip_compressor() { + std::memset(&strm_, 0, sizeof(strm_)); + strm_.zalloc = Z_NULL; + strm_.zfree = Z_NULL; + strm_.opaque = Z_NULL; + + is_valid_ = deflateInit2(&strm_, Z_DEFAULT_COMPRESSION, Z_DEFLATED, 31, 8, + Z_DEFAULT_STRATEGY) == Z_OK; + } + + ~gzip_compressor() { deflateEnd(&strm_); } + + bool compress(const char *data, size_t data_length, bool last, + Callback callback) override { + assert(is_valid_); + + auto flush = last ? Z_FINISH : Z_NO_FLUSH; + + strm_.avail_in = static_cast(data_length); + strm_.next_in = const_cast(reinterpret_cast(data)); + + int ret = Z_OK; + + std::array buff{}; + do { + strm_.avail_out = buff.size(); + strm_.next_out = reinterpret_cast(buff.data()); + + ret = deflate(&strm_, flush); + if (ret == Z_STREAM_ERROR) { return false; } + + if (!callback(buff.data(), buff.size() - strm_.avail_out)) { + return false; + } + } while (strm_.avail_out == 0); + + assert((last && ret == Z_STREAM_END) || (!last && ret == Z_OK)); + assert(strm_.avail_in == 0); + return true; + } + +private: + bool is_valid_ = false; + z_stream strm_; +}; + +class gzip_decompressor : public decompressor { +public: + gzip_decompressor() { + std::memset(&strm_, 0, sizeof(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 32 specifies // that the stream type should be automatically detected either gzip or // deflate. - is_valid_ = inflateInit2(&strm, 32 + 15) == Z_OK; + is_valid_ = inflateInit2(&strm_, 32 + 15) == Z_OK; } - ~decompressor() { inflateEnd(&strm); } + ~gzip_decompressor() { inflateEnd(&strm_); } - bool is_valid() const { return is_valid_; } + bool is_valid() const override { return is_valid_; } + + bool decompress(const char *data, size_t data_length, + Callback callback) override { + assert(is_valid_); - template - bool decompress(const char *data, size_t data_length, T callback) { int ret = Z_OK; - strm.avail_in = static_cast(data_length); - strm.next_in = const_cast(reinterpret_cast(data)); + strm_.avail_in = static_cast(data_length); + strm_.next_in = const_cast(reinterpret_cast(data)); - std::array buff{}; - do { - strm.avail_out = buff.size(); - strm.next_out = reinterpret_cast(buff.data()); + std::array buff{}; + while (strm_.avail_in > 0) { + strm_.avail_out = buff.size(); + strm_.next_out = reinterpret_cast(buff.data()); + + ret = inflate(&strm_, Z_NO_FLUSH); + assert(ret != Z_STREAM_ERROR); + switch (ret) { + case Z_NEED_DICT: + case Z_DATA_ERROR: + case Z_MEM_ERROR: inflateEnd(&strm_); return false; + } + + if (!callback(buff.data(), buff.size() - strm_.avail_out)) { + return false; + } + } + + return ret == Z_OK || ret == Z_STREAM_END; + } + +private: + bool is_valid_ = false; + z_stream strm_; +}; +#endif + +#ifdef CPPHTTPLIB_BROTLI_SUPPORT +class brotli_compressor : public compressor { +public: + brotli_compressor() { + state_ = BrotliEncoderCreateInstance(nullptr, nullptr, nullptr); + } + + ~brotli_compressor() { BrotliEncoderDestroyInstance(state_); } + + bool compress(const char *data, size_t data_length, bool last, + Callback callback) override { + std::array buff{}; + + auto operation = last ? BROTLI_OPERATION_FINISH : BROTLI_OPERATION_PROCESS; + auto available_in = data_length; + auto next_in = reinterpret_cast(data); + + for (;;) { + if (last) { + if (BrotliEncoderIsFinished(state_)) { break; } + } else { + if (!available_in) { break; } + } + + auto available_out = buff.size(); + auto next_out = buff.data(); + + if (!BrotliEncoderCompressStream(state_, operation, &available_in, + &next_in, &available_out, &next_out, + nullptr)) { + return false; + } + + auto output_bytes = buff.size() - available_out; + if (output_bytes) { + callback(reinterpret_cast(buff.data()), output_bytes); + } + } + + return true; + } + +private: + BrotliEncoderState *state_ = nullptr; +}; + +class brotli_decompressor : public decompressor { +public: + brotli_decompressor() { + decoder_s = BrotliDecoderCreateInstance(0, 0, 0); + decoder_r = decoder_s ? BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT + : BROTLI_DECODER_RESULT_ERROR; + } + + ~brotli_decompressor() { + if (decoder_s) { BrotliDecoderDestroyInstance(decoder_s); } + } + + bool is_valid() const override { return decoder_s; } + + bool decompress(const char *data, size_t data_length, + Callback callback) override { + if (decoder_r == BROTLI_DECODER_RESULT_SUCCESS || + decoder_r == BROTLI_DECODER_RESULT_ERROR) { + return 0; + } + + const uint8_t *next_in = (const uint8_t *)data; + size_t avail_in = data_length; + size_t total_out; + + decoder_r = BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT; + + std::array buff{}; + while (decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_OUTPUT) { + char *next_out = buff.data(); + size_t avail_out = buff.size(); + + decoder_r = BrotliDecoderDecompressStream( + decoder_s, &avail_in, &next_in, &avail_out, + reinterpret_cast(&next_out), &total_out); - ret = inflate(&strm, Z_NO_FLUSH); - assert(ret != Z_STREAM_ERROR); - switch (ret) { - case Z_NEED_DICT: - case Z_DATA_ERROR: - case Z_MEM_ERROR: inflateEnd(&strm); return false; - } + if (decoder_r == BROTLI_DECODER_RESULT_ERROR) { return false; } - if (!callback(buff.data(), buff.size() - strm.avail_out)) { - return false; - } - } while (strm.avail_out == 0); + if (!callback(buff.data(), buff.size() - avail_out)) { return false; } + } - return ret == Z_OK || ret == Z_STREAM_END; + return decoder_r == BROTLI_DECODER_RESULT_SUCCESS || + decoder_r == BROTLI_DECODER_RESULT_NEEDS_MORE_INPUT; } private: - bool is_valid_; - z_stream strm; + BrotliDecoderResult decoder_r; + BrotliDecoderState *decoder_s = nullptr; }; #endif @@ -2338,34 +2687,51 @@ inline const char *get_header_value(const Headers &headers, const char *key, return def; } -inline uint64_t get_header_value_uint64(const Headers &headers, const char *key, - uint64_t def = 0) { - auto it = headers.find(key); - if (it != headers.end()) { +template +inline T get_header_value(const Headers & /*headers*/, const char * /*key*/, + size_t /*id*/ = 0, uint64_t /*def*/ = 0) {} + +template <> +inline uint64_t get_header_value(const Headers &headers, + const char *key, size_t id, + uint64_t def) { + auto rng = headers.equal_range(key); + auto it = rng.first; + std::advance(it, static_cast(id)); + if (it != rng.second) { return std::strtoull(it->second.data(), nullptr, 10); } return def; } -inline void parse_header(const char *beg, const char *end, Headers &headers) { +template +inline bool parse_header(const char *beg, const char *end, T fn) { + // Skip trailing spaces and tabs. + while (beg < end && is_space_or_tab(end[-1])) { + end--; + } + auto p = beg; while (p < end && *p != ':') { p++; } + + if (p == end) { return false; } + + auto key_end = p; + + if (*p++ != ':') { return false; } + + while (p < end && is_space_or_tab(*p)) { + p++; + } + if (p < end) { - auto key_end = p; - p++; // skip ':' - while (p < end && (*p == ' ' || *p == '\t')) { - p++; - } - if (p < end) { - auto val_begin = p; - while (p < end) { - p++; - } - headers.emplace(std::string(beg, key_end), std::string(val_begin, end)); - } + fn(std::string(beg, key_end), decode_url(std::string(p, end), false)); + return true; } + + return false; } inline bool read_headers(Stream &strm, Headers &headers) { @@ -2384,20 +2750,21 @@ inline bool read_headers(Stream &strm, Headers &headers) { continue; // Skip invalid line. } - // Skip trailing spaces and tabs. + // Exclude CRLF auto end = line_reader.ptr() + line_reader.size() - 2; - while (line_reader.ptr() < end && (end[-1] == ' ' || end[-1] == '\t')) { - end--; - } - parse_header(line_reader.ptr(), end, headers); + parse_header(line_reader.ptr(), end, + [&](std::string &&key, std::string &&val) { + headers.emplace(std::move(key), std::move(val)); + }); } return true; } inline bool read_content_with_length(Stream &strm, uint64_t len, - Progress progress, ContentReceiver out) { + Progress progress, + ContentReceiverWithProgress out) { char buf[CPPHTTPLIB_RECV_BUFSIZ]; uint64_t r = 0; @@ -2406,8 +2773,7 @@ inline bool read_content_with_length(Stream &strm, uint64_t len, auto n = strm.read(buf, (std::min)(read_len, CPPHTTPLIB_RECV_BUFSIZ)); if (n <= 0) { return false; } - if (!out(buf, static_cast(n))) { return false; } - + if (!out(buf, static_cast(n), r, len)) { return false; } r += static_cast(n); if (progress) { @@ -2429,8 +2795,10 @@ inline void skip_content_with_length(Stream &strm, uint64_t len) { } } -inline bool read_content_without_length(Stream &strm, ContentReceiver out) { +inline bool read_content_without_length(Stream &strm, + ContentReceiverWithProgress out) { char buf[CPPHTTPLIB_RECV_BUFSIZ]; + uint64_t r = 0; for (;;) { auto n = strm.read(buf, CPPHTTPLIB_RECV_BUFSIZ); if (n < 0) { @@ -2438,13 +2806,16 @@ inline bool read_content_without_length(Stream &strm, ContentReceiver out) { } else if (n == 0) { return true; } - if (!out(buf, static_cast(n))) { return false; } + + if (!out(buf, static_cast(n), r, 0)) { return false; } + r += static_cast(n); } return true; } -inline bool read_content_chunked(Stream &strm, ContentReceiver out) { +inline bool read_content_chunked(Stream &strm, + ContentReceiverWithProgress out) { const auto bufsiz = 16; char buf[bufsiz]; @@ -2488,76 +2859,87 @@ inline bool is_chunked_transfer_encoding(const Headers &headers) { "chunked"); } -template -bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status, - Progress progress, ContentReceiver receiver, - bool decompress) { - - ContentReceiver out = [&](const char *buf, size_t n) { - return receiver(buf, n); - }; +template +bool prepare_content_receiver(T &x, int &status, + ContentReceiverWithProgress receiver, + bool decompress, U callback) { + if (decompress) { + std::string encoding = x.get_header_value("Content-Encoding"); + std::unique_ptr decompressor; + if (encoding.find("gzip") != std::string::npos || + encoding.find("deflate") != std::string::npos) { #ifdef CPPHTTPLIB_ZLIB_SUPPORT - decompressor decompressor; + decompressor = detail::make_unique(); +#else + status = 415; + return false; #endif - - if (decompress) { -#ifdef CPPHTTPLIB_ZLIB_SUPPORT - std::string content_encoding = x.get_header_value("Content-Encoding"); - if (content_encoding.find("gzip") != std::string::npos || - content_encoding.find("deflate") != std::string::npos) { - if (!decompressor.is_valid()) { - status = 500; - return false; - } - - out = [&](const char *buf, size_t n) { - return decompressor.decompress(buf, n, [&](const char *buf, size_t n) { - return receiver(buf, n); - }); - }; - } + } else if (encoding.find("br") != std::string::npos) { +#ifdef CPPHTTPLIB_BROTLI_SUPPORT + decompressor = detail::make_unique(); #else - if (x.get_header_value("Content-Encoding") == "gzip") { status = 415; return false; - } #endif - } - - auto ret = true; - auto exceed_payload_max_length = false; + } - if (is_chunked_transfer_encoding(x.headers)) { - ret = read_content_chunked(strm, out); - } else if (!has_header(x.headers, "Content-Length")) { - ret = read_content_without_length(strm, out); - } else { - auto len = get_header_value_uint64(x.headers, "Content-Length", 0); - if (len > payload_max_length) { - exceed_payload_max_length = true; - skip_content_with_length(strm, len); - ret = false; - } else if (len > 0) { - ret = read_content_with_length(strm, len, progress, out); + if (decompressor) { + if (decompressor->is_valid()) { + ContentReceiverWithProgress out = [&](const char *buf, size_t n, + uint64_t off, uint64_t len) { + return decompressor->decompress(buf, n, + [&](const char *buf, size_t n) { + return receiver(buf, n, off, len); + }); + }; + return callback(std::move(out)); + } else { + status = 500; + return false; + } } } - if (!ret) { status = exceed_payload_max_length ? 413 : 400; } - return ret; + ContentReceiverWithProgress out = [&](const char *buf, size_t n, uint64_t off, + uint64_t len) { + return receiver(buf, n, off, len); + }; + return callback(std::move(out)); } template -inline ssize_t write_headers(Stream &strm, const T &info, - const Headers &headers) { +bool read_content(Stream &strm, T &x, size_t payload_max_length, int &status, + Progress progress, ContentReceiverWithProgress receiver, + bool decompress) { + return prepare_content_receiver( + x, status, std::move(receiver), decompress, + [&](const ContentReceiverWithProgress &out) { + auto ret = true; + auto exceed_payload_max_length = false; + + if (is_chunked_transfer_encoding(x.headers)) { + ret = read_content_chunked(strm, out); + } else if (!has_header(x.headers, "Content-Length")) { + ret = read_content_without_length(strm, out); + } else { + auto len = get_header_value(x.headers, "Content-Length"); + if (len > payload_max_length) { + exceed_payload_max_length = true; + skip_content_with_length(strm, len); + ret = false; + } else if (len > 0) { + ret = read_content_with_length(strm, len, std::move(progress), out); + } + } + + if (!ret) { status = exceed_payload_max_length ? 413 : 400; } + return ret; + }); +} + +inline ssize_t write_headers(Stream &strm, const Headers &headers) { ssize_t write_len = 0; - for (const auto &x : info.headers) { - if (x.first == "EXCEPTION_WHAT") { continue; } - auto len = - strm.write_format("%s: %s\r\n", x.first.c_str(), x.second.c_str()); - if (len < 0) { return len; } - write_len += len; - } for (const auto &x : headers) { auto len = strm.write_format("%s: %s\r\n", x.first.c_str(), x.second.c_str()); @@ -2581,84 +2963,175 @@ inline bool write_data(Stream &strm, const char *d, size_t l) { } template -inline ssize_t write_content(Stream &strm, ContentProvider content_provider, - size_t offset, size_t length, T is_shutting_down) { - size_t begin_offset = offset; +inline bool write_content(Stream &strm, const ContentProvider &content_provider, + size_t offset, size_t length, T is_shutting_down, + Error &error) { size_t end_offset = offset + length; - auto ok = true; - DataSink data_sink; + data_sink.write = [&](const char *d, size_t l) { if (ok) { - offset += l; - if (!write_data(strm, d, l)) { ok = false; } + if (write_data(strm, d, l)) { + offset += l; + } else { + ok = false; + } } }; + data_sink.is_writable = [&](void) { return ok && strm.is_writable(); }; - while (ok && offset < end_offset && !is_shutting_down()) { + while (offset < end_offset && !is_shutting_down()) { if (!content_provider(offset, end_offset - offset, data_sink)) { - return -1; + error = Error::Canceled; + return false; + } + if (!ok) { + error = Error::Write; + return false; } - if (!ok) { return -1; } } - return static_cast(offset - begin_offset); + error = Error::Success; + return true; +} + +template +inline bool write_content(Stream &strm, const ContentProvider &content_provider, + size_t offset, size_t length, + const T &is_shutting_down) { + auto error = Error::Success; + return write_content(strm, content_provider, offset, length, is_shutting_down, + error); } template -inline ssize_t write_content_chunked(Stream &strm, - ContentProvider content_provider, - T is_shutting_down) { +inline bool +write_content_without_length(Stream &strm, + const ContentProvider &content_provider, + const T &is_shutting_down) { size_t offset = 0; auto data_available = true; - ssize_t total_written_length = 0; - auto ok = true; - DataSink data_sink; + data_sink.write = [&](const char *d, size_t l) { if (ok) { - data_available = l > 0; offset += l; + if (!write_data(strm, d, l)) { ok = false; } + } + }; + + data_sink.done = [&](void) { data_available = false; }; + + data_sink.is_writable = [&](void) { return ok && strm.is_writable(); }; + + while (data_available && !is_shutting_down()) { + if (!content_provider(offset, 0, data_sink)) { return false; } + if (!ok) { return false; } + } + return true; +} +template +inline bool +write_content_chunked(Stream &strm, const ContentProvider &content_provider, + const T &is_shutting_down, U &compressor, Error &error) { + size_t offset = 0; + auto data_available = true; + auto ok = true; + DataSink data_sink; + + data_sink.write = [&](const char *d, size_t l) { + if (!ok) { return; } + + data_available = l > 0; + offset += l; + + std::string payload; + if (!compressor.compress(d, l, false, + [&](const char *data, size_t data_len) { + payload.append(data, data_len); + return true; + })) { + ok = false; + return; + } + + if (!payload.empty()) { // Emit chunked response header and footer for each chunk - auto chunk = from_i_to_hex(l) + "\r\n" + std::string(d, l) + "\r\n"; - if (write_data(strm, chunk.data(), chunk.size())) { - total_written_length += chunk.size(); - } else { + auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n"; + if (!write_data(strm, chunk.data(), chunk.size())) { ok = false; + return; } } }; + data_sink.done = [&](void) { + if (!ok) { return; } + data_available = false; - if (ok) { - static const std::string done_marker("0\r\n\r\n"); - if (write_data(strm, done_marker.data(), done_marker.size())) { - total_written_length += done_marker.size(); - } else { + + std::string payload; + if (!compressor.compress(nullptr, 0, true, + [&](const char *data, size_t data_len) { + payload.append(data, data_len); + return true; + })) { + ok = false; + return; + } + + if (!payload.empty()) { + // Emit chunked response header and footer for each chunk + auto chunk = from_i_to_hex(payload.size()) + "\r\n" + payload + "\r\n"; + if (!write_data(strm, chunk.data(), chunk.size())) { ok = false; + return; } } + + static const std::string done_marker("0\r\n\r\n"); + if (!write_data(strm, done_marker.data(), done_marker.size())) { + ok = false; + } }; + data_sink.is_writable = [&](void) { return ok && strm.is_writable(); }; while (data_available && !is_shutting_down()) { - if (!content_provider(offset, 0, data_sink)) { return -1; } - if (!ok) { return -1; } + if (!content_provider(offset, 0, data_sink)) { + error = Error::Canceled; + return false; + } + if (!ok) { + error = Error::Write; + return false; + } } - return total_written_length; + error = Error::Success; + return true; +} + +template +inline bool write_content_chunked(Stream &strm, + const ContentProvider &content_provider, + const T &is_shutting_down, U &compressor) { + auto error = Error::Success; + return write_content_chunked(strm, content_provider, is_shutting_down, + compressor, error); } template -inline bool redirect(T &cli, const Request &req, Response &res, - const std::string &path) { +inline bool redirect(T &cli, Request &req, Response &res, + const std::string &path, const std::string &location, + Error &error) { Request new_req = req; new_req.path = path; - new_req.redirect_count -= 1; + new_req.redirect_count_ -= 1; if (res.status == 303 && (req.method != "GET" && req.method != "HEAD")) { new_req.method = "GET"; @@ -2668,78 +3141,13 @@ inline bool redirect(T &cli, const Request &req, Response &res, Response new_res; - auto ret = cli.send(new_req, new_res); - if (ret) { res = new_res; } - return ret; -} - -inline std::string encode_url(const std::string &s) { - std::string result; - - for (size_t i = 0; s[i]; i++) { - switch (s[i]) { - case ' ': result += "+"; break; - case '=': result += "%3d"; break; - case '+': result += "%2B"; break; - case '\r': result += "%0D"; break; - case '\n': result += "%0A"; break; - case '\'': result += "%27"; break; - case ',': result += "%2C"; break; - // case ':': result += "%3A"; break; // ok? probably... - case ';': result += "%3B"; break; - default: - auto c = static_cast(s[i]); - if (c >= 0x80) { - result += '%'; - char hex[4]; - auto len = snprintf(hex, sizeof(hex) - 1, "%02X", c); - assert(len == 2); - result.append(hex, static_cast(len)); - } else { - result += s[i]; - } - break; - } - } - - return result; -} - -inline std::string decode_url(const std::string &s, - bool convert_plus_to_space) { - std::string result; - - for (size_t i = 0; i < s.size(); i++) { - if (s[i] == '%' && i + 1 < s.size()) { - if (s[i + 1] == 'u') { - int val = 0; - 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 { - int val = 0; - if (from_hex_to_i(s, i + 1, 2, val)) { - // 2 digits hex codes - result += static_cast(val); - i += 2; // '00' - } else { - result += s[i]; - } - } - } else if (convert_plus_to_space && s[i] == '+') { - result += ' '; - } else { - result += s[i]; - } + auto ret = cli.send(new_req, new_res, error); + if (ret) { + req = new_req; + res = new_res; + res.location = location; } - - return result; + return ret; } inline std::string params_to_query_str(const Params ¶ms) { @@ -2749,14 +3157,21 @@ inline std::string params_to_query_str(const Params ¶ms) { if (it != params.begin()) { query += "&"; } query += it->first; query += "="; - query += detail::encode_url(it->second); + query += encode_query_param(it->second); } - return query; } +inline std::string append_query_params(const char *path, const Params ¶ms) { + std::string path_with_query = path; + const static std::regex re("[^?]+\\?.*"); + auto delm = std::regex_match(path, re) ? '&' : '?'; + path_with_query += delm + params_to_query_str(params); + return path_with_query; +} + inline void parse_query_text(const std::string &s, Params ¶ms) { - split(&s[0], &s[s.size()], '&', [&](const char *b, const char *e) { + split(s.data(), s.data() + s.size(), '&', [&](const char *b, const char *e) { std::string key; std::string val; split(b, e, '=', [&](const char *b2, const char *e2) { @@ -2766,7 +3181,10 @@ inline void parse_query_text(const std::string &s, Params ¶ms) { val.assign(b2, e2); } }); - params.emplace(decode_url(key, true), decode_url(val, true)); + + if (!key.empty()) { + params.emplace(decode_url(key, true), decode_url(val, true)); + } }); } @@ -2782,7 +3200,7 @@ inline bool parse_multipart_boundary(const std::string &content_type, return !boundary.empty(); } -inline bool parse_range_header(const std::string &s, Ranges &ranges) { +inline bool parse_range_header(const std::string &s, Ranges &ranges) try { static auto re_first_range = std::regex(R"(bytes=(\d*-\d*(?:,\s*\d*-\d*)*))"); std::smatch m; if (std::regex_match(s, m, re_first_range)) { @@ -2814,7 +3232,7 @@ inline bool parse_range_header(const std::string &s, Ranges &ranges) { return all_valid_ranges; } return false; -} +} catch (...) { return false; } class MultipartFormDataParser { public: @@ -2824,10 +3242,8 @@ public: bool is_valid() const { return is_valid_; } - template - bool parse(const char *buf, size_t n, T content_callback, U header_callback) { - static const std::regex re_content_type(R"(^Content-Type:\s*(.*?)\s*$)", - std::regex_constants::icase); + bool parse(const char *buf, size_t n, const ContentReceiver &content_callback, + const MultipartContentHeader &header_callback) { static const std::regex re_content_disposition( "^Content-Disposition:\\s*form-data;\\s*name=\"(.*?)\"(?:;\\s*filename=" @@ -2870,12 +3286,13 @@ public: break; } - auto header = buf_.substr(0, pos); - { + static const std::string header_name = "content-type:"; + const auto header = buf_.substr(0, pos); + if (start_with_case_ignore(header, header_name)) { + file_.content_type = trim_copy(header.substr(header_name.size())); + } else { 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)) { + if (std::regex_match(header, m, re_content_disposition)) { file_.name = m[1]; file_.filename = m[2]; } @@ -2893,15 +3310,7 @@ public: auto pattern = crlf_ + dash_; if (pattern.size() > buf_.size()) { return true; } - auto pos = buf_.find(pattern); - if (pos == std::string::npos) { - pos = buf_.size(); - while (pos > 0) { - auto c = buf_[pos - 1]; - if (c != '\r' && c != '\n' && c != '-') { break; } - pos--; - } - } + auto pos = find_string(buf_, pattern); if (!content_callback(buf_.data(), pos)) { is_valid_ = false; @@ -2911,7 +3320,6 @@ public: off_ += pos; buf_.erase(0, pos); } - { auto pattern = crlf_ + dash_ + boundary_; if (pattern.size() > buf_.size()) { return true; } @@ -2940,14 +3348,14 @@ public: } case 4: { // Boundary if (crlf_.size() > buf_.size()) { return true; } - if (buf_.find(crlf_) == 0) { + if (buf_.compare(0, crlf_.size(), crlf_) == 0) { buf_.erase(0, crlf_.size()); off_ += crlf_.size(); state_ = 1; } else { auto pattern = dash_ + crlf_; if (pattern.size() > buf_.size()) { return true; } - if (buf_.find(pattern) == 0) { + if (buf_.compare(0, pattern.size(), pattern) == 0) { buf_.erase(0, pattern.size()); off_ += pattern.size(); is_valid_ = true; @@ -2975,6 +3383,43 @@ private: file_.content_type.clear(); } + bool start_with_case_ignore(const std::string &a, + const std::string &b) const { + if (a.size() < b.size()) { return false; } + for (size_t i = 0; i < b.size(); i++) { + if (::tolower(a[i]) != ::tolower(b[i])) { return false; } + } + return true; + } + + bool start_with(const std::string &a, size_t off, + const std::string &b) const { + if (a.size() - off < b.size()) { return false; } + for (size_t i = 0; i < b.size(); i++) { + if (a[i + off] != b[i]) { return false; } + } + return true; + } + + size_t find_string(const std::string &s, const std::string &pattern) const { + auto c = pattern.front(); + + size_t off = 0; + while (off < s.size()) { + auto pos = s.find(c, off); + if (pos == std::string::npos) { return s.size(); } + + auto rem = s.size() - pos; + if (pattern.size() > rem) { return pos; } + + if (start_with(s, pos, pattern)) { return pos; } + + off = pos + 1; + } + + return s.size(); + } + std::string boundary_; std::string buf_; @@ -2998,8 +3443,13 @@ inline std::string make_multipart_data_boundary() { static const char data[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + // std::random_device might actually be deterministic on some + // platforms, but due to lack of support in the c++ standard library, + // doing better requires either some ugly hacks or breaking portability. std::random_device seed_gen; - std::mt19937 engine(seed_gen()); + // Request 128 bits of entropy for initialization + std::seed_seq seed_sequence{seed_gen(), seed_gen(), seed_gen(), seed_gen()}; + std::mt19937 engine(seed_sequence); std::string result = "--cpp-httplib-multipart-data-"; @@ -3022,13 +3472,12 @@ get_range_offset_and_length(const Request &req, size_t content_length, auto slen = static_cast(content_length); if (r.first == -1) { - r.first = slen - r.second; + r.first = (std::max)(static_cast(0), slen - r.second); r.second = slen - 1; } if (r.second == -1) { r.second = slen - 1; } - - return std::make_pair(r.first, r.second - r.first + 1); + return std::make_pair(r.first, static_cast(r.second - r.first) + 1); } inline std::string make_content_range_header_field(size_t offset, size_t length, @@ -3077,21 +3526,21 @@ bool process_multipart_ranges_data(const Request &req, Response &res, return true; } -inline std::string make_multipart_ranges_data(const Request &req, Response &res, - const std::string &boundary, - const std::string &content_type) { - std::string data; - - process_multipart_ranges_data( +inline bool make_multipart_ranges_data(const Request &req, Response &res, + const std::string &boundary, + const std::string &content_type, + std::string &data) { + return process_multipart_ranges_data( req, res, boundary, content_type, [&](const std::string &token) { data += token; }, [&](const char *token) { data += token; }, [&](size_t offset, size_t length) { - data += res.body.substr(offset, length); - return true; + if (offset < res.body.size()) { + data += res.body.substr(offset, length); + return true; + } + return false; }); - - return data; } inline size_t @@ -3117,14 +3566,14 @@ inline bool write_multipart_ranges_data(Stream &strm, const Request &req, Response &res, const std::string &boundary, const std::string &content_type, - T is_shutting_down) { + const T &is_shutting_down) { return process_multipart_ranges_data( req, res, boundary, content_type, [&](const std::string &token) { strm.write(token); }, [&](const char *token) { strm.write(token); }, [&](size_t offset, size_t length) { return write_content(strm, res.content_provider_, offset, length, - is_shutting_down) >= 0; + is_shutting_down); }); } @@ -3142,8 +3591,7 @@ get_range_offset_and_length(const Request &req, const Response &res, inline bool expect_content(const Request &req) { if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH" || - req.method == "PRI" || - (req.method == "DELETE" && req.has_header("Content-Length"))) { + req.method == "PRI" || req.method == "DELETE") { return true; } // TODO: check if Content-Length is set @@ -3189,13 +3637,41 @@ inline std::string SHA_256(const std::string &s) { SHA256_DIGEST_LENGTH); } -inline std::string SHA_512(const std::string &s) { - return message_digest(s, SHA512_Init, SHA512_Update, SHA512_Final, - SHA512_DIGEST_LENGTH); +inline std::string SHA_512(const std::string &s) { + return message_digest(s, SHA512_Init, SHA512_Update, SHA512_Final, + SHA512_DIGEST_LENGTH); +} +#endif + +#ifdef _WIN32 +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT +// NOTE: This code came up with the following stackoverflow post: +// https://stackoverflow.com/questions/9507184/can-openssl-on-windows-use-the-system-certificate-store +inline bool load_system_certs_on_windows(X509_STORE *store) { + auto hStore = CertOpenSystemStoreW((HCRYPTPROV_LEGACY)NULL, L"ROOT"); + + if (!hStore) { return false; } + + PCCERT_CONTEXT pContext = NULL; + while ((pContext = CertEnumCertificatesInStore(hStore, pContext)) != + nullptr) { + auto encoded_cert = + static_cast(pContext->pbCertEncoded); + + auto x509 = d2i_X509(NULL, &encoded_cert, pContext->cbCertEncoded); + if (x509) { + X509_STORE_add_cert(store, x509); + X509_free(x509); + } + } + + CertFreeCertificateContext(pContext); + CertCloseStore(hStore, 0); + + return true; } #endif -#ifdef _WIN32 class WSInit { public: WSInit() { @@ -3209,31 +3685,6 @@ public: static WSInit wsinit_; #endif -} // namespace detail - -// Header utilities -inline std::pair make_range_header(Ranges ranges) { - std::string field = "bytes="; - auto i = 0; - for (auto r : ranges) { - if (i != 0) { field += ", "; } - if (r.first != -1) { field += std::to_string(r.first); } - field += '-'; - if (r.second != -1) { field += std::to_string(r.second); } - i++; - } - return std::make_pair("Range", field); -} - -inline std::pair -make_basic_authentication_header(const std::string &username, - const std::string &password, - bool is_proxy = false) { - auto field = "Basic " + detail::base64_encode(username + ":" + password); - auto key = is_proxy ? "Proxy-Authorization" : "Authorization"; - return std::make_pair(key, field); -} - #ifdef CPPHTTPLIB_OPENSSL_SUPPORT inline std::pair make_digest_authentication_header( const Request &req, const std::map &auth, @@ -3324,13 +3775,60 @@ inline std::string random_string(size_t length) { "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz"; const size_t max_index = (sizeof(charset) - 1); - return charset[static_cast(rand()) % max_index]; + return charset[static_cast(std::rand()) % max_index]; }; std::string str(length, 0); std::generate_n(str.begin(), length, randchar); return str; } +class ContentProviderAdapter { +public: + explicit ContentProviderAdapter( + ContentProviderWithoutLength &&content_provider) + : content_provider_(content_provider) {} + + bool operator()(size_t offset, size_t, DataSink &sink) { + return content_provider_(offset, sink); + } + +private: + ContentProviderWithoutLength content_provider_; +}; + +} // namespace detail + +// Header utilities +inline std::pair make_range_header(Ranges ranges) { + std::string field = "bytes="; + auto i = 0; + for (auto r : ranges) { + if (i != 0) { field += ", "; } + if (r.first != -1) { field += std::to_string(r.first); } + field += '-'; + if (r.second != -1) { field += std::to_string(r.second); } + i++; + } + return std::make_pair("Range", std::move(field)); +} + +inline std::pair +make_basic_authentication_header(const std::string &username, + const std::string &password, + bool is_proxy = false) { + auto field = "Basic " + detail::base64_encode(username + ":" + password); + auto key = is_proxy ? "Proxy-Authorization" : "Authorization"; + return std::make_pair(key, std::move(field)); +} + +inline std::pair +make_bearer_token_authentication_header(const std::string &token, + bool is_proxy = false) { + auto field = "Bearer " + token; + auto key = is_proxy ? "Proxy-Authorization" : "Authorization"; + return std::make_pair(key, std::move(field)); +} + // Request implementation inline bool Request::has_header(const char *key) const { return detail::has_header(headers, key); @@ -3340,6 +3838,11 @@ inline std::string Request::get_header_value(const char *key, size_t id) const { return detail::get_header_value(headers, key, id, ""); } +template +inline T Request::get_header_value(const char *key, size_t id) const { + return detail::get_header_value(headers, key, id, 0); +} + inline size_t Request::get_header_value_count(const char *key) const { auto r = headers.equal_range(key); return static_cast(std::distance(r.first, r.second)); @@ -3399,6 +3902,11 @@ inline std::string Response::get_header_value(const char *key, return detail::get_header_value(headers, key, id, ""); } +template +inline T Response::get_header_value(const char *key, size_t id) const { + return detail::get_header_value(headers, key, id, 0); +} + inline size_t Response::get_header_value_count(const char *key) const { auto r = headers.equal_range(key); return static_cast(std::distance(r.first, r.second)); @@ -3427,38 +3935,78 @@ inline void Response::set_redirect(const char *url, int stat) { } } +inline void Response::set_redirect(const std::string &url, int stat) { + set_redirect(url.c_str(), stat); +} + inline void Response::set_content(const char *s, size_t n, const char *content_type) { body.assign(s, n); + + auto rng = headers.equal_range("Content-Type"); + headers.erase(rng.first, rng.second); set_header("Content-Type", content_type); } -inline void Response::set_content(std::string s, const char *content_type) { - body = std::move(s); - set_header("Content-Type", content_type); +inline void Response::set_content(const std::string &s, + const char *content_type) { + set_content(s.data(), s.size(), content_type); } inline void -Response::set_content_provider(size_t in_length, ContentProvider provider, - std::function resource_releaser) { +Response::set_content_provider(size_t in_length, const char *content_type, + ContentProvider provider, + const std::function &resource_releaser) { assert(in_length > 0); + set_header("Content-Type", content_type); content_length_ = in_length; - content_provider_ = [provider](size_t offset, size_t length, DataSink &sink) { - return provider(offset, length, sink); - }; + content_provider_ = std::move(provider); + content_provider_resource_releaser_ = resource_releaser; + is_chunked_content_provider_ = false; +} + +inline void +Response::set_content_provider(const char *content_type, + ContentProviderWithoutLength provider, + const std::function &resource_releaser) { + set_header("Content-Type", content_type); + content_length_ = 0; + content_provider_ = detail::ContentProviderAdapter(std::move(provider)); content_provider_resource_releaser_ = resource_releaser; + is_chunked_content_provider_ = false; } inline void Response::set_chunked_content_provider( - ChunkedContentProvider provider, std::function resource_releaser) { + const char *content_type, ContentProviderWithoutLength provider, + const std::function &resource_releaser) { + set_header("Content-Type", content_type); content_length_ = 0; - content_provider_ = [provider](size_t offset, size_t, DataSink &sink) { - return provider(offset, sink); - }; + content_provider_ = detail::ContentProviderAdapter(std::move(provider)); content_provider_resource_releaser_ = resource_releaser; + is_chunked_content_provider_ = true; +} + +// Result implementation +inline bool Result::has_request_header(const char *key) const { + return request_headers_.find(key) != request_headers_.end(); +} + +inline std::string Result::get_request_header_value(const char *key, + size_t id) const { + return detail::get_header_value(request_headers_, key, id, ""); +} + +template +inline T Result::get_request_header_value(const char *key, size_t id) const { + return detail::get_header_value(request_headers_, key, id, 0); +} + +inline size_t Result::get_request_header_value_count(const char *key) const { + auto r = request_headers_.equal_range(key); + return static_cast(std::distance(r.first, r.second)); } -// Rstream implementation +// Stream implementation inline ssize_t Stream::write(const char *ptr) { return write(ptr, strlen(ptr)); } @@ -3469,10 +4017,11 @@ inline ssize_t Stream::write(const std::string &s) { template inline ssize_t Stream::write_format(const char *fmt, const Args &... args) { - std::array buf; + const auto bufsiz = 2048; + std::array buf; #if defined(_MSC_VER) && _MSC_VER < 1900 - auto sn = _snprintf_s(buf, bufsiz, buf.size() - 1, fmt, args...); + auto sn = _snprintf_s(buf.data(), bufsiz - 1, buf.size() - 1, fmt, args...); #else auto sn = snprintf(buf.data(), buf.size() - 1, fmt, args...); #endif @@ -3529,9 +4078,10 @@ inline ssize_t SocketStream::read(char *ptr, size_t size) { if (size > static_cast((std::numeric_limits::max)())) { return -1; } - return recv(sock_, ptr, static_cast(size), 0); + return recv(sock_, ptr, static_cast(size), CPPHTTPLIB_RECV_FLAGS); #else - return handle_EINTR([&]() { return recv(sock_, ptr, size, 0); }); + return handle_EINTR( + [&]() { return recv(sock_, ptr, size, CPPHTTPLIB_RECV_FLAGS); }); #endif } @@ -3542,9 +4092,10 @@ inline ssize_t SocketStream::write(const char *ptr, size_t size) { if (size > static_cast((std::numeric_limits::max)())) { return -1; } - return send(sock_, ptr, static_cast(size), 0); + return send(sock_, ptr, static_cast(size), CPPHTTPLIB_SEND_FLAGS); #else - return handle_EINTR([&]() { return send(sock_, ptr, size, 0); }); + return handle_EINTR( + [&]() { return send(sock_, ptr, size, CPPHTTPLIB_SEND_FLAGS); }); #endif } @@ -3553,13 +4104,15 @@ inline void SocketStream::get_remote_ip_and_port(std::string &ip, return detail::get_remote_ip_and_port(sock_, ip, port); } +inline socket_t SocketStream::socket() const { return sock_; } + // Buffer stream implementation inline bool BufferStream::is_readable() const { return true; } inline bool BufferStream::is_writable() const { return true; } inline ssize_t BufferStream::read(char *ptr, size_t size) { -#if defined(_MSC_VER) && _MSC_VER < 1900 +#if defined(_MSC_VER) && _MSC_VER <= 1900 auto len_read = buffer._Copy_s(ptr, size, size, position); #else auto len_read = buffer.copy(ptr, size, position); @@ -3576,75 +4129,135 @@ inline ssize_t BufferStream::write(const char *ptr, size_t size) { inline void BufferStream::get_remote_ip_and_port(std::string & /*ip*/, int & /*port*/) const {} +inline socket_t BufferStream::socket() const { return 0; } + inline const std::string &BufferStream::get_buffer() const { return buffer; } } // namespace detail // HTTP server implementation -inline Server::Server() : svr_sock_(INVALID_SOCKET), is_running_(false) { +inline Server::Server() + : new_task_queue( + [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }), + svr_sock_(INVALID_SOCKET), is_running_(false) { #ifndef _WIN32 signal(SIGPIPE, SIG_IGN); #endif - new_task_queue = [] { return new ThreadPool(CPPHTTPLIB_THREAD_POOL_COUNT); }; } inline Server::~Server() {} inline Server &Server::Get(const char *pattern, Handler handler) { - get_handlers_.push_back(std::make_pair(std::regex(pattern), handler)); + return Get(pattern, strlen(pattern), handler); +} + +inline Server &Server::Get(const char *pattern, size_t pattern_len, + Handler handler) { + get_handlers_.push_back( + std::make_pair(std::regex(pattern, pattern_len), std::move(handler))); return *this; } inline Server &Server::Post(const char *pattern, Handler handler) { - post_handlers_.push_back(std::make_pair(std::regex(pattern), handler)); + return Post(pattern, strlen(pattern), handler); +} + +inline Server &Server::Post(const char *pattern, size_t pattern_len, + Handler handler) { + post_handlers_.push_back( + std::make_pair(std::regex(pattern, pattern_len), std::move(handler))); return *this; } inline Server &Server::Post(const char *pattern, HandlerWithContentReader handler) { + return Post(pattern, strlen(pattern), handler); +} + +inline Server &Server::Post(const char *pattern, size_t pattern_len, + HandlerWithContentReader handler) { post_handlers_for_content_reader_.push_back( - std::make_pair(std::regex(pattern), handler)); + std::make_pair(std::regex(pattern, pattern_len), std::move(handler))); return *this; } inline Server &Server::Put(const char *pattern, Handler handler) { - put_handlers_.push_back(std::make_pair(std::regex(pattern), handler)); + return Put(pattern, strlen(pattern), handler); +} + +inline Server &Server::Put(const char *pattern, size_t pattern_len, + Handler handler) { + put_handlers_.push_back( + std::make_pair(std::regex(pattern, pattern_len), std::move(handler))); return *this; } inline Server &Server::Put(const char *pattern, HandlerWithContentReader handler) { + return Put(pattern, strlen(pattern), handler); +} + +inline Server &Server::Put(const char *pattern, size_t pattern_len, + HandlerWithContentReader handler) { put_handlers_for_content_reader_.push_back( - std::make_pair(std::regex(pattern), handler)); + std::make_pair(std::regex(pattern, pattern_len), std::move(handler))); return *this; } inline Server &Server::Patch(const char *pattern, Handler handler) { - patch_handlers_.push_back(std::make_pair(std::regex(pattern), handler)); + return Patch(pattern, strlen(pattern), handler); +} + +inline Server &Server::Patch(const char *pattern, size_t pattern_len, + Handler handler) { + patch_handlers_.push_back( + std::make_pair(std::regex(pattern, pattern_len), std::move(handler))); return *this; } inline Server &Server::Patch(const char *pattern, HandlerWithContentReader handler) { + return Patch(pattern, strlen(pattern), handler); +} + +inline Server &Server::Patch(const char *pattern, size_t pattern_len, + HandlerWithContentReader handler) { patch_handlers_for_content_reader_.push_back( - std::make_pair(std::regex(pattern), handler)); + std::make_pair(std::regex(pattern, pattern_len), std::move(handler))); return *this; } inline Server &Server::Delete(const char *pattern, Handler handler) { - delete_handlers_.push_back(std::make_pair(std::regex(pattern), handler)); + return Delete(pattern, strlen(pattern), handler); +} + +inline Server &Server::Delete(const char *pattern, size_t pattern_len, + Handler handler) { + delete_handlers_.push_back( + std::make_pair(std::regex(pattern, pattern_len), std::move(handler))); return *this; } inline Server &Server::Delete(const char *pattern, HandlerWithContentReader handler) { + return Delete(pattern, strlen(pattern), handler); +} + +inline Server &Server::Delete(const char *pattern, size_t pattern_len, + HandlerWithContentReader handler) { delete_handlers_for_content_reader_.push_back( - std::make_pair(std::regex(pattern), handler)); + std::make_pair(std::regex(pattern, pattern_len), std::move(handler))); return *this; } inline Server &Server::Options(const char *pattern, Handler handler) { - options_handlers_.push_back(std::make_pair(std::regex(pattern), handler)); + return Options(pattern, strlen(pattern), handler); +} + +inline Server &Server::Options(const char *pattern, size_t pattern_len, + Handler handler) { + options_handlers_.push_back( + std::make_pair(std::regex(pattern, pattern_len), std::move(handler))); return *this; } @@ -3652,11 +4265,12 @@ inline bool Server::set_base_dir(const char *dir, const char *mount_point) { return set_mount_point(mount_point, dir); } -inline bool Server::set_mount_point(const char *mount_point, const char *dir) { +inline bool Server::set_mount_point(const char *mount_point, const char *dir, + Headers headers) { if (detail::is_dir(dir)) { std::string mnt = mount_point ? mount_point : "/"; if (!mnt.empty() && mnt[0] == '/') { - base_dirs_.emplace_back(mnt, dir); + base_dirs_.push_back({mnt, dir, std::move(headers)}); return true; } } @@ -3665,7 +4279,7 @@ inline bool Server::set_mount_point(const char *mount_point, const char *dir) { inline bool Server::remove_mount_point(const char *mount_point) { for (auto it = base_dirs_.begin(); it != base_dirs_.end(); ++it) { - if (it->first == mount_point) { + if (it->mount_point == mount_point) { base_dirs_.erase(it); return true; } @@ -3673,51 +4287,110 @@ inline bool Server::remove_mount_point(const char *mount_point) { return false; } -inline void Server::set_file_extension_and_mimetype_mapping(const char *ext, - const char *mime) { +inline Server & +Server::set_file_extension_and_mimetype_mapping(const char *ext, + const char *mime) { file_extension_and_mimetype_map_[ext] = mime; + + return *this; } -inline void Server::set_file_request_handler(Handler handler) { +inline Server &Server::set_file_request_handler(Handler handler) { file_request_handler_ = std::move(handler); + + return *this; } -inline void Server::set_error_handler(Handler handler) { +inline Server &Server::set_error_handler(HandlerWithResponse handler) { error_handler_ = std::move(handler); + return *this; } -inline void Server::set_socket_options(SocketOptions socket_options) { - socket_options_ = socket_options; +inline Server &Server::set_error_handler(Handler handler) { + error_handler_ = [handler](const Request &req, Response &res) { + handler(req, res); + return HandlerResponse::Handled; + }; + return *this; } -inline void Server::set_logger(Logger logger) { logger_ = std::move(logger); } +inline Server &Server::set_exception_handler(ExceptionHandler handler) { + exception_handler_ = std::move(handler); + return *this; +} -inline void +inline Server &Server::set_pre_routing_handler(HandlerWithResponse handler) { + pre_routing_handler_ = std::move(handler); + return *this; +} + +inline Server &Server::set_post_routing_handler(Handler handler) { + post_routing_handler_ = std::move(handler); + return *this; +} + +inline Server &Server::set_logger(Logger logger) { + logger_ = std::move(logger); + + return *this; +} + +inline Server & Server::set_expect_100_continue_handler(Expect100ContinueHandler handler) { expect_100_continue_handler_ = std::move(handler); + + return *this; +} + +inline Server &Server::set_tcp_nodelay(bool on) { + tcp_nodelay_ = on; + + return *this; +} + +inline Server &Server::set_socket_options(SocketOptions socket_options) { + socket_options_ = std::move(socket_options); + + return *this; } -inline void Server::set_keep_alive_max_count(size_t count) { +inline Server &Server::set_keep_alive_max_count(size_t count) { keep_alive_max_count_ = count; + + return *this; +} + +inline Server &Server::set_keep_alive_timeout(time_t sec) { + keep_alive_timeout_sec_ = sec; + + return *this; } -inline void Server::set_read_timeout(time_t sec, time_t usec) { +inline Server &Server::set_read_timeout(time_t sec, time_t usec) { read_timeout_sec_ = sec; read_timeout_usec_ = usec; + + return *this; } -inline void Server::set_write_timeout(time_t sec, time_t usec) { +inline Server &Server::set_write_timeout(time_t sec, time_t usec) { write_timeout_sec_ = sec; write_timeout_usec_ = usec; + + return *this; } -inline void Server::set_idle_interval(time_t sec, time_t usec) { +inline Server &Server::set_idle_interval(time_t sec, time_t usec) { idle_interval_sec_ = sec; idle_interval_usec_ = usec; + + return *this; } -inline void Server::set_payload_max_length(size_t length) { +inline Server &Server::set_payload_max_length(size_t length) { payload_max_length_ = length; + + return *this; } inline bool Server::bind_to_port(const char *host, int port, int socket_flags) { @@ -3748,7 +4421,7 @@ inline void Server::stop() { inline bool Server::parse_request_line(const char *s, Request &req) { const static std::regex re( "(GET|HEAD|POST|PUT|DELETE|CONNECT|OPTIONS|TRACE|PATCH|PRI) " - "(([^?]+)(?:\\?(.*?))?) (HTTP/1\\.[01])\r\n"); + "(([^? ]+)(?:\\?([^ ]*?))?) (HTTP/1\\.[01])\r\n"); std::cmatch m; if (std::regex_match(s, m, re)) { @@ -3769,123 +4442,81 @@ inline bool Server::parse_request_line(const char *s, Request &req) { inline bool Server::write_response(Stream &strm, bool close_connection, const Request &req, Response &res) { - assert(res.status != -1); + return write_response_core(strm, close_connection, req, res, false); +} - if (400 <= res.status && error_handler_) { error_handler_(req, res); } +inline bool Server::write_response_with_content(Stream &strm, + bool close_connection, + const Request &req, + Response &res) { + return write_response_core(strm, close_connection, req, res, true); +} - detail::BufferStream bstrm; +inline bool Server::write_response_core(Stream &strm, bool close_connection, + const Request &req, Response &res, + bool need_apply_ranges) { + assert(res.status != -1); - // Response line - if (!bstrm.write_format("HTTP/1.1 %d %s\r\n", res.status, - detail::status_message(res.status))) { - return false; + if (400 <= res.status && error_handler_ && + error_handler_(req, res) == HandlerResponse::Handled) { + need_apply_ranges = true; } - // Headers + std::string content_type; + std::string boundary; + if (need_apply_ranges) { apply_ranges(req, res, content_type, boundary); } + + // Prepare additional headers if (close_connection || req.get_header_value("Connection") == "close") { res.set_header("Connection", "close"); - } - - if (!close_connection && req.get_header_value("Connection") == "Keep-Alive") { - res.set_header("Connection", "Keep-Alive"); + } else { + std::stringstream ss; + ss << "timeout=" << keep_alive_timeout_sec_ + << ", max=" << keep_alive_max_count_; + res.set_header("Keep-Alive", ss.str()); } if (!res.has_header("Content-Type") && - (!res.body.empty() || res.content_length_ > 0)) { + (!res.body.empty() || res.content_length_ > 0 || res.content_provider_)) { res.set_header("Content-Type", "text/plain"); } + if (!res.has_header("Content-Length") && res.body.empty() && + !res.content_length_ && !res.content_provider_) { + res.set_header("Content-Length", "0"); + } + if (!res.has_header("Accept-Ranges") && req.method == "HEAD") { res.set_header("Accept-Ranges", "bytes"); } - std::string content_type; - std::string boundary; - - if (req.ranges.size() > 1) { - boundary = detail::make_multipart_data_boundary(); - - auto it = res.headers.find("Content-Type"); - if (it != res.headers.end()) { - content_type = it->second; - res.headers.erase(it); - } + if (post_routing_handler_) { post_routing_handler_(req, res); } - res.headers.emplace("Content-Type", - "multipart/byteranges; boundary=" + boundary); - } + // Response line and headers + { + detail::BufferStream bstrm; - if (res.body.empty()) { - if (res.content_length_ > 0) { - size_t length = 0; - if (req.ranges.empty()) { - length = res.content_length_; - } else if (req.ranges.size() == 1) { - auto offsets = - detail::get_range_offset_and_length(req, res.content_length_, 0); - auto offset = offsets.first; - length = offsets.second; - auto content_range = detail::make_content_range_header_field( - offset, length, res.content_length_); - res.set_header("Content-Range", content_range); - } else { - length = detail::get_multipart_ranges_data_length(req, res, boundary, - content_type); - } - res.set_header("Content-Length", std::to_string(length)); - } else { - if (res.content_provider_) { - res.set_header("Transfer-Encoding", "chunked"); - } else { - res.set_header("Content-Length", "0"); - } - } - } else { - if (req.ranges.empty()) { - ; - } else if (req.ranges.size() == 1) { - auto offsets = - detail::get_range_offset_and_length(req, res.body.size(), 0); - auto offset = offsets.first; - auto length = offsets.second; - auto content_range = detail::make_content_range_header_field( - offset, length, res.body.size()); - res.set_header("Content-Range", content_range); - res.body = res.body.substr(offset, length); - } else { - res.body = - detail::make_multipart_ranges_data(req, res, boundary, content_type); + if (!bstrm.write_format("HTTP/1.1 %d %s\r\n", res.status, + detail::status_message(res.status))) { + return false; } -#ifdef CPPHTTPLIB_ZLIB_SUPPORT - // TODO: 'Accept-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"))) { - if (detail::compress(res.body)) { - res.set_header("Content-Encoding", "gzip"); - } - } -#endif + if (!detail::write_headers(bstrm, res.headers)) { return false; } - auto length = std::to_string(res.body.size()); - res.set_header("Content-Length", length); + // Flush buffer + auto &data = bstrm.get_buffer(); + strm.write(data.data(), data.size()); } - if (!detail::write_headers(bstrm, res, Headers())) { return false; } - - // Flush buffer - auto &data = bstrm.get_buffer(); - strm.write(data.data(), data.size()); - // Body + auto ret = true; if (req.method != "HEAD") { if (!res.body.empty()) { - if (!strm.write(res.body)) { return false; } + if (!strm.write(res.body)) { ret = false; } } else if (res.content_provider_) { if (!write_content_with_provider(strm, req, res, boundary, content_type)) { - return false; + ret = false; } } } @@ -3893,7 +4524,7 @@ inline bool Server::write_response(Stream &strm, bool close_connection, // Log if (logger_) { logger_(req, res); } - return true; + return ret; } inline bool @@ -3904,34 +4535,46 @@ Server::write_content_with_provider(Stream &strm, const Request &req, return this->svr_sock_ == INVALID_SOCKET; }; - if (res.content_length_) { + if (res.content_length_ > 0) { if (req.ranges.empty()) { - if (detail::write_content(strm, res.content_provider_, 0, - res.content_length_, is_shutting_down) < 0) { - return false; - } + return detail::write_content(strm, res.content_provider_, 0, + res.content_length_, is_shutting_down); } else if (req.ranges.size() == 1) { auto offsets = detail::get_range_offset_and_length(req, res.content_length_, 0); auto offset = offsets.first; auto length = offsets.second; - if (detail::write_content(strm, res.content_provider_, offset, length, - is_shutting_down) < 0) { - return false; + return detail::write_content(strm, res.content_provider_, offset, length, + is_shutting_down); + } else { + return detail::write_multipart_ranges_data( + strm, req, res, boundary, content_type, is_shutting_down); + } + } else { + if (res.is_chunked_content_provider_) { + auto type = detail::encoding_type(req, res); + + std::unique_ptr compressor; + if (type == detail::EncodingType::Gzip) { +#ifdef CPPHTTPLIB_ZLIB_SUPPORT + compressor = detail::make_unique(); +#endif + } else if (type == detail::EncodingType::Brotli) { +#ifdef CPPHTTPLIB_BROTLI_SUPPORT + compressor = detail::make_unique(); +#endif + } else { + compressor = detail::make_unique(); } + assert(compressor != nullptr); + + return detail::write_content_chunked(strm, res.content_provider_, + is_shutting_down, *compressor); } else { - if (!detail::write_multipart_ranges_data( - strm, req, res, boundary, content_type, is_shutting_down)) { - return false; - } - } - } else { - if (detail::write_content_chunked(strm, res.content_provider_, - is_shutting_down) < 0) { - return false; + return detail::write_content_without_length(strm, res.content_provider_, + is_shutting_down); } } - return true; } inline bool Server::read_content(Stream &strm, Request &req, Response &res) { @@ -3968,8 +4611,9 @@ inline bool Server::read_content_with_content_receiver( Stream &strm, Request &req, Response &res, ContentReceiver receiver, MultipartContentHeader multipart_header, ContentReceiver multipart_receiver) { - return read_content_core(strm, req, res, receiver, multipart_header, - multipart_receiver); + return read_content_core(strm, req, res, std::move(receiver), + std::move(multipart_header), + std::move(multipart_receiver)); } inline bool Server::read_content_core(Stream &strm, Request &req, Response &res, @@ -3977,7 +4621,7 @@ inline bool Server::read_content_core(Stream &strm, Request &req, Response &res, MultipartContentHeader mulitpart_header, ContentReceiver multipart_receiver) { detail::MultipartFormDataParser multipart_form_data_parser; - ContentReceiver out; + ContentReceiverWithProgress out; if (req.is_multipart_form_data()) { const auto &content_type = req.get_header_value("Content-Type"); @@ -3988,7 +4632,7 @@ inline bool Server::read_content_core(Stream &strm, Request &req, Response &res, } multipart_form_data_parser.set_boundary(std::move(boundary)); - out = [&](const char *buf, size_t n) { + out = [&](const char *buf, size_t n, uint64_t /*off*/, uint64_t /*len*/) { /* For debug size_t pos = 0; while (pos < n) { @@ -4004,11 +4648,16 @@ inline bool Server::read_content_core(Stream &strm, Request &req, Response &res, mulitpart_header); }; } else { - out = receiver; + out = [receiver](const char *buf, size_t n, uint64_t /*off*/, + uint64_t /*len*/) { return receiver(buf, n); }; + } + + if (req.method == "DELETE" && !req.has_header("Content-Length")) { + return true; } - if (!detail::read_content(strm, req, payload_max_length_, res.status, - Progress(), out, true)) { + if (!detail::read_content(strm, req, payload_max_length_, res.status, nullptr, + out, true)) { return false; } @@ -4022,17 +4671,14 @@ inline bool Server::read_content_core(Stream &strm, Request &req, Response &res, return true; } -inline bool Server::handle_file_request(Request &req, Response &res, +inline bool Server::handle_file_request(const Request &req, Response &res, bool head) { - for (const auto &kv : base_dirs_) { - const auto &mount_point = kv.first; - const auto &base_dir = kv.second; - + for (const auto &entry : base_dirs_) { // Prefix match - if (!req.path.find(mount_point)) { - std::string sub_path = "/" + req.path.substr(mount_point.size()); + if (!req.path.compare(0, entry.mount_point.size(), entry.mount_point)) { + std::string sub_path = "/" + req.path.substr(entry.mount_point.size()); if (detail::is_valid_path(sub_path)) { - auto path = base_dir + sub_path; + auto path = entry.base_dir + sub_path; if (path.back() == '/') { path += "index.html"; } if (detail::is_file(path)) { @@ -4040,7 +4686,10 @@ inline bool Server::handle_file_request(Request &req, Response &res, auto type = detail::find_content_type(path, file_extension_and_mimetype_map_); if (type) { res.set_header("Content-Type", type); } - res.status = 200; + for (const auto &kv : entry.headers) { + res.set_header(kv.first.c_str(), kv.second); + } + res.status = req.has_header("Range") ? 206 : 200; if (!head && file_request_handler_) { file_request_handler_(req, res); } @@ -4056,7 +4705,7 @@ inline socket_t Server::create_server_socket(const char *host, int port, int socket_flags, SocketOptions socket_options) const { return detail::create_socket( - host, port, socket_flags, socket_options, + host, port, socket_flags, tcp_nodelay_, std::move(socket_options), [](socket_t sock, struct addrinfo &ai) -> bool { if (::bind(sock, ai.ai_addr, static_cast(ai.ai_addrlen))) { return false; @@ -4146,6 +4795,11 @@ inline bool Server::listen_internal() { } inline bool Server::routing(Request &req, Response &res, Stream &strm) { + if (pre_routing_handler_ && + pre_routing_handler_(req, res) == HandlerResponse::Handled) { + return true; + } + // File handler bool is_head_request = req.method == "HEAD"; if ((req.method == "GET" || is_head_request) && @@ -4158,32 +4812,37 @@ inline bool Server::routing(Request &req, Response &res, Stream &strm) { { ContentReader reader( [&](ContentReceiver receiver) { - return read_content_with_content_receiver(strm, req, res, receiver, - nullptr, nullptr); + return read_content_with_content_receiver( + strm, req, res, std::move(receiver), nullptr, nullptr); }, [&](MultipartContentHeader header, ContentReceiver receiver) { return read_content_with_content_receiver(strm, req, res, nullptr, - header, receiver); + std::move(header), + std::move(receiver)); }); if (req.method == "POST") { if (dispatch_request_for_content_reader( - req, res, reader, post_handlers_for_content_reader_)) { + req, res, std::move(reader), + post_handlers_for_content_reader_)) { return true; } } else if (req.method == "PUT") { if (dispatch_request_for_content_reader( - req, res, reader, put_handlers_for_content_reader_)) { + req, res, std::move(reader), + put_handlers_for_content_reader_)) { return true; } } else if (req.method == "PATCH") { if (dispatch_request_for_content_reader( - req, res, reader, patch_handlers_for_content_reader_)) { + req, res, std::move(reader), + patch_handlers_for_content_reader_)) { return true; } } else if (req.method == "DELETE") { if (dispatch_request_for_content_reader( - req, res, reader, delete_handlers_for_content_reader_)) { + req, res, std::move(reader), + delete_handlers_for_content_reader_)) { return true; } } @@ -4213,31 +4872,132 @@ inline bool Server::routing(Request &req, Response &res, Stream &strm) { } inline bool Server::dispatch_request(Request &req, Response &res, - Handlers &handlers) { + const Handlers &handlers) { + for (const auto &x : handlers) { + const auto &pattern = x.first; + const auto &handler = x.second; - try { - for (const auto &x : handlers) { - const auto &pattern = x.first; - const auto &handler = x.second; + if (std::regex_match(req.path, req.matches, pattern)) { + handler(req, res); + return true; + } + } + return false; +} - if (std::regex_match(req.path, req.matches, pattern)) { - handler(req, res); - return true; +inline void Server::apply_ranges(const Request &req, Response &res, + std::string &content_type, + std::string &boundary) { + if (req.ranges.size() > 1) { + boundary = detail::make_multipart_data_boundary(); + + auto it = res.headers.find("Content-Type"); + if (it != res.headers.end()) { + content_type = it->second; + res.headers.erase(it); + } + + res.headers.emplace("Content-Type", + "multipart/byteranges; boundary=" + boundary); + } + + auto type = detail::encoding_type(req, res); + + if (res.body.empty()) { + if (res.content_length_ > 0) { + size_t length = 0; + if (req.ranges.empty()) { + length = res.content_length_; + } else if (req.ranges.size() == 1) { + auto offsets = + detail::get_range_offset_and_length(req, res.content_length_, 0); + auto offset = offsets.first; + length = offsets.second; + auto content_range = detail::make_content_range_header_field( + offset, length, res.content_length_); + res.set_header("Content-Range", content_range); + } else { + length = detail::get_multipart_ranges_data_length(req, res, boundary, + content_type); + } + res.set_header("Content-Length", std::to_string(length)); + } else { + if (res.content_provider_) { + if (res.is_chunked_content_provider_) { + res.set_header("Transfer-Encoding", "chunked"); + if (type == detail::EncodingType::Gzip) { + res.set_header("Content-Encoding", "gzip"); + } else if (type == detail::EncodingType::Brotli) { + res.set_header("Content-Encoding", "br"); + } + } } } - } catch (const std::exception &ex) { - res.status = 500; - res.set_header("EXCEPTION_WHAT", ex.what()); - } catch (...) { - res.status = 500; - res.set_header("EXCEPTION_WHAT", "UNKNOWN"); + } else { + if (req.ranges.empty()) { + ; + } else if (req.ranges.size() == 1) { + auto offsets = + detail::get_range_offset_and_length(req, res.body.size(), 0); + auto offset = offsets.first; + auto length = offsets.second; + auto content_range = detail::make_content_range_header_field( + offset, length, res.body.size()); + res.set_header("Content-Range", content_range); + if (offset < res.body.size()) { + res.body = res.body.substr(offset, length); + } else { + res.body.clear(); + res.status = 416; + } + } else { + std::string data; + if (detail::make_multipart_ranges_data(req, res, boundary, content_type, + data)) { + res.body.swap(data); + } else { + res.body.clear(); + res.status = 416; + } + } + + if (type != detail::EncodingType::None) { + std::unique_ptr compressor; + std::string content_encoding; + + if (type == detail::EncodingType::Gzip) { +#ifdef CPPHTTPLIB_ZLIB_SUPPORT + compressor = detail::make_unique(); + content_encoding = "gzip"; +#endif + } else if (type == detail::EncodingType::Brotli) { +#ifdef CPPHTTPLIB_BROTLI_SUPPORT + compressor = detail::make_unique(); + content_encoding = "br"; +#endif + } + + if (compressor) { + std::string compressed; + if (compressor->compress(res.body.data(), res.body.size(), true, + [&](const char *data, size_t data_len) { + compressed.append(data, data_len); + return true; + })) { + res.body.swap(compressed); + res.set_header("Content-Encoding", content_encoding); + } + } + } + + auto length = std::to_string(res.body.size()); + res.set_header("Content-Length", length); } - return false; } inline bool Server::dispatch_request_for_content_reader( Request &req, Response &res, ContentReader content_reader, - HandlersForContentReader &handlers) { + const HandlersForContentReader &handlers) { for (const auto &x : handlers) { const auto &pattern = x.first; const auto &handler = x.second; @@ -4266,6 +5026,20 @@ Server::process_request(Stream &strm, bool close_connection, res.version = "HTTP/1.1"; +#ifdef _WIN32 + // TODO: Increase FD_SETSIZE statically (libzmq), dynamically (MySQL). +#else +#ifndef CPPHTTPLIB_USE_POLL + // Socket file descriptor exceeded FD_SETSIZE... + if (strm.socket() >= FD_SETSIZE) { + Headers dummy; + detail::read_headers(strm, dummy); + res.status = 500; + return write_response(strm, close_connection, req, res); + } +#endif +#endif + // Check if the request URI doesn't exceed the limit if (line_reader.size() > CPPHTTPLIB_REQUEST_URI_MAX_LENGTH) { Headers dummy; @@ -4297,7 +5071,8 @@ Server::process_request(Stream &strm, bool close_connection, if (req.has_header("Range")) { const auto &range_header_value = req.get_header_value("Range"); if (!detail::parse_range_header(range_header_value, req.ranges)) { - // TODO: error + res.status = 416; + return write_response(strm, close_connection, req, res); } } @@ -4319,155 +5094,320 @@ Server::process_request(Stream &strm, bool close_connection, } // Rounting - if (routing(req, res, strm)) { + bool routed = false; + try { + routed = routing(req, res, strm); + } catch (std::exception &e) { + if (exception_handler_) { + exception_handler_(req, res, e); + routed = true; + } else { + res.status = 500; + res.set_header("EXCEPTION_WHAT", e.what()); + } + } catch (...) { + res.status = 500; + res.set_header("EXCEPTION_WHAT", "UNKNOWN"); + } + + if (routed) { if (res.status == -1) { res.status = req.ranges.empty() ? 200 : 206; } + return write_response_with_content(strm, close_connection, req, res); } else { if (res.status == -1) { res.status = 404; } + return write_response(strm, close_connection, req, res); } - - return write_response(strm, close_connection, req, res); } inline bool Server::is_valid() const { return true; } inline bool Server::process_and_close_socket(socket_t sock) { auto ret = detail::process_server_socket( - sock, keep_alive_max_count_, read_timeout_sec_, read_timeout_usec_, - write_timeout_sec_, write_timeout_usec_, + sock, keep_alive_max_count_, keep_alive_timeout_sec_, read_timeout_sec_, + read_timeout_usec_, write_timeout_sec_, write_timeout_usec_, [this](Stream &strm, bool close_connection, bool &connection_closed) { return process_request(strm, close_connection, connection_closed, nullptr); }); - // std::this_thread::sleep_for(std::chrono::milliseconds(1)); detail::shutdown_socket(sock); detail::close_socket(sock); return ret; } // HTTP client implementation -inline Client::Client(const std::string &host) - : Client(host, 80, std::string(), std::string()) {} +inline ClientImpl::ClientImpl(const std::string &host) + : ClientImpl(host, 80, std::string(), std::string()) {} -inline Client::Client(const std::string &host, int port) - : Client(host, port, std::string(), std::string()) {} +inline ClientImpl::ClientImpl(const std::string &host, int port) + : ClientImpl(host, port, std::string(), std::string()) {} -inline Client::Client(const std::string &host, int port, - const std::string &client_cert_path, - const std::string &client_key_path) +inline ClientImpl::ClientImpl(const std::string &host, int port, + const std::string &client_cert_path, + const std::string &client_key_path) + // : (Error::Success), host_(host), port_(port), : host_(host), port_(port), host_and_port_(host_ + ":" + std::to_string(port_)), client_cert_path_(client_cert_path), client_key_path_(client_key_path) {} -inline Client::~Client() { stop(); } - -inline bool Client::is_valid() const { return true; } +inline ClientImpl::~ClientImpl() { lock_socket_and_shutdown_and_close(); } + +inline bool ClientImpl::is_valid() const { return true; } + +inline void ClientImpl::copy_settings(const ClientImpl &rhs) { + client_cert_path_ = rhs.client_cert_path_; + client_key_path_ = rhs.client_key_path_; + connection_timeout_sec_ = rhs.connection_timeout_sec_; + read_timeout_sec_ = rhs.read_timeout_sec_; + read_timeout_usec_ = rhs.read_timeout_usec_; + write_timeout_sec_ = rhs.write_timeout_sec_; + write_timeout_usec_ = rhs.write_timeout_usec_; + basic_auth_username_ = rhs.basic_auth_username_; + basic_auth_password_ = rhs.basic_auth_password_; + bearer_token_auth_token_ = rhs.bearer_token_auth_token_; +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + digest_auth_username_ = rhs.digest_auth_username_; + digest_auth_password_ = rhs.digest_auth_password_; +#endif + keep_alive_ = rhs.keep_alive_; + follow_location_ = rhs.follow_location_; + tcp_nodelay_ = rhs.tcp_nodelay_; + socket_options_ = rhs.socket_options_; + compress_ = rhs.compress_; + decompress_ = rhs.decompress_; + interface_ = rhs.interface_; + proxy_host_ = rhs.proxy_host_; + proxy_port_ = rhs.proxy_port_; + proxy_basic_auth_username_ = rhs.proxy_basic_auth_username_; + proxy_basic_auth_password_ = rhs.proxy_basic_auth_password_; + proxy_bearer_token_auth_token_ = rhs.proxy_bearer_token_auth_token_; +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + proxy_digest_auth_username_ = rhs.proxy_digest_auth_username_; + proxy_digest_auth_password_ = rhs.proxy_digest_auth_password_; +#endif +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + server_certificate_verification_ = rhs.server_certificate_verification_; +#endif + logger_ = rhs.logger_; +} -inline socket_t Client::create_client_socket() const { - if (!proxy_host_.empty()) { - return detail::create_client_socket(proxy_host_.c_str(), proxy_port_, - nullptr, connection_timeout_sec_, - connection_timeout_usec_, interface_); +inline socket_t ClientImpl::create_client_socket(Error &error) const { + if (!proxy_host_.empty() && proxy_port_ != -1) { + return detail::create_client_socket( + proxy_host_.c_str(), proxy_port_, tcp_nodelay_, socket_options_, + connection_timeout_sec_, connection_timeout_usec_, interface_, error); } - return detail::create_client_socket(host_.c_str(), port_, nullptr, - connection_timeout_sec_, - connection_timeout_usec_, interface_); + return detail::create_client_socket( + host_.c_str(), port_, tcp_nodelay_, socket_options_, + connection_timeout_sec_, connection_timeout_usec_, interface_, error); } -inline bool Client::create_and_connect_socket(Socket &socket) { - auto sock = create_client_socket(); +inline bool ClientImpl::create_and_connect_socket(Socket &socket, + Error &error) { + auto sock = create_client_socket(error); if (sock == INVALID_SOCKET) { return false; } socket.sock = sock; return true; } -inline void Client::close_socket(Socket &socket, bool /*process_socket_ret*/) { - detail::close_socket(socket.sock); - socket_.sock = INVALID_SOCKET; +inline void ClientImpl::shutdown_ssl(Socket & /*socket*/, + bool /*shutdown_gracefully*/) { + // If there are any requests in flight from threads other than us, then it's + // a thread-unsafe race because individual ssl* objects are not thread-safe. + assert(socket_requests_in_flight_ == 0 || + socket_requests_are_from_thread_ == std::this_thread::get_id()); +} + +inline void ClientImpl::shutdown_socket(Socket &socket) { + if (socket.sock == INVALID_SOCKET) { return; } + detail::shutdown_socket(socket.sock); +} + +inline void ClientImpl::close_socket(Socket &socket) { + // If there are requests in flight in another thread, usually closing + // the socket will be fine and they will simply receive an error when + // using the closed socket, but it is still a bug since rarely the OS + // may reassign the socket id to be used for a new socket, and then + // suddenly they will be operating on a live socket that is different + // than the one they intended! + assert(socket_requests_in_flight_ == 0 || + socket_requests_are_from_thread_ == std::this_thread::get_id()); + + // It is also a bug if this happens while SSL is still active #ifdef CPPHTTPLIB_OPENSSL_SUPPORT - socket_.ssl = nullptr; + assert(socket.ssl == nullptr); #endif + if (socket.sock == INVALID_SOCKET) { return; } + detail::close_socket(socket.sock); + socket.sock = INVALID_SOCKET; } -inline bool Client::read_response_line(Stream &strm, Response &res) { +inline void ClientImpl::lock_socket_and_shutdown_and_close() { + std::lock_guard guard(socket_mutex_); + shutdown_ssl(socket_, true); + shutdown_socket(socket_); + close_socket(socket_); +} + +inline bool ClientImpl::read_response_line(Stream &strm, const Request &req, + Response &res) { std::array buf; detail::stream_line_reader line_reader(strm, buf.data(), buf.size()); if (!line_reader.getline()) { return false; } - const static std::regex re("(HTTP/1\\.[01]) (\\d+?) .*\r\n"); + const static std::regex re("(HTTP/1\\.[01]) (\\d{3})(?: (.*?))?\r\n"); std::cmatch m; - if (std::regex_match(line_reader.ptr(), m, re)) { + if (!std::regex_match(line_reader.ptr(), m, re)) { + return req.method == "CONNECT"; + } + res.version = std::string(m[1]); + res.status = std::stoi(std::string(m[2])); + res.reason = std::string(m[3]); + + // Ignore '100 Continue' + while (res.status == 100) { + if (!line_reader.getline()) { return false; } // CRLF + if (!line_reader.getline()) { return false; } // next response line + + if (!std::regex_match(line_reader.ptr(), m, re)) { return false; } res.version = std::string(m[1]); res.status = std::stoi(std::string(m[2])); + res.reason = std::string(m[3]); } return true; } -inline bool Client::send(const Request &req, Response &res) { +inline bool ClientImpl::send(Request &req, Response &res, Error &error) { std::lock_guard request_mutex_guard(request_mutex_); { std::lock_guard guard(socket_mutex_); + // Set this to false immediately - if it ever gets set to true by the end of + // the request, we know another thread instructed us to close the socket. + socket_should_be_closed_when_request_is_done_ = false; auto is_alive = false; if (socket_.is_open()) { is_alive = detail::select_write(socket_.sock, 0, 0) > 0; - if (!is_alive) { close_socket(socket_, false); } + if (!is_alive) { + // Attempt to avoid sigpipe by shutting down nongracefully if it seems + // like the other side has already closed the connection Also, there + // cannot be any requests in flight from other threads since we locked + // request_mutex_, so safe to close everything immediately + const bool shutdown_gracefully = false; + shutdown_ssl(socket_, shutdown_gracefully); + shutdown_socket(socket_); + close_socket(socket_); + } } if (!is_alive) { - if (!create_and_connect_socket(socket_)) { return false; } + if (!create_and_connect_socket(socket_, error)) { return false; } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT // TODO: refactoring if (is_ssl()) { auto &scli = static_cast(*this); - if (!proxy_host_.empty()) { + if (!proxy_host_.empty() && proxy_port_ != -1) { bool success = false; - if (!scli.connect_with_proxy(socket_, res, success)) { + if (!scli.connect_with_proxy(socket_, res, success, error)) { return success; } } - if (!scli.initialize_ssl(socket_)) { return false; } + if (!scli.initialize_ssl(socket_, error)) { return false; } } #endif } + + // Mark the current socket as being in use so that it cannot be closed by + // anyone else while this request is ongoing, even though we will be + // releasing the mutex. + if (socket_requests_in_flight_ > 1) { + assert(socket_requests_are_from_thread_ == std::this_thread::get_id()); + } + socket_requests_in_flight_ += 1; + socket_requests_are_from_thread_ = std::this_thread::get_id(); } - auto close_connection = !keep_alive_; + for (const auto &header : default_headers_) { + if (req.headers.find(header.first) == req.headers.end()) { + req.headers.insert(header); + } + } + auto close_connection = !keep_alive_; auto ret = process_socket(socket_, [&](Stream &strm) { - return handle_request(strm, req, res, close_connection); + return handle_request(strm, req, res, close_connection, error); }); - if (close_connection) { stop(); } + // Briefly lock mutex in order to mark that a request is no longer ongoing + { + std::lock_guard guard(socket_mutex_); + socket_requests_in_flight_ -= 1; + if (socket_requests_in_flight_ <= 0) { + assert(socket_requests_in_flight_ == 0); + socket_requests_are_from_thread_ = std::thread::id(); + } + + if (socket_should_be_closed_when_request_is_done_ || close_connection || + !ret) { + shutdown_ssl(socket_, true); + shutdown_socket(socket_); + close_socket(socket_); + } + } + + if (!ret) { + if (error == Error::Success) { error = Error::Unknown; } + } return ret; } -inline bool Client::handle_request(Stream &strm, const Request &req, - Response &res, bool close_connection) { - if (req.path.empty()) { return false; } +inline Result ClientImpl::send(const Request &req) { + auto req2 = req; + return send_(std::move(req2)); +} + +inline Result ClientImpl::send_(Request &&req) { + auto res = detail::make_unique(); + auto error = Error::Success; + auto ret = send(req, *res, error); + return Result{ret ? std::move(res) : nullptr, error, std::move(req.headers)}; +} + +inline bool ClientImpl::handle_request(Stream &strm, Request &req, + Response &res, bool close_connection, + Error &error) { + if (req.path.empty()) { + error = Error::Connection; + return false; + } + + auto req_save = req; bool ret; - if (!is_ssl() && !proxy_host_.empty()) { + if (!is_ssl() && !proxy_host_.empty() && proxy_port_ != -1) { auto req2 = req; req2.path = "http://" + host_and_port_ + req.path; - ret = process_request(strm, req2, res, close_connection); + ret = process_request(strm, req2, res, close_connection, error); + req = req2; + req.path = req_save.path; } else { - ret = process_request(strm, req, res, close_connection); + ret = process_request(strm, req, res, close_connection, error); } if (!ret) { return false; } if (300 < res.status && res.status < 400 && follow_location_) { - ret = redirect(req, res); + req = req_save; + ret = redirect(req, res, error); } #ifdef CPPHTTPLIB_OPENSSL_SUPPORT @@ -4481,18 +5421,18 @@ inline bool Client::handle_request(Stream &strm, const Request &req, if (!username.empty() && !password.empty()) { std::map auth; - if (parse_www_authenticate(res, auth, is_proxy)) { + if (detail::parse_www_authenticate(res, auth, is_proxy)) { Request new_req = req; new_req.authorization_count_ += 1; auto key = is_proxy ? "Proxy-Authorization" : "Authorization"; new_req.headers.erase(key); - new_req.headers.insert(make_digest_authentication_header( - req, auth, new_req.authorization_count_, random_string(10), + new_req.headers.insert(detail::make_digest_authentication_header( + req, auth, new_req.authorization_count_, detail::random_string(10), username, password, is_proxy)); Response new_res; - ret = send(new_req, new_res); + ret = send(new_req, new_res, error); if (ret) { res = new_res; } } } @@ -4502,10 +5442,13 @@ inline bool Client::handle_request(Stream &strm, const Request &req, return ret; } -inline bool Client::redirect(const Request &req, Response &res) { - if (req.redirect_count == 0) { return false; } +inline bool ClientImpl::redirect(Request &req, Response &res, Error &error) { + if (req.redirect_count_ == 0) { + error = Error::ExceedRedirectCount; + return false; + } - auto location = res.get_header_value("location"); + auto location = detail::decode_url(res.get_header_value("location"), true); if (location.empty()) { return false; } const static std::regex re( @@ -4533,124 +5476,140 @@ inline bool Client::redirect(const Request &req, Response &res) { if (next_path.empty()) { next_path = "/"; } if (next_scheme == scheme && next_host == host_ && next_port == port_) { - return detail::redirect(*this, req, res, next_path); + return detail::redirect(*this, req, res, next_path, location, error); } else { if (next_scheme == "https") { #ifdef CPPHTTPLIB_OPENSSL_SUPPORT SSLClient cli(next_host.c_str(), next_port); cli.copy_settings(*this); - return detail::redirect(cli, req, res, next_path); + return detail::redirect(cli, req, res, next_path, location, error); #else return false; #endif } else { - Client cli(next_host.c_str(), next_port); + ClientImpl cli(next_host.c_str(), next_port); cli.copy_settings(*this); - return detail::redirect(cli, req, res, next_path); + return detail::redirect(cli, req, res, next_path, location, error); } } } -inline bool Client::write_request(Stream &strm, const Request &req, - bool close_connection) { - detail::BufferStream bstrm; +inline bool ClientImpl::write_content_with_provider(Stream &strm, + const Request &req, + Error &error) { + auto is_shutting_down = []() { return false; }; - // Request line - std::string path = detail::encode_url(req.path); - if (!req.query.empty()) { - path = path + "?" + req.query; - } + if (req.is_chunked_content_provider_) { + // TODO: Brotli suport + std::unique_ptr compressor; +#ifdef CPPHTTPLIB_ZLIB_SUPPORT + if (compress_) { + compressor = detail::make_unique(); + } else +#endif + { + compressor = detail::make_unique(); + } - bstrm.write_format("%s %s HTTP/1.1\r\n", req.method.c_str(), path.c_str()); + return detail::write_content_chunked(strm, req.content_provider_, + is_shutting_down, *compressor, error); + } else { + return detail::write_content(strm, req.content_provider_, 0, + req.content_length_, is_shutting_down, error); + } +} // namespace httplib - // Additonal headers - Headers headers; - if (close_connection) { headers.emplace("Connection", "close"); } +inline bool ClientImpl::write_request(Stream &strm, Request &req, + bool close_connection, Error &error) { + // Prepare additional headers + if (close_connection) { req.headers.emplace("Connection", "close"); } if (!req.has_header("Host")) { if (is_ssl()) { if (port_ == 443) { - headers.emplace("Host", host_); + req.headers.emplace("Host", host_); } else { - headers.emplace("Host", host_and_port_); + req.headers.emplace("Host", host_and_port_); } } else { if (port_ == 80) { - headers.emplace("Host", host_); + req.headers.emplace("Host", host_); } else { - headers.emplace("Host", host_and_port_); + req.headers.emplace("Host", host_and_port_); } } } - if (!req.has_header("Accept")) { headers.emplace("Accept", "*/*"); } + if (!req.has_header("Accept")) { req.headers.emplace("Accept", "*/*"); } if (!req.has_header("User-Agent")) { - headers.emplace("User-Agent", "cpp-httplib/0.7"); + req.headers.emplace("User-Agent", "cpp-httplib/0.7"); } if (req.body.empty()) { - if (req.content_provider) { - auto length = std::to_string(req.content_length); - headers.emplace("Content-Length", length); + if (req.content_provider_) { + if (!req.is_chunked_content_provider_) { + auto length = std::to_string(req.content_length_); + req.headers.emplace("Content-Length", length); + } } else { - headers.emplace("Content-Length", "0"); + if (req.method == "POST" || req.method == "PUT" || + req.method == "PATCH") { + req.headers.emplace("Content-Length", "0"); + } } } else { if (!req.has_header("Content-Type")) { - headers.emplace("Content-Type", "text/plain"); + req.headers.emplace("Content-Type", "text/plain"); } if (!req.has_header("Content-Length")) { auto length = std::to_string(req.body.size()); - headers.emplace("Content-Length", length); + req.headers.emplace("Content-Length", length); } } - if (!basic_auth_username_.empty() && !basic_auth_password_.empty()) { - headers.insert(make_basic_authentication_header( + if (!basic_auth_password_.empty()) { + req.headers.insert(make_basic_authentication_header( basic_auth_username_, basic_auth_password_, false)); } if (!proxy_basic_auth_username_.empty() && !proxy_basic_auth_password_.empty()) { - headers.insert(make_basic_authentication_header( + req.headers.insert(make_basic_authentication_header( proxy_basic_auth_username_, proxy_basic_auth_password_, true)); } - detail::write_headers(bstrm, req, headers); + if (!bearer_token_auth_token_.empty()) { + req.headers.insert(make_bearer_token_authentication_header( + bearer_token_auth_token_, false)); + } - // Flush buffer - auto &data = bstrm.get_buffer(); - if (!detail::write_data(strm, data.data(), data.size())) { return false; } + if (!proxy_bearer_token_auth_token_.empty()) { + req.headers.insert(make_bearer_token_authentication_header( + proxy_bearer_token_auth_token_, true)); + } - // Body - if (req.body.empty()) { - if (req.content_provider) { - size_t offset = 0; - size_t end_offset = req.content_length; + // Request line and headers + { + detail::BufferStream bstrm; - bool ok = true; + const auto &path = detail::encode_url(req.path); + bstrm.write_format("%s %s HTTP/1.1\r\n", req.method.c_str(), path.c_str()); - DataSink data_sink; - data_sink.write = [&](const char *d, size_t l) { - if (ok) { - if (detail::write_data(strm, d, l)) { - offset += l; - } else { - ok = false; - } - } - }; - data_sink.is_writable = [&](void) { return ok && strm.is_writable(); }; + detail::write_headers(bstrm, req.headers); - while (offset < end_offset) { - if (!req.content_provider(offset, end_offset - offset, data_sink)) { - return false; - } - if (!ok) { return false; } - } + // Flush buffer + auto &data = bstrm.get_buffer(); + if (!detail::write_data(strm, data.data(), data.size())) { + error = Error::Write; + return false; } + } + + // Body + if (req.body.empty()) { + return write_content_with_provider(strm, req, error); } else { return detail::write_data(strm, req.body.data(), req.body.size()); } @@ -4658,94 +5617,183 @@ inline bool Client::write_request(Stream &strm, const Request &req, return true; } -inline std::shared_ptr Client::send_with_content_provider( - const char *method, const char *path, const Headers &headers, - const std::string &body, size_t content_length, - ContentProvider content_provider, const char *content_type) { - Request req; - req.method = method; - req.headers = headers; - req.path = path; +inline std::unique_ptr ClientImpl::send_with_content_provider( + Request &req, + // const char *method, const char *path, const Headers &headers, + const char *body, size_t content_length, ContentProvider content_provider, + ContentProviderWithoutLength content_provider_without_length, + const char *content_type, Error &error) { + + // Request req; + // req.method = method; + // req.headers = headers; + // req.path = path; if (content_type) { req.headers.emplace("Content-Type", content_type); } #ifdef CPPHTTPLIB_ZLIB_SUPPORT - if (compress_) { + if (compress_) { req.headers.emplace("Content-Encoding", "gzip"); } +#endif + +#ifdef CPPHTTPLIB_ZLIB_SUPPORT + if (compress_ && !content_provider_without_length) { + // TODO: Brotli support + detail::gzip_compressor compressor; + if (content_provider) { + auto ok = true; size_t offset = 0; - DataSink data_sink; + data_sink.write = [&](const char *data, size_t data_len) { - req.body.append(data, data_len); - offset += data_len; + if (ok) { + auto last = offset + data_len == content_length; + + auto ret = compressor.compress( + data, data_len, last, [&](const char *data, size_t data_len) { + req.body.append(data, data_len); + return true; + }); + + if (ret) { + offset += data_len; + } else { + ok = false; + } + } }; - data_sink.is_writable = [&](void) { return true; }; - while (offset < content_length) { + data_sink.is_writable = [&](void) { return ok && true; }; + + while (ok && offset < content_length) { if (!content_provider(offset, content_length - offset, data_sink)) { + error = Error::Canceled; return nullptr; } } } else { - req.body = body; + if (!compressor.compress(body, content_length, true, + [&](const char *data, size_t data_len) { + req.body.append(data, data_len); + return true; + })) { + error = Error::Compression; + return nullptr; + } } - - if (!detail::compress(req.body)) { return nullptr; } - req.headers.emplace("Content-Encoding", "gzip"); } else #endif { if (content_provider) { - req.content_length = content_length; - req.content_provider = content_provider; + req.content_length_ = content_length; + req.content_provider_ = std::move(content_provider); + req.is_chunked_content_provider_ = false; + } else if (content_provider_without_length) { + req.content_length_ = 0; + req.content_provider_ = detail::ContentProviderAdapter( + std::move(content_provider_without_length)); + req.is_chunked_content_provider_ = true; + req.headers.emplace("Transfer-Encoding", "chunked"); } else { - req.body = body; + req.body.assign(body, content_length); + ; } } - auto res = std::make_shared(); + auto res = detail::make_unique(); + return send(req, *res, error) ? std::move(res) : nullptr; +} + +inline Result ClientImpl::send_with_content_provider( + const char *method, const char *path, const Headers &headers, + const char *body, size_t content_length, ContentProvider content_provider, + ContentProviderWithoutLength content_provider_without_length, + const char *content_type) { + Request req; + req.method = method; + req.headers = headers; + req.path = path; + + auto error = Error::Success; - return send(req, *res) ? res : nullptr; + auto res = send_with_content_provider( + req, + // method, path, headers, + body, content_length, std::move(content_provider), + std::move(content_provider_without_length), content_type, error); + + return Result{std::move(res), error, std::move(req.headers)}; } -inline bool Client::process_request(Stream &strm, const Request &req, - Response &res, bool close_connection) { +inline bool ClientImpl::process_request(Stream &strm, Request &req, + Response &res, bool close_connection, + Error &error) { // Send request - if (!write_request(strm, req, close_connection)) { return false; } + if (!write_request(strm, req, close_connection, error)) { return false; } // Receive response and headers - if (!read_response_line(strm, res) || + if (!read_response_line(strm, req, res) || !detail::read_headers(strm, res.headers)) { + error = Error::Read; return false; } if (req.response_handler) { - if (!req.response_handler(res)) { return false; } + if (!req.response_handler(res)) { + error = Error::Canceled; + return false; + } } // Body - if (req.method != "HEAD" && req.method != "CONNECT") { + if ((res.status != 204) && req.method != "HEAD" && req.method != "CONNECT") { auto out = req.content_receiver - ? static_cast([&](const char *buf, size_t n) { - return req.content_receiver(buf, n); - }) - : static_cast([&](const char *buf, size_t n) { - if (res.body.size() + n > res.body.max_size()) { return false; } - res.body.append(buf, n); - return true; - }); + ? static_cast( + [&](const char *buf, size_t n, uint64_t off, uint64_t len) { + auto ret = req.content_receiver(buf, n, off, len); + if (!ret) { error = Error::Canceled; } + return ret; + }) + : static_cast( + [&](const char *buf, size_t n, uint64_t /*off*/, + uint64_t /*len*/) { + if (res.body.size() + n > res.body.max_size()) { + return false; + } + res.body.append(buf, n); + return true; + }); + + auto progress = [&](uint64_t current, uint64_t total) { + if (!req.progress) { return true; } + auto ret = req.progress(current, total); + if (!ret) { error = Error::Canceled; } + return ret; + }; int dummy_status; if (!detail::read_content(strm, res, (std::numeric_limits::max)(), - dummy_status, req.progress, out, decompress_)) { + dummy_status, std::move(progress), std::move(out), + decompress_)) { + if (error != Error::Canceled) { error = Error::Read; } return false; } } if (res.get_header_value("Connection") == "close" || - res.version == "HTTP/1.0") { - stop(); + (res.version == "HTTP/1.0" && res.reason != "Connection established")) { + // TODO this requires a not-entirely-obvious chain of calls to be correct + // for this to be safe. Maybe a code refactor (such as moving this out to + // the send function and getting rid of the recursiveness of the mutex) + // could make this more obvious. + + // This is safe to call because process_request is only called by + // handle_request which is only called by send, which locks the request + // mutex during the process. It would be a bug to call it from a different + // thread since it's a thread-safety issue to do these things to the socket + // if another thread is using the socket. + lock_socket_and_shutdown_and_close(); } // Log @@ -4754,182 +5802,233 @@ inline bool Client::process_request(Stream &strm, const Request &req, return true; } -inline bool Client::process_socket(Socket &socket, - std::function callback) { - return detail::process_client_socket(socket.sock, read_timeout_sec_, - read_timeout_usec_, write_timeout_sec_, - write_timeout_usec_, callback); +inline bool +ClientImpl::process_socket(const Socket &socket, + std::function callback) { + return detail::process_client_socket( + socket.sock, read_timeout_sec_, read_timeout_usec_, write_timeout_sec_, + write_timeout_usec_, std::move(callback)); } -inline bool Client::is_ssl() const { return false; } +inline bool ClientImpl::is_ssl() const { return false; } - -inline std::shared_ptr Client::Get(const char *path) { +inline Result ClientImpl::Get(const char *path) { return Get(path, Headers(), Progress()); } -inline std::shared_ptr Client::Get(const char *path, - Progress progress) { +inline Result ClientImpl::Get(const char *path, Progress progress) { return Get(path, Headers(), std::move(progress)); } -inline std::shared_ptr Client::Get(const char *path, - const Headers &headers) { +inline Result ClientImpl::Get(const char *path, const Headers &headers) { return Get(path, headers, Progress()); } -inline std::shared_ptr -Client::Get(const char *path, const Headers &headers, Progress progress) { +inline Result ClientImpl::Get(const char *path, const Headers &headers, + Progress progress) { Request req; req.method = "GET"; req.path = path; req.headers = headers; req.progress = std::move(progress); - auto res = std::make_shared(); - return send(req, *res) ? res : nullptr; -} - -inline -std::shared_ptr -Client::Get(const char *path, std::map params, const Headers &headers) { - Request req; - req.method = "GET"; - req.path = path; - req.headers = headers; - req.progress = std::move(Progress()); - - std::string query; - std::map::iterator iter; - for(iter = params.begin(); iter != params.end(); iter++) { - query.append("&").append(iter->first + "=" + detail::encode_url(iter->second)); - } - req.query = query; - - auto res = std::make_shared(); - return send(req, *res) ? res : nullptr; + return send_(std::move(req)); } -inline std::shared_ptr Client::Get(const char *path, - ContentReceiver content_receiver) { - return Get(path, Headers(), nullptr, std::move(content_receiver), Progress()); +inline Result ClientImpl::Get(const char *path, + ContentReceiver content_receiver) { + return Get(path, Headers(), nullptr, std::move(content_receiver), nullptr); } -inline std::shared_ptr Client::Get(const char *path, - ContentReceiver content_receiver, - Progress progress) { +inline Result ClientImpl::Get(const char *path, + ContentReceiver content_receiver, + Progress progress) { return Get(path, Headers(), nullptr, std::move(content_receiver), std::move(progress)); } -inline std::shared_ptr Client::Get(const char *path, - const Headers &headers, - ContentReceiver content_receiver) { - return Get(path, headers, nullptr, std::move(content_receiver), Progress()); +inline Result ClientImpl::Get(const char *path, const Headers &headers, + ContentReceiver content_receiver) { + return Get(path, headers, nullptr, std::move(content_receiver), nullptr); } -inline std::shared_ptr Client::Get(const char *path, - const Headers &headers, - ContentReceiver content_receiver, - Progress progress) { +inline Result ClientImpl::Get(const char *path, const Headers &headers, + ContentReceiver content_receiver, + Progress progress) { return Get(path, headers, nullptr, std::move(content_receiver), std::move(progress)); } -inline std::shared_ptr Client::Get(const char *path, - const Headers &headers, - ResponseHandler response_handler, - ContentReceiver content_receiver) { - return Get(path, headers, std::move(response_handler), content_receiver, - Progress()); +inline Result ClientImpl::Get(const char *path, + ResponseHandler response_handler, + ContentReceiver content_receiver) { + return Get(path, Headers(), std::move(response_handler), + std::move(content_receiver), nullptr); +} + +inline Result ClientImpl::Get(const char *path, const Headers &headers, + ResponseHandler response_handler, + ContentReceiver content_receiver) { + return Get(path, headers, std::move(response_handler), + std::move(content_receiver), nullptr); } -inline std::shared_ptr Client::Get(const char *path, - const Headers &headers, - ResponseHandler response_handler, - ContentReceiver content_receiver, - Progress progress) { +inline Result ClientImpl::Get(const char *path, + ResponseHandler response_handler, + ContentReceiver content_receiver, + Progress progress) { + return Get(path, Headers(), std::move(response_handler), + std::move(content_receiver), std::move(progress)); +} + +inline Result ClientImpl::Get(const char *path, const Headers &headers, + ResponseHandler response_handler, + ContentReceiver content_receiver, + Progress progress) { Request req; req.method = "GET"; req.path = path; req.headers = headers; req.response_handler = std::move(response_handler); - req.content_receiver = std::move(content_receiver); + req.content_receiver = + [content_receiver](const char *data, size_t data_length, + uint64_t /*offset*/, uint64_t /*total_length*/) { + return content_receiver(data, data_length); + }; req.progress = std::move(progress); - auto res = std::make_shared(); - return send(req, *res) ? res : nullptr; + return send_(std::move(req)); +} + +inline Result ClientImpl::Get(const char *path, const Params ¶ms, + const Headers &headers, Progress progress) { + if (params.empty()) { return Get(path, headers); } + + std::string path_with_query = detail::append_query_params(path, params); + return Get(path_with_query.c_str(), headers, progress); +} + +inline Result ClientImpl::Get(const char *path, const Params ¶ms, + const Headers &headers, + ContentReceiver content_receiver, + Progress progress) { + return Get(path, params, headers, nullptr, content_receiver, progress); } -inline std::shared_ptr Client::Head(const char *path) { +inline Result ClientImpl::Get(const char *path, const Params ¶ms, + const Headers &headers, + ResponseHandler response_handler, + ContentReceiver content_receiver, + Progress progress) { + if (params.empty()) { + return Get(path, headers, response_handler, content_receiver, progress); + } + + std::string path_with_query = detail::append_query_params(path, params); + return Get(path_with_query.c_str(), params, headers, response_handler, + content_receiver, progress); +} + +inline Result ClientImpl::Head(const char *path) { return Head(path, Headers()); } -inline std::shared_ptr Client::Head(const char *path, - const Headers &headers) { +inline Result ClientImpl::Head(const char *path, const Headers &headers) { Request req; req.method = "HEAD"; req.headers = headers; req.path = path; - auto res = std::make_shared(); - - return send(req, *res) ? res : nullptr; + return send_(std::move(req)); } -inline std::shared_ptr Client::Post(const char *path) { +inline Result ClientImpl::Post(const char *path) { return Post(path, std::string(), nullptr); } -inline std::shared_ptr Client::Post(const char *path, - const std::string &body, - const char *content_type) { +inline Result ClientImpl::Post(const char *path, const char *body, + size_t content_length, + const char *content_type) { + return Post(path, Headers(), body, content_length, content_type); +} + +inline Result ClientImpl::Post(const char *path, const Headers &headers, + const char *body, size_t content_length, + const char *content_type) { + return send_with_content_provider("POST", path, headers, body, content_length, + nullptr, nullptr, content_type); +} + +inline Result ClientImpl::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) { - return send_with_content_provider("POST", path, headers, body, 0, nullptr, +inline Result ClientImpl::Post(const char *path, const Headers &headers, + const std::string &body, + const char *content_type) { + return send_with_content_provider("POST", path, headers, body.data(), + body.size(), nullptr, nullptr, content_type); } -inline std::shared_ptr Client::Post(const char *path, - const Params ¶ms) { +inline Result ClientImpl::Post(const char *path, const Params ¶ms) { return Post(path, Headers(), params); } -inline std::shared_ptr Client::Post(const char *path, - size_t content_length, - ContentProvider content_provider, - const char *content_type) { - return Post(path, Headers(), content_length, content_provider, content_type); +inline Result ClientImpl::Post(const char *path, size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return Post(path, Headers(), content_length, std::move(content_provider), + content_type); } -inline std::shared_ptr -Client::Post(const char *path, const Headers &headers, size_t content_length, - ContentProvider content_provider, const char *content_type) { - return send_with_content_provider("POST", path, headers, std::string(), - content_length, content_provider, - content_type); +inline Result ClientImpl::Post(const char *path, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return Post(path, Headers(), std::move(content_provider), content_type); +} + +inline Result ClientImpl::Post(const char *path, const Headers &headers, + size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return send_with_content_provider("POST", path, headers, nullptr, + content_length, std::move(content_provider), + nullptr, content_type); } -inline std::shared_ptr -Client::Post(const char *path, const Headers &headers, const Params ¶ms) { +inline Result ClientImpl::Post(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return send_with_content_provider("POST", path, headers, nullptr, 0, nullptr, + std::move(content_provider), content_type); +} + +inline Result ClientImpl::Post(const char *path, const Headers &headers, + const Params ¶ms) { auto query = detail::params_to_query_str(params); return Post(path, headers, query, "application/x-www-form-urlencoded"); } -inline std::shared_ptr -Client::Post(const char *path, const MultipartFormDataItems &items) { +inline Result ClientImpl::Post(const char *path, + const MultipartFormDataItems &items) { return Post(path, Headers(), items); } -inline std::shared_ptr -Client::Post(const char *path, const Headers &headers, - const MultipartFormDataItems &items) { - auto boundary = detail::make_multipart_data_boundary(); +inline Result ClientImpl::Post(const char *path, const Headers &headers, + const MultipartFormDataItems &items) { + return Post(path, headers, items, detail::make_multipart_data_boundary()); +} +inline Result ClientImpl::Post(const char *path, const Headers &headers, + const MultipartFormDataItems &items, + const std::string &boundary) { + for (size_t i = 0; i < boundary.size(); i++) { + char c = boundary[i]; + if (!std::isalnum(c) && c != '-' && c != '_') { + return Result{nullptr, Error::UnsupportedMultipartBoundaryChars}; + } + } std::string body; @@ -4953,204 +6052,299 @@ Client::Post(const char *path, const Headers &headers, return Post(path, headers, body, content_type.c_str()); } -inline std::shared_ptr Client::Put(const char *path) { +inline Result ClientImpl::Put(const char *path) { return Put(path, std::string(), nullptr); } -inline std::shared_ptr Client::Put(const char *path, - const std::string &body, - const char *content_type) { +inline Result ClientImpl::Put(const char *path, const char *body, + size_t content_length, const char *content_type) { + return Put(path, Headers(), body, content_length, content_type); +} + +inline Result ClientImpl::Put(const char *path, const Headers &headers, + const char *body, size_t content_length, + const char *content_type) { + return send_with_content_provider("PUT", path, headers, body, content_length, + nullptr, nullptr, content_type); +} + +inline Result ClientImpl::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) { - return send_with_content_provider("PUT", path, headers, body, 0, nullptr, +inline Result ClientImpl::Put(const char *path, const Headers &headers, + const std::string &body, + const char *content_type) { + return send_with_content_provider("PUT", path, headers, body.data(), + body.size(), nullptr, nullptr, content_type); } -inline std::shared_ptr Client::Put(const char *path, - size_t content_length, - ContentProvider content_provider, - const char *content_type) { - return Put(path, Headers(), content_length, content_provider, content_type); +inline Result ClientImpl::Put(const char *path, size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return Put(path, Headers(), content_length, std::move(content_provider), + content_type); } -inline std::shared_ptr -Client::Put(const char *path, const Headers &headers, size_t content_length, - ContentProvider content_provider, const char *content_type) { - return send_with_content_provider("PUT", path, headers, std::string(), - content_length, content_provider, - content_type); +inline Result ClientImpl::Put(const char *path, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return Put(path, Headers(), std::move(content_provider), content_type); +} + +inline Result ClientImpl::Put(const char *path, const Headers &headers, + size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return send_with_content_provider("PUT", path, headers, nullptr, + content_length, std::move(content_provider), + nullptr, content_type); } -inline std::shared_ptr Client::Put(const char *path, - const Params ¶ms) { +inline Result ClientImpl::Put(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return send_with_content_provider("PUT", path, headers, nullptr, 0, nullptr, + std::move(content_provider), content_type); +} + +inline Result ClientImpl::Put(const char *path, const Params ¶ms) { return Put(path, Headers(), params); } -inline std::shared_ptr -Client::Put(const char *path, const Headers &headers, const Params ¶ms) { +inline Result ClientImpl::Put(const char *path, const Headers &headers, + const Params ¶ms) { auto query = detail::params_to_query_str(params); return Put(path, headers, query, "application/x-www-form-urlencoded"); } -inline std::shared_ptr Client::Patch(const char *path, - const std::string &body, - const char *content_type) { - return Patch(path, Headers(), body, content_type); +inline Result ClientImpl::Patch(const char *path) { + return Patch(path, std::string(), nullptr); +} + +inline Result ClientImpl::Patch(const char *path, const char *body, + size_t content_length, + const char *content_type) { + return Patch(path, Headers(), body, content_length, content_type); } -inline std::shared_ptr Client::Patch(const char *path, - const Headers &headers, - const std::string &body, - const char *content_type) { - return send_with_content_provider("PATCH", path, headers, body, 0, nullptr, +inline Result ClientImpl::Patch(const char *path, const Headers &headers, + const char *body, size_t content_length, + const char *content_type) { + return send_with_content_provider("PATCH", path, headers, body, + content_length, nullptr, nullptr, content_type); } -inline std::shared_ptr Client::Patch(const char *path, - size_t content_length, - ContentProvider content_provider, - const char *content_type) { - return Patch(path, Headers(), content_length, content_provider, content_type); +inline Result ClientImpl::Patch(const char *path, const std::string &body, + const char *content_type) { + return Patch(path, Headers(), body, content_type); } -inline std::shared_ptr -Client::Patch(const char *path, const Headers &headers, size_t content_length, - ContentProvider content_provider, const char *content_type) { - return send_with_content_provider("PATCH", path, headers, std::string(), - content_length, content_provider, +inline Result ClientImpl::Patch(const char *path, const Headers &headers, + const std::string &body, + const char *content_type) { + return send_with_content_provider("PATCH", path, headers, body.data(), + body.size(), nullptr, nullptr, content_type); } -inline std::shared_ptr Client::Delete(const char *path) { - return Delete(path, Headers(), std::string(), nullptr); +inline Result ClientImpl::Patch(const char *path, size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return Patch(path, Headers(), content_length, std::move(content_provider), + content_type); +} + +inline Result ClientImpl::Patch(const char *path, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return Patch(path, Headers(), std::move(content_provider), content_type); +} + +inline Result ClientImpl::Patch(const char *path, const Headers &headers, + size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return send_with_content_provider("PATCH", path, headers, nullptr, + content_length, std::move(content_provider), + nullptr, content_type); +} + +inline Result ClientImpl::Patch(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return send_with_content_provider("PATCH", path, headers, nullptr, 0, nullptr, + std::move(content_provider), content_type); } -inline std::shared_ptr Client::Delete(const char *path, - const std::string &body, - const char *content_type) { - return Delete(path, Headers(), body, content_type); +inline Result ClientImpl::Delete(const char *path) { + return Delete(path, Headers(), std::string(), nullptr); } -inline std::shared_ptr Client::Delete(const char *path, - const Headers &headers) { +inline Result ClientImpl::Delete(const char *path, const Headers &headers) { return Delete(path, headers, std::string(), nullptr); } -inline std::shared_ptr Client::Delete(const char *path, - const Headers &headers, - const std::string &body, - const char *content_type) { +inline Result ClientImpl::Delete(const char *path, const char *body, + size_t content_length, + const char *content_type) { + return Delete(path, Headers(), body, content_length, content_type); +} + +inline Result ClientImpl::Delete(const char *path, const Headers &headers, + const char *body, size_t content_length, + const char *content_type) { Request req; req.method = "DELETE"; req.headers = headers; req.path = path; if (content_type) { req.headers.emplace("Content-Type", content_type); } - req.body = body; + req.body.assign(body, content_length); - auto res = std::make_shared(); + return send_(std::move(req)); +} + +inline Result ClientImpl::Delete(const char *path, const std::string &body, + const char *content_type) { + return Delete(path, Headers(), body.data(), body.size(), content_type); +} - return send(req, *res) ? res : nullptr; +inline Result ClientImpl::Delete(const char *path, const Headers &headers, + const std::string &body, + const char *content_type) { + return Delete(path, headers, body.data(), body.size(), content_type); } -inline std::shared_ptr Client::Options(const char *path) { +inline Result ClientImpl::Options(const char *path) { return Options(path, Headers()); } -inline std::shared_ptr Client::Options(const char *path, - const Headers &headers) { +inline Result ClientImpl::Options(const char *path, const Headers &headers) { Request req; req.method = "OPTIONS"; - req.path = path; req.headers = headers; + req.path = path; - auto res = std::make_shared(); - - return send(req, *res) ? res : nullptr; + return send_(std::move(req)); } -inline size_t Client::is_socket_open() const { +inline size_t ClientImpl::is_socket_open() const { std::lock_guard guard(socket_mutex_); return socket_.is_open(); } -inline void Client::stop() { +inline void ClientImpl::stop() { std::lock_guard guard(socket_mutex_); - if (socket_.is_open()) { - detail::shutdown_socket(socket_.sock); - std::this_thread::sleep_for(std::chrono::milliseconds(1)); - close_socket(socket_, true); - std::this_thread::sleep_for(std::chrono::milliseconds(1)); + + // If there is anything ongoing right now, the ONLY thread-safe thing we can + // do is to shutdown_socket, so that threads using this socket suddenly + // discover they can't read/write any more and error out. Everything else + // (closing the socket, shutting ssl down) is unsafe because these actions are + // not thread-safe. + if (socket_requests_in_flight_ > 0) { + shutdown_socket(socket_); + + // Aside from that, we set a flag for the socket to be closed when we're + // done. + socket_should_be_closed_when_request_is_done_ = true; + return; } -} -inline void Client::set_timeout_sec(time_t timeout_sec) { - set_connection_timeout(timeout_sec, 0); + // Otherwise, sitll holding the mutex, we can shut everything down ourselves + shutdown_ssl(socket_, true); + shutdown_socket(socket_); + close_socket(socket_); } -inline void Client::set_connection_timeout(time_t sec, time_t usec) { +inline void ClientImpl::set_connection_timeout(time_t sec, time_t usec) { connection_timeout_sec_ = sec; connection_timeout_usec_ = usec; } -inline void Client::set_read_timeout(time_t sec, time_t usec) { +inline void ClientImpl::set_read_timeout(time_t sec, time_t usec) { read_timeout_sec_ = sec; read_timeout_usec_ = usec; } -inline void Client::set_write_timeout(time_t sec, time_t usec) { +inline void ClientImpl::set_write_timeout(time_t sec, time_t usec) { write_timeout_sec_ = sec; write_timeout_usec_ = usec; } -inline void Client::set_basic_auth(const char *username, const char *password) { +inline void ClientImpl::set_basic_auth(const char *username, + const char *password) { basic_auth_username_ = username; basic_auth_password_ = password; } +inline void ClientImpl::set_bearer_token_auth(const char *token) { + bearer_token_auth_token_ = token; +} + #ifdef CPPHTTPLIB_OPENSSL_SUPPORT -inline void Client::set_digest_auth(const char *username, - const char *password) { +inline void ClientImpl::set_digest_auth(const char *username, + const char *password) { digest_auth_username_ = username; digest_auth_password_ = password; } #endif -inline void Client::set_keep_alive(bool on) { keep_alive_ = on; } +inline void ClientImpl::set_keep_alive(bool on) { keep_alive_ = on; } -inline void Client::set_follow_location(bool on) { follow_location_ = on; } +inline void ClientImpl::set_follow_location(bool on) { follow_location_ = on; } -inline void Client::set_compress(bool on) { compress_ = on; } +inline void ClientImpl::set_default_headers(Headers headers) { + default_headers_ = std::move(headers); +} + +inline void ClientImpl::set_tcp_nodelay(bool on) { tcp_nodelay_ = on; } -inline void Client::set_decompress(bool on) { decompress_ = on; } +inline void ClientImpl::set_socket_options(SocketOptions socket_options) { + socket_options_ = std::move(socket_options); +} -inline void Client::set_interface(const char *intf) { interface_ = intf; } +inline void ClientImpl::set_compress(bool on) { compress_ = on; } -inline void Client::set_proxy(const char *host, int port) { +inline void ClientImpl::set_decompress(bool on) { decompress_ = on; } + +inline void ClientImpl::set_interface(const char *intf) { interface_ = intf; } + +inline void ClientImpl::set_proxy(const char *host, int port) { proxy_host_ = host; proxy_port_ = port; } -inline void Client::set_proxy_basic_auth(const char *username, - const char *password) { +inline void ClientImpl::set_proxy_basic_auth(const char *username, + const char *password) { proxy_basic_auth_username_ = username; proxy_basic_auth_password_ = password; } +inline void ClientImpl::set_proxy_bearer_token_auth(const char *token) { + proxy_bearer_token_auth_token_ = token; +} + #ifdef CPPHTTPLIB_OPENSSL_SUPPORT -inline void Client::set_proxy_digest_auth(const char *username, - const char *password) { +inline void ClientImpl::set_proxy_digest_auth(const char *username, + const char *password) { proxy_digest_auth_username_ = username; proxy_digest_auth_password_ = password; } #endif -inline void Client::set_logger(Logger logger) { logger_ = std::move(logger); } +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT +inline void ClientImpl::enable_server_certificate_verification(bool enabled) { + server_certificate_verification_ = enabled; +} +#endif + +inline void ClientImpl::set_logger(Logger logger) { + logger_ = std::move(logger); +} /* * SSL Implementation @@ -5168,7 +6362,9 @@ inline SSL *ssl_new(socket_t sock, SSL_CTX *ctx, std::mutex &ctx_mutex, } if (ssl) { + set_nonblocking(sock, true); auto bio = BIO_new_socket(static_cast(sock), BIO_NOCLOSE); + BIO_set_nbio(bio, 1); SSL_set_bio(ssl, bio, bio); if (!setup(ssl) || SSL_connect_or_accept(ssl) != 1) { @@ -5177,32 +6373,60 @@ inline SSL *ssl_new(socket_t sock, SSL_CTX *ctx, std::mutex &ctx_mutex, std::lock_guard guard(ctx_mutex); SSL_free(ssl); } + set_nonblocking(sock, false); return nullptr; } + BIO_set_nbio(bio, 0); + set_nonblocking(sock, false); } return ssl; } inline void ssl_delete(std::mutex &ctx_mutex, SSL *ssl, - bool process_socket_ret) { - if (process_socket_ret) { - SSL_shutdown(ssl); // shutdown only if not already closed by remote - } + bool shutdown_gracefully) { + // sometimes we may want to skip this to try to avoid SIGPIPE if we know + // the remote has closed the network connection + // Note that it is not always possible to avoid SIGPIPE, this is merely a + // best-efforts. + if (shutdown_gracefully) { SSL_shutdown(ssl); } std::lock_guard guard(ctx_mutex); SSL_free(ssl); } +template +bool ssl_connect_or_accept_nonblocking(socket_t sock, SSL *ssl, + U ssl_connect_or_accept, + time_t timeout_sec, + time_t timeout_usec) { + int res = 0; + while ((res = ssl_connect_or_accept(ssl)) != 1) { + auto err = SSL_get_error(ssl, res); + switch (err) { + case SSL_ERROR_WANT_READ: + if (select_read(sock, timeout_sec, timeout_usec) > 0) { continue; } + break; + case SSL_ERROR_WANT_WRITE: + if (select_write(sock, timeout_sec, timeout_usec) > 0) { continue; } + break; + default: break; + } + return false; + } + return true; +} + template inline bool process_server_socket_ssl(SSL *ssl, socket_t sock, size_t keep_alive_max_count, + time_t keep_alive_timeout_sec, time_t read_timeout_sec, time_t read_timeout_usec, time_t write_timeout_sec, time_t write_timeout_usec, T callback) { return process_server_socket_core( - sock, keep_alive_max_count, - [&](bool close_connection, bool connection_closed) { + sock, keep_alive_max_count, keep_alive_timeout_sec, + [&](bool close_connection, bool &connection_closed) { SSLSocketStream strm(sock, ssl, read_timeout_sec, read_timeout_usec, write_timeout_sec, write_timeout_usec); return callback(strm, close_connection, connection_closed); @@ -5279,7 +6503,9 @@ inline SSLSocketStream::SSLSocketStream(socket_t sock, SSL *ssl, : sock_(sock), ssl_(ssl), read_timeout_sec_(read_timeout_sec), read_timeout_usec_(read_timeout_usec), write_timeout_sec_(write_timeout_sec), - write_timeout_usec_(write_timeout_usec) {} + write_timeout_usec_(write_timeout_usec) { + SSL_clear_mode(ssl, SSL_MODE_AUTO_RETRY); +} inline SSLSocketStream::~SSLSocketStream() {} @@ -5293,8 +6519,25 @@ inline bool SSLSocketStream::is_writable() const { } inline ssize_t SSLSocketStream::read(char *ptr, size_t size) { - if (SSL_pending(ssl_) > 0 || is_readable()) { + if (SSL_pending(ssl_) > 0) { return SSL_read(ssl_, ptr, static_cast(size)); + } else if (is_readable()) { + auto ret = SSL_read(ssl_, ptr, static_cast(size)); + if (ret < 0) { + auto err = SSL_get_error(ssl_, ret); + while (err == SSL_ERROR_WANT_READ) { + if (SSL_pending(ssl_) > 0) { + return SSL_read(ssl_, ptr, static_cast(size)); + } else if (is_readable()) { + ret = SSL_read(ssl_, ptr, static_cast(size)); + if (ret >= 0) { return ret; } + err = SSL_get_error(ssl_, ret); + } else { + return -1; + } + } + } + return ret; } return -1; } @@ -5309,6 +6552,8 @@ inline void SSLSocketStream::get_remote_ip_and_port(std::string &ip, detail::get_remote_ip_and_port(sock_, ip, port); } +inline socket_t SSLSocketStream::socket() const { return sock_; } + static SSLInit sslinit_; } // namespace detail @@ -5386,25 +6631,35 @@ inline SSLServer::~SSLServer() { inline bool SSLServer::is_valid() const { return ctx_; } inline bool SSLServer::process_and_close_socket(socket_t sock) { - auto ssl = detail::ssl_new(sock, ctx_, ctx_mutex_, SSL_accept, - [](SSL * /*ssl*/) { return true; }); + auto ssl = detail::ssl_new( + sock, ctx_, ctx_mutex_, + [&](SSL *ssl) { + return detail::ssl_connect_or_accept_nonblocking( + sock, ssl, SSL_accept, read_timeout_sec_, read_timeout_usec_); + }, + [](SSL * /*ssl*/) { return true; }); + bool ret = false; if (ssl) { - auto ret = detail::process_server_socket_ssl( - ssl, sock, keep_alive_max_count_, read_timeout_sec_, read_timeout_usec_, - write_timeout_sec_, write_timeout_usec_, + ret = detail::process_server_socket_ssl( + ssl, sock, keep_alive_max_count_, keep_alive_timeout_sec_, + read_timeout_sec_, read_timeout_usec_, write_timeout_sec_, + write_timeout_usec_, [this, ssl](Stream &strm, bool close_connection, bool &connection_closed) { return process_request(strm, close_connection, connection_closed, [&](Request &req) { req.ssl = ssl; }); }); - detail::ssl_delete(ctx_mutex_, ssl, ret); - return ret; + // Shutdown gracefully if the result seemed successful, non-gracefully if + // the connection appeared to be closed. + const bool shutdown_gracefully = ret; + detail::ssl_delete(ctx_mutex_, ssl, shutdown_gracefully); } + detail::shutdown_socket(sock); detail::close_socket(sock); - return false; + return ret; } // SSL HTTP client implementation @@ -5417,7 +6672,7 @@ inline SSLClient::SSLClient(const std::string &host, int port) inline SSLClient::SSLClient(const std::string &host, int port, const std::string &client_cert_path, const std::string &client_key_path) - : Client(host, port, client_cert_path, client_key_path) { + : ClientImpl(host, port, client_cert_path, client_key_path) { ctx_ = SSL_CTX_new(SSLv23_client_method()); detail::split(&host_[0], &host_[host_.size()], '.', @@ -5437,7 +6692,7 @@ inline SSLClient::SSLClient(const std::string &host, int port, inline SSLClient::SSLClient(const std::string &host, int port, X509 *client_cert, EVP_PKEY *client_key) - : Client(host, port) { + : ClientImpl(host, port) { ctx_ = SSL_CTX_new(SSLv23_client_method()); detail::split(&host_[0], &host_[host_.size()], '.', @@ -5455,6 +6710,10 @@ inline SSLClient::SSLClient(const std::string &host, int port, inline SSLClient::~SSLClient() { if (ctx_) { SSL_CTX_free(ctx_); } + // Make sure to shut down SSL since shutdown_ssl will resolve to the + // base function rather than the derived function once we get to the + // base class destructor, and won't free the SSL (causing a leak). + SSLClient::shutdown_ssl(socket_, true); } inline bool SSLClient::is_valid() const { return ctx_; } @@ -5466,11 +6725,16 @@ inline void SSLClient::set_ca_cert_path(const char *ca_cert_file_path, } inline void SSLClient::set_ca_cert_store(X509_STORE *ca_cert_store) { - if (ca_cert_store) { ca_cert_store_ = ca_cert_store; } -} - -inline void SSLClient::enable_server_certificate_verification(bool enabled) { - server_certificate_verification_ = enabled; + if (ca_cert_store) { + if (ctx_) { + if (SSL_CTX_get_cert_store(ctx_) != ca_cert_store) { + // Free memory allocated for old cert and use new store `ca_cert_store` + SSL_CTX_set_cert_store(ctx_, ca_cert_store); + } + } else { + X509_STORE_free(ca_cert_store); + } + } } inline long SSLClient::get_openssl_verify_result() const { @@ -5479,24 +6743,28 @@ inline long SSLClient::get_openssl_verify_result() const { inline SSL_CTX *SSLClient::ssl_context() const { return ctx_; } -inline bool SSLClient::create_and_connect_socket(Socket &socket) { - return is_valid() && Client::create_and_connect_socket(socket); +inline bool SSLClient::create_and_connect_socket(Socket &socket, Error &error) { + return is_valid() && ClientImpl::create_and_connect_socket(socket, error); } +// Assumes that socket_mutex_ is locked and that there are no requests in flight inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res, - bool &success) { + bool &success, Error &error) { success = true; Response res2; - if (!detail::process_client_socket( socket.sock, read_timeout_sec_, read_timeout_usec_, write_timeout_sec_, write_timeout_usec_, [&](Stream &strm) { Request req2; req2.method = "CONNECT"; req2.path = host_and_port_; - return process_request(strm, req2, res2, false); + return process_request(strm, req2, res2, false, error); })) { - close_socket(socket, true); + // Thread-safe to close everything because we are assuming there are no + // requests in flight + shutdown_ssl(socket, true); + shutdown_socket(socket); + close_socket(socket); success = false; return false; } @@ -5505,7 +6773,7 @@ inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res, if (!proxy_digest_auth_username_.empty() && !proxy_digest_auth_password_.empty()) { std::map auth; - if (parse_www_authenticate(res2, auth, true)) { + if (detail::parse_www_authenticate(res2, auth, true)) { Response res3; if (!detail::process_client_socket( socket.sock, read_timeout_sec_, read_timeout_usec_, @@ -5513,13 +6781,17 @@ inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res, Request req3; req3.method = "CONNECT"; req3.path = host_and_port_; - req3.headers.insert(make_digest_authentication_header( - req3, auth, 1, random_string(10), + req3.headers.insert(detail::make_digest_authentication_header( + req3, auth, 1, detail::random_string(10), proxy_digest_auth_username_, proxy_digest_auth_password_, true)); - return process_request(strm, req3, res3, false); + return process_request(strm, req3, res3, false, error); })) { - close_socket(socket, true); + // Thread-safe to close everything because we are assuming there are + // no requests in flight + shutdown_ssl(socket, true); + shutdown_socket(socket); + close_socket(socket); success = false; return false; } @@ -5533,38 +6805,70 @@ inline bool SSLClient::connect_with_proxy(Socket &socket, Response &res, return true; } -inline bool SSLClient::initialize_ssl(Socket &socket) { +inline bool SSLClient::load_certs() { + bool ret = true; + + std::call_once(initialize_cert_, [&]() { + std::lock_guard guard(ctx_mutex_); + if (!ca_cert_file_path_.empty()) { + if (!SSL_CTX_load_verify_locations(ctx_, ca_cert_file_path_.c_str(), + nullptr)) { + ret = false; + } + } else if (!ca_cert_dir_path_.empty()) { + if (!SSL_CTX_load_verify_locations(ctx_, nullptr, + ca_cert_dir_path_.c_str())) { + ret = false; + } + } else { +#ifdef _WIN32 + detail::load_system_certs_on_windows(SSL_CTX_get_cert_store(ctx_)); +#else + SSL_CTX_set_default_verify_paths(ctx_); +#endif + } + }); + + return ret; +} + +inline bool SSLClient::initialize_ssl(Socket &socket, Error &error) { auto ssl = detail::ssl_new( socket.sock, ctx_, ctx_mutex_, [&](SSL *ssl) { - if (ca_cert_file_path_.empty() && ca_cert_store_ == nullptr) { - SSL_CTX_set_verify(ctx_, SSL_VERIFY_NONE, nullptr); - } else if (!ca_cert_file_path_.empty()) { - if (!SSL_CTX_load_verify_locations(ctx_, ca_cert_file_path_.c_str(), - nullptr)) { + if (server_certificate_verification_) { + if (!load_certs()) { + error = Error::SSLLoadingCerts; return false; } - SSL_CTX_set_verify(ctx_, SSL_VERIFY_PEER, nullptr); - } else if (ca_cert_store_ != nullptr) { - if (SSL_CTX_get_cert_store(ctx_) != ca_cert_store_) { - SSL_CTX_set_cert_store(ctx_, ca_cert_store_); - } - SSL_CTX_set_verify(ctx_, SSL_VERIFY_PEER, nullptr); + SSL_set_verify(ssl, SSL_VERIFY_NONE, nullptr); } - if (SSL_connect(ssl) != 1) { return false; } + if (!detail::ssl_connect_or_accept_nonblocking( + socket.sock, ssl, SSL_connect, connection_timeout_sec_, + connection_timeout_usec_)) { + error = Error::SSLConnection; + return false; + } if (server_certificate_verification_) { verify_result_ = SSL_get_verify_result(ssl); - if (verify_result_ != X509_V_OK) { return false; } + if (verify_result_ != X509_V_OK) { + error = Error::SSLServerVerification; + return false; + } auto server_cert = SSL_get_peer_certificate(ssl); - if (server_cert == nullptr) { return false; } + if (server_cert == nullptr) { + error = Error::SSLServerVerification; + return false; + } if (!verify_host(server_cert)) { X509_free(server_cert); + error = Error::SSLServerVerification; return false; } X509_free(server_cert); @@ -5582,26 +6886,30 @@ inline bool SSLClient::initialize_ssl(Socket &socket) { return true; } - close_socket(socket, false); + shutdown_socket(socket); + close_socket(socket); return false; } -inline void SSLClient::close_socket(Socket &socket, bool process_socket_ret) { - detail::close_socket(socket.sock); - socket_.sock = INVALID_SOCKET; +inline void SSLClient::shutdown_ssl(Socket &socket, bool shutdown_gracefully) { + if (socket.sock == INVALID_SOCKET) { + assert(socket.ssl == nullptr); + return; + } if (socket.ssl) { - detail::ssl_delete(ctx_mutex_, socket.ssl, process_socket_ret); - socket_.ssl = nullptr; + detail::ssl_delete(ctx_mutex_, socket.ssl, shutdown_gracefully); + socket.ssl = nullptr; } + assert(socket.ssl == nullptr); } inline bool -SSLClient::process_socket(Socket &socket, +SSLClient::process_socket(const Socket &socket, std::function callback) { assert(socket.ssl); return detail::process_client_socket_ssl( socket.ssl, socket.sock, read_timeout_sec_, read_timeout_usec_, - write_timeout_sec_, write_timeout_usec_, callback); + write_timeout_sec_, write_timeout_usec_, std::move(callback)); } inline bool SSLClient::is_ssl() const { return true; } @@ -5661,23 +6969,21 @@ SSLClient::verify_host_with_subject_alt_name(X509 *server_cert) const { auto count = sk_GENERAL_NAME_num(alt_names); - for (auto i = 0; i < count && !dsn_matched; i++) { + for (decltype(count) i = 0; i < count && !dsn_matched; i++) { auto val = sk_GENERAL_NAME_value(alt_names, i); if (val->type == type) { auto name = (const char *)ASN1_STRING_get0_data(val->d.ia5); auto name_len = (size_t)ASN1_STRING_length(val->d.ia5); - if (strlen(name) == name_len) { - switch (type) { - case GEN_DNS: dsn_matched = check_host_name(name, name_len); break; + switch (type) { + case GEN_DNS: dsn_matched = check_host_name(name, name_len); break; - case GEN_IPADD: - if (!memcmp(&addr6, name, addr_len) || - !memcmp(&addr, name, addr_len)) { - ip_mached = true; - } - break; + case GEN_IPADD: + if (!memcmp(&addr6, name, addr_len) || + !memcmp(&addr, name, addr_len)) { + ip_mached = true; } + break; } } } @@ -5734,6 +7040,423 @@ inline bool SSLClient::check_host_name(const char *pattern, } #endif +// Universal client implementation +inline Client::Client(const char *scheme_host_port) + : Client(scheme_host_port, std::string(), std::string()) {} + +inline Client::Client(const char *scheme_host_port, + const std::string &client_cert_path, + const std::string &client_key_path) { + const static std::regex re(R"(^(?:([a-z]+)://)?([^:/?#]+)(?::(\d+))?)"); + + std::cmatch m; + if (std::regex_match(scheme_host_port, m, re)) { + auto scheme = m[1].str(); + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + if (!scheme.empty() && (scheme != "http" && scheme != "https")) { +#else + if (!scheme.empty() && scheme != "http") { +#endif + std::string msg = "'" + scheme + "' scheme is not supported."; + throw std::invalid_argument(msg); + return; + } + + auto is_ssl = scheme == "https"; + + auto host = m[2].str(); + + auto port_str = m[3].str(); + auto port = !port_str.empty() ? std::stoi(port_str) : (is_ssl ? 443 : 80); + + if (is_ssl) { +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT + cli_ = detail::make_unique(host.c_str(), port, + client_cert_path, client_key_path); + is_ssl_ = is_ssl; +#endif + } else { + cli_ = detail::make_unique(host.c_str(), port, + client_cert_path, client_key_path); + } + } else { + cli_ = detail::make_unique(scheme_host_port, 80, + client_cert_path, client_key_path); + } +} + +inline Client::Client(const std::string &host, int port) + : cli_(detail::make_unique(host, port)) {} + +inline Client::Client(const std::string &host, int port, + const std::string &client_cert_path, + const std::string &client_key_path) + : cli_(detail::make_unique(host, port, client_cert_path, + client_key_path)) {} + +inline Client::~Client() {} + +inline bool Client::is_valid() const { + return cli_ != nullptr && cli_->is_valid(); +} + +inline Result Client::Get(const char *path) { return cli_->Get(path); } +inline Result Client::Get(const char *path, const Headers &headers) { + return cli_->Get(path, headers); +} +inline Result Client::Get(const char *path, Progress progress) { + return cli_->Get(path, std::move(progress)); +} +inline Result Client::Get(const char *path, const Headers &headers, + Progress progress) { + return cli_->Get(path, headers, std::move(progress)); +} +inline Result Client::Get(const char *path, ContentReceiver content_receiver) { + return cli_->Get(path, std::move(content_receiver)); +} +inline Result Client::Get(const char *path, const Headers &headers, + ContentReceiver content_receiver) { + return cli_->Get(path, headers, std::move(content_receiver)); +} +inline Result Client::Get(const char *path, ContentReceiver content_receiver, + Progress progress) { + return cli_->Get(path, std::move(content_receiver), std::move(progress)); +} +inline Result Client::Get(const char *path, const Headers &headers, + ContentReceiver content_receiver, Progress progress) { + return cli_->Get(path, headers, std::move(content_receiver), + std::move(progress)); +} +inline Result Client::Get(const char *path, ResponseHandler response_handler, + ContentReceiver content_receiver) { + return cli_->Get(path, std::move(response_handler), + std::move(content_receiver)); +} +inline Result Client::Get(const char *path, const Headers &headers, + ResponseHandler response_handler, + ContentReceiver content_receiver) { + return cli_->Get(path, headers, std::move(response_handler), + std::move(content_receiver)); +} +inline Result Client::Get(const char *path, ResponseHandler response_handler, + ContentReceiver content_receiver, Progress progress) { + return cli_->Get(path, std::move(response_handler), + std::move(content_receiver), std::move(progress)); +} +inline Result Client::Get(const char *path, const Headers &headers, + ResponseHandler response_handler, + ContentReceiver content_receiver, Progress progress) { + return cli_->Get(path, headers, std::move(response_handler), + std::move(content_receiver), std::move(progress)); +} +inline Result Client::Get(const char *path, const Params ¶ms, + const Headers &headers, Progress progress) { + return cli_->Get(path, params, headers, progress); +} +inline Result Client::Get(const char *path, const Params ¶ms, + const Headers &headers, + ContentReceiver content_receiver, Progress progress) { + return cli_->Get(path, params, headers, content_receiver, progress); +} +inline Result Client::Get(const char *path, const Params ¶ms, + const Headers &headers, + ResponseHandler response_handler, + ContentReceiver content_receiver, Progress progress) { + return cli_->Get(path, params, headers, response_handler, content_receiver, + progress); +} + +inline Result Client::Head(const char *path) { return cli_->Head(path); } +inline Result Client::Head(const char *path, const Headers &headers) { + return cli_->Head(path, headers); +} + +inline Result Client::Post(const char *path) { return cli_->Post(path); } +inline Result Client::Post(const char *path, const char *body, + size_t content_length, const char *content_type) { + return cli_->Post(path, body, content_length, content_type); +} +inline Result Client::Post(const char *path, const Headers &headers, + const char *body, size_t content_length, + const char *content_type) { + return cli_->Post(path, headers, body, content_length, content_type); +} +inline Result Client::Post(const char *path, const std::string &body, + const char *content_type) { + return cli_->Post(path, body, content_type); +} +inline Result Client::Post(const char *path, const Headers &headers, + const std::string &body, const char *content_type) { + return cli_->Post(path, headers, body, content_type); +} +inline Result Client::Post(const char *path, size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return cli_->Post(path, content_length, std::move(content_provider), + content_type); +} +inline Result Client::Post(const char *path, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return cli_->Post(path, std::move(content_provider), content_type); +} +inline Result Client::Post(const char *path, const Headers &headers, + size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return cli_->Post(path, headers, content_length, std::move(content_provider), + content_type); +} +inline Result Client::Post(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return cli_->Post(path, headers, std::move(content_provider), content_type); +} +inline Result Client::Post(const char *path, const Params ¶ms) { + return cli_->Post(path, params); +} +inline Result Client::Post(const char *path, const Headers &headers, + const Params ¶ms) { + return cli_->Post(path, headers, params); +} +inline Result Client::Post(const char *path, + const MultipartFormDataItems &items) { + return cli_->Post(path, items); +} +inline Result Client::Post(const char *path, const Headers &headers, + const MultipartFormDataItems &items) { + return cli_->Post(path, headers, items); +} +inline Result Client::Post(const char *path, const Headers &headers, + const MultipartFormDataItems &items, + const std::string &boundary) { + return cli_->Post(path, headers, items, boundary); +} +inline Result Client::Put(const char *path) { return cli_->Put(path); } +inline Result Client::Put(const char *path, const char *body, + size_t content_length, const char *content_type) { + return cli_->Put(path, body, content_length, content_type); +} +inline Result Client::Put(const char *path, const Headers &headers, + const char *body, size_t content_length, + const char *content_type) { + return cli_->Put(path, headers, body, content_length, content_type); +} +inline Result Client::Put(const char *path, const std::string &body, + const char *content_type) { + return cli_->Put(path, body, content_type); +} +inline Result Client::Put(const char *path, const Headers &headers, + const std::string &body, const char *content_type) { + return cli_->Put(path, headers, body, content_type); +} +inline Result Client::Put(const char *path, size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return cli_->Put(path, content_length, std::move(content_provider), + content_type); +} +inline Result Client::Put(const char *path, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return cli_->Put(path, std::move(content_provider), content_type); +} +inline Result Client::Put(const char *path, const Headers &headers, + size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return cli_->Put(path, headers, content_length, std::move(content_provider), + content_type); +} +inline Result Client::Put(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return cli_->Put(path, headers, std::move(content_provider), content_type); +} +inline Result Client::Put(const char *path, const Params ¶ms) { + return cli_->Put(path, params); +} +inline Result Client::Put(const char *path, const Headers &headers, + const Params ¶ms) { + return cli_->Put(path, headers, params); +} +inline Result Client::Patch(const char *path) { return cli_->Patch(path); } +inline Result Client::Patch(const char *path, const char *body, + size_t content_length, const char *content_type) { + return cli_->Patch(path, body, content_length, content_type); +} +inline Result Client::Patch(const char *path, const Headers &headers, + const char *body, size_t content_length, + const char *content_type) { + return cli_->Patch(path, headers, body, content_length, content_type); +} +inline Result Client::Patch(const char *path, const std::string &body, + const char *content_type) { + return cli_->Patch(path, body, content_type); +} +inline Result Client::Patch(const char *path, const Headers &headers, + const std::string &body, const char *content_type) { + return cli_->Patch(path, headers, body, content_type); +} +inline Result Client::Patch(const char *path, size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return cli_->Patch(path, content_length, std::move(content_provider), + content_type); +} +inline Result Client::Patch(const char *path, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return cli_->Patch(path, std::move(content_provider), content_type); +} +inline Result Client::Patch(const char *path, const Headers &headers, + size_t content_length, + ContentProvider content_provider, + const char *content_type) { + return cli_->Patch(path, headers, content_length, std::move(content_provider), + content_type); +} +inline Result Client::Patch(const char *path, const Headers &headers, + ContentProviderWithoutLength content_provider, + const char *content_type) { + return cli_->Patch(path, headers, std::move(content_provider), content_type); +} +inline Result Client::Delete(const char *path) { return cli_->Delete(path); } +inline Result Client::Delete(const char *path, const Headers &headers) { + return cli_->Delete(path, headers); +} +inline Result Client::Delete(const char *path, const char *body, + size_t content_length, const char *content_type) { + return cli_->Delete(path, body, content_length, content_type); +} +inline Result Client::Delete(const char *path, const Headers &headers, + const char *body, size_t content_length, + const char *content_type) { + return cli_->Delete(path, headers, body, content_length, content_type); +} +inline Result Client::Delete(const char *path, const std::string &body, + const char *content_type) { + return cli_->Delete(path, body, content_type); +} +inline Result Client::Delete(const char *path, const Headers &headers, + const std::string &body, + const char *content_type) { + return cli_->Delete(path, headers, body, content_type); +} +inline Result Client::Options(const char *path) { return cli_->Options(path); } +inline Result Client::Options(const char *path, const Headers &headers) { + return cli_->Options(path, headers); +} + +inline bool Client::send(Request &req, Response &res, Error &error) { + return cli_->send(req, res, error); +} + +inline Result Client::send(const Request &req) { return cli_->send(req); } + +inline size_t Client::is_socket_open() const { return cli_->is_socket_open(); } + +inline void Client::stop() { cli_->stop(); } + +inline void Client::set_default_headers(Headers headers) { + cli_->set_default_headers(std::move(headers)); +} + +inline void Client::set_tcp_nodelay(bool on) { cli_->set_tcp_nodelay(on); } +inline void Client::set_socket_options(SocketOptions socket_options) { + cli_->set_socket_options(std::move(socket_options)); +} + +inline void Client::set_connection_timeout(time_t sec, time_t usec) { + cli_->set_connection_timeout(sec, usec); +} +inline void Client::set_read_timeout(time_t sec, time_t usec) { + cli_->set_read_timeout(sec, usec); +} +inline void Client::set_write_timeout(time_t sec, time_t usec) { + cli_->set_write_timeout(sec, usec); +} + +inline void Client::set_basic_auth(const char *username, const char *password) { + cli_->set_basic_auth(username, password); +} +inline void Client::set_bearer_token_auth(const char *token) { + cli_->set_bearer_token_auth(token); +} +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT +inline void Client::set_digest_auth(const char *username, + const char *password) { + cli_->set_digest_auth(username, password); +} +#endif + +inline void Client::set_keep_alive(bool on) { cli_->set_keep_alive(on); } +inline void Client::set_follow_location(bool on) { + cli_->set_follow_location(on); +} + +inline void Client::set_compress(bool on) { cli_->set_compress(on); } + +inline void Client::set_decompress(bool on) { cli_->set_decompress(on); } + +inline void Client::set_interface(const char *intf) { + cli_->set_interface(intf); +} + +inline void Client::set_proxy(const char *host, int port) { + cli_->set_proxy(host, port); +} +inline void Client::set_proxy_basic_auth(const char *username, + const char *password) { + cli_->set_proxy_basic_auth(username, password); +} +inline void Client::set_proxy_bearer_token_auth(const char *token) { + cli_->set_proxy_bearer_token_auth(token); +} +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT +inline void Client::set_proxy_digest_auth(const char *username, + const char *password) { + cli_->set_proxy_digest_auth(username, password); +} +#endif + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT +inline void Client::enable_server_certificate_verification(bool enabled) { + cli_->enable_server_certificate_verification(enabled); +} +#endif + +inline void Client::set_logger(Logger logger) { cli_->set_logger(logger); } + +#ifdef CPPHTTPLIB_OPENSSL_SUPPORT +inline void Client::set_ca_cert_path(const char *ca_cert_file_path, + const char *ca_cert_dir_path) { + if (is_ssl_) { + static_cast(*cli_).set_ca_cert_path(ca_cert_file_path, + ca_cert_dir_path); + } +} + +inline void Client::set_ca_cert_store(X509_STORE *ca_cert_store) { + if (is_ssl_) { + static_cast(*cli_).set_ca_cert_store(ca_cert_store); + } +} + +inline long Client::get_openssl_verify_result() const { + if (is_ssl_) { + return static_cast(*cli_).get_openssl_verify_result(); + } + return -1; // NOTE: -1 doesn't match any of X509_V_ERR_??? +} + +inline SSL_CTX *Client::ssl_context() const { + if (is_ssl_) { return static_cast(*cli_).ssl_context(); } + return nullptr; +} +#endif + // ---------------------------------------------------------------------------- } // namespace httplib diff --git a/sop-sdk/sdk-c++/common/tool.cpp b/sop-sdk/sdk-c++/common/tool.cpp index 96f5dc22..6b56a680 100644 --- a/sop-sdk/sdk-c++/common/tool.cpp +++ b/sop-sdk/sdk-c++/common/tool.cpp @@ -1,5 +1,5 @@ -#include #include "tool.h" +#include "json/json.h" #include #include #include @@ -21,49 +21,6 @@ namespace tool { return tmp; } - int parse_url(char *url, char **serverstrp, int *portp, char **pathstrp) { - char buf[256]; - int serverlen, numread = 0; - /* go through the url */ - - /* reset url to point PAST the http:// */ - - /* assume it's always 7 chars! */ - string _url = url; - bool isHttps = startWith(_url, "https"); - int len = 7; - if (isHttps) { - len = 8; - } - url = url + len; - /* no http:// now... server is simply up to the next / or : */ - - sscanf(url, "%255[^/:]", buf); - serverlen = strlen(buf); - *serverstrp = (char *) malloc(serverlen + 1); - strcpy(*serverstrp, buf); - if (url[serverlen] == ':') { - /* get the port */ - - sscanf(&url[serverlen + 1], "%d%n", portp, &numread); - /* add one to go PAST it */ - - numread++; - - } else { - if (isHttps) { - *portp = 443; - } else { - *portp = 80; - } - - } - /* the path is a pointer into the rest of url */ - - *pathstrp = &url[serverlen + numread]; - return 0; - } - std::string url_encode(const std::string &str) { std::string strTemp = ""; size_t length = str.length(); @@ -75,7 +32,7 @@ namespace tool { (str[i] == '~')) strTemp += str[i]; else if (str[i] == ' ') - strTemp += "+"; + strTemp += "%20"; else { strTemp += '%'; strTemp += ToHex((unsigned char) str[i] >> 4); @@ -117,13 +74,12 @@ namespace tool { } string mapToJson(std::map map_info) { -// Json::Value jObject; -// for (map::const_iterator iter = map_info.begin( ); iter != map_info.end( ); ++iter) -// { -// jObject[iter->first] = iter->second; -// } -// return jObject.toStyledString(); - return "{}"; + Json::Value jObject; + for (map::const_iterator iter = map_info.begin( ); iter != map_info.end( ); ++iter) + { + jObject[iter->first] = iter->second; + } + return jObject.toStyledString(); } string getFilename(string filepath) { diff --git a/sop-sdk/sdk-c++/common/tool.h b/sop-sdk/sdk-c++/common/tool.h index 1560d496..96cc49b7 100644 --- a/sop-sdk/sdk-c++/common/tool.h +++ b/sop-sdk/sdk-c++/common/tool.h @@ -16,8 +16,6 @@ namespace tool { string getTime(); - int parse_url(char *url, char **serverstrp, int *portp, char **pathstrp); - std::string url_encode(const std::string &szToEncode); std::string url_decode(const std::string &SRC); diff --git a/sop-sdk/sdk-c++/main.cpp b/sop-sdk/sdk-c++/main.cpp index 7ff6e706..6f21b488 100644 --- a/sop-sdk/sdk-c++/main.cpp +++ b/sop-sdk/sdk-c++/main.cpp @@ -5,11 +5,11 @@ #include "request/MemberInfoGetRequest.hpp" // 应用ID -string appId = "2020051325943082302177280"; +string appId = "201904035630907729292cpp"; // 存放私钥的文件路径 -string privateKeyFile = "/Users/thc/IdeaProjects/opc/opc-sdk/sdk-c++/privateEx.pem"; +string privateKeyFile = "/Users/thc/IdeaProjects/SOP/sop-sdk/sdk-c++/privateEx.pem"; // 请求接口 -string url = "http://localhost:7071/prod/gw68uy85"; +string url = "http://localhost:8081"; OpenClient openClient(appId, privateKeyFile, url); @@ -32,10 +32,11 @@ int main() { // }); // 发送请求 - neb::CJsonObject jsonObj = openClient.execute(&request); - std::cout << jsonObj.ToString() << std::endl; - std::cout << "id:" << jsonObj["id"].ToString() << std::endl; - std::cout << "is_vip:" << jsonObj["member_info"]["is_vip"].ToString() << std::endl; + Json::Value jsonObj = openClient.execute(&request); + std::cout << jsonObj << std::endl; + std::cout << "id:" << jsonObj["id"].asString() << std::endl; + std::cout << "name:" << jsonObj["name"].asString() << std::endl; + std::cout << "is_vip:" << jsonObj["member_info"]["is_vip"].asString() << std::endl; return 0; } diff --git a/sop-sdk/sdk-c++/readme.md b/sop-sdk/sdk-c++/readme.md index 70bf3430..fffcf701 100644 --- a/sop-sdk/sdk-c++/readme.md +++ b/sop-sdk/sdk-c++/readme.md @@ -1,3 +1,5 @@ # SDK for C++ +本工程使用`CLion`进行开发，前提安装jsoncpp（Mac安装方式：`brew install jsoncpp`） + 使用方式见：main.cpp \ No newline at end of file diff --git a/sop-sdk/sdk-c++/thirdparty/CJsonObject/CJsonObject.cpp b/sop-sdk/sdk-c++/thirdparty/CJsonObject/CJsonObject.cpp deleted file mode 100644 index c43cce9a..00000000 --- a/sop-sdk/sdk-c++/thirdparty/CJsonObject/CJsonObject.cpp +++ /dev/null @@ -1,3523 +0,0 @@ -/******************************************************************************* - * Project: neb - * @file CJsonObject.cpp - * @brief - * @author bwarliao - * @date: 2014-7-16 - * @note - * Modify history: - ******************************************************************************/ - -#include "CJsonObject.hpp" - -#ifdef _WIN32 -#define snprintf _snprintf_s -#endif - -namespace neb -{ - -CJsonObject::CJsonObject() - : m_pJsonData(NULL), m_pExternJsonDataRef(NULL), m_pKeyTravers(NULL) -{ - // m_pJsonData = cJSON_CreateObject(); -} - -CJsonObject::CJsonObject(const std::string& strJson) - : m_pJsonData(NULL), m_pExternJsonDataRef(NULL), m_pKeyTravers(NULL) -{ - Parse(strJson); -} - -CJsonObject::CJsonObject(const CJsonObject* pJsonObject) - : m_pJsonData(NULL), m_pExternJsonDataRef(NULL), m_pKeyTravers(NULL) -{ - if (pJsonObject) - { - Parse(pJsonObject->ToString()); - } -} - -CJsonObject::CJsonObject(const CJsonObject& oJsonObject) - : m_pJsonData(NULL), m_pExternJsonDataRef(NULL), m_pKeyTravers(NULL) -{ - Parse(oJsonObject.ToString()); -} - -CJsonObject::~CJsonObject() -{ - Clear(); -} - -CJsonObject& CJsonObject::operator=(const CJsonObject& oJsonObject) -{ - Parse(oJsonObject.ToString().c_str()); - return(*this); -} - -bool CJsonObject::operator==(const CJsonObject& oJsonObject) const -{ - return(this->ToString() == oJsonObject.ToString()); -} - -bool CJsonObject::AddEmptySubObject(const std::string& strKey) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateObject(); - if (pJsonStruct == NULL) - { - m_strErrMsg = std::string("create sub empty object error!"); - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::AddEmptySubArray(const std::string& strKey) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateArray(); - if (pJsonStruct == NULL) - { - m_strErrMsg = std::string("create sub empty array error!"); - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::GetKey(std::string& strKey) -{ - if (IsArray()) - { - return(false); - } - if (m_pKeyTravers == NULL) - { - if (m_pJsonData != NULL) - { - m_pKeyTravers = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - m_pKeyTravers = m_pExternJsonDataRef; - } - return(false); - } - else if (m_pKeyTravers == m_pJsonData || m_pKeyTravers == m_pExternJsonDataRef) - { - cJSON *c = m_pKeyTravers->child; - if (c) - { - strKey = c->string; - m_pKeyTravers = c->next; - return(true); - } - else - { - return(false); - } - } - else - { - strKey = m_pKeyTravers->string; - m_pKeyTravers = m_pKeyTravers->next; - return(true); - } -} - -void CJsonObject::ResetTraversing() -{ - if (m_pJsonData != NULL) - { - m_pKeyTravers = m_pJsonData; - } - else - { - m_pKeyTravers = m_pExternJsonDataRef; - } -} - -CJsonObject& CJsonObject::operator[](const std::string& strKey) -{ - std::map::iterator iter; - iter = m_mapJsonObjectRef.find(strKey); - if (iter == m_mapJsonObjectRef.end()) - { - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if (m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - CJsonObject* pJsonObject = new CJsonObject(); - m_mapJsonObjectRef.insert(std::pair(strKey, pJsonObject)); - return(*pJsonObject); - } - else - { - CJsonObject* pJsonObject = new CJsonObject(pJsonStruct); - m_mapJsonObjectRef.insert(std::pair(strKey, pJsonObject)); - return(*pJsonObject); - } - } - else - { - return(*(iter->second)); - } -} - -CJsonObject& CJsonObject::operator[](unsigned int uiWhich) -{ - std::map::iterator iter; - iter = m_mapJsonArrayRef.find(uiWhich); - if (iter == m_mapJsonArrayRef.end()) - { - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, uiWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if (m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, uiWhich); - } - } - if (pJsonStruct == NULL) - { - CJsonObject* pJsonObject = new CJsonObject(); - m_mapJsonArrayRef.insert(std::pair(uiWhich, pJsonObject)); - return(*pJsonObject); - } - else - { - CJsonObject* pJsonObject = new CJsonObject(pJsonStruct); - m_mapJsonArrayRef.insert(std::pair(uiWhich, pJsonObject)); - return(*pJsonObject); - } - } - else - { - return(*(iter->second)); - } -} - -std::string CJsonObject::operator()(const std::string& strKey) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - return(std::string("")); - } - if (pJsonStruct->type == cJSON_String) - { - return(pJsonStruct->valuestring); - } - else if (pJsonStruct->type == cJSON_Int) - { - char szNumber[128] = {0}; - if (pJsonStruct->sign == -1) - { - if (pJsonStruct->valueint <= (int64)INT_MAX && (int64)pJsonStruct->valueint >= (int64)INT_MIN) - { - snprintf(szNumber, sizeof(szNumber), "%d", (int32)pJsonStruct->valueint); - } - else - { - snprintf(szNumber, sizeof(szNumber), "%lld", (int64)pJsonStruct->valueint); - } - } - else - { - if ((uint64)pJsonStruct->valueint <= (uint64)UINT_MAX) - { - snprintf(szNumber, sizeof(szNumber), "%u", (uint32)pJsonStruct->valueint); - } - else - { - snprintf(szNumber, sizeof(szNumber), "%llu", pJsonStruct->valueint); - } - } - return(std::string(szNumber)); - } - else if (pJsonStruct->type == cJSON_Double) - { - char szNumber[128] = {0}; - if (fabs(pJsonStruct->valuedouble) < 1.0e-6 || fabs(pJsonStruct->valuedouble) > 1.0e9) - { - snprintf(szNumber, sizeof(szNumber), "%e", pJsonStruct->valuedouble); - } - else - { - snprintf(szNumber, sizeof(szNumber), "%f", pJsonStruct->valuedouble); - } - } - else if (pJsonStruct->type == cJSON_False) - { - return(std::string("false")); - } - else if (pJsonStruct->type == cJSON_True) - { - return(std::string("true")); - } - return(std::string("")); -} - -std::string CJsonObject::operator()(unsigned int uiWhich) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, uiWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, uiWhich); - } - } - if (pJsonStruct == NULL) - { - return(std::string("")); - } - if (pJsonStruct->type == cJSON_String) - { - return(pJsonStruct->valuestring); - } - else if (pJsonStruct->type == cJSON_Int) - { - char szNumber[128] = {0}; - if (pJsonStruct->sign == -1) - { - if (pJsonStruct->valueint <= (int64)INT_MAX && (int64)pJsonStruct->valueint >= (int64)INT_MIN) - { - snprintf(szNumber, sizeof(szNumber), "%d", (int32)pJsonStruct->valueint); - } - else - { - snprintf(szNumber, sizeof(szNumber), "%lld", (int64)pJsonStruct->valueint); - } - } - else - { - if ((uint64)pJsonStruct->valueint <= (uint64)UINT_MAX) - { - snprintf(szNumber, sizeof(szNumber), "%u", (uint32)pJsonStruct->valueint); - } - else - { - snprintf(szNumber, sizeof(szNumber), "%llu", pJsonStruct->valueint); - } - } - return(std::string(szNumber)); - } - else if (pJsonStruct->type == cJSON_Double) - { - char szNumber[128] = {0}; - if (fabs(pJsonStruct->valuedouble) < 1.0e-6 || fabs(pJsonStruct->valuedouble) > 1.0e9) - { - snprintf(szNumber, sizeof(szNumber), "%e", pJsonStruct->valuedouble); - } - else - { - snprintf(szNumber, sizeof(szNumber), "%f", pJsonStruct->valuedouble); - } - } - else if (pJsonStruct->type == cJSON_False) - { - return(std::string("false")); - } - else if (pJsonStruct->type == cJSON_True) - { - return(std::string("true")); - } - return(std::string("")); -} - -bool CJsonObject::Parse(const std::string& strJson) -{ - Clear(); - m_pJsonData = cJSON_Parse(strJson.c_str()); - m_pKeyTravers = m_pJsonData; - if (m_pJsonData == NULL) - { - m_strErrMsg = std::string("prase json string error at ") + cJSON_GetErrorPtr(); - return(false); - } - return(true); -} - -void CJsonObject::Clear() -{ - m_pExternJsonDataRef = NULL; - m_pKeyTravers = NULL; - if (m_pJsonData != NULL) - { - cJSON_Delete(m_pJsonData); - m_pJsonData = NULL; - } - for (std::map::iterator iter = m_mapJsonArrayRef.begin(); - iter != m_mapJsonArrayRef.end(); ++iter) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - } - m_mapJsonArrayRef.clear(); - for (std::map::iterator iter = m_mapJsonObjectRef.begin(); - iter != m_mapJsonObjectRef.end(); ++iter) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - } - m_mapJsonObjectRef.clear(); -} - -bool CJsonObject::IsEmpty() const -{ - if (m_pJsonData != NULL) - { - return(false); - } - else if (m_pExternJsonDataRef != NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::IsArray() const -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - - if (pFocusData == NULL) - { - return(false); - } - - if (pFocusData->type == cJSON_Array) - { - return(true); - } - else - { - return(false); - } -} - -std::string CJsonObject::ToString() const -{ - char* pJsonString = NULL; - std::string strJsonData = ""; - if (m_pJsonData != NULL) - { - pJsonString = cJSON_PrintUnformatted(m_pJsonData); - } - else if (m_pExternJsonDataRef != NULL) - { - pJsonString = cJSON_PrintUnformatted(m_pExternJsonDataRef); - } - if (pJsonString != NULL) - { - strJsonData = pJsonString; - free(pJsonString); - } - return(strJsonData); -} - -std::string CJsonObject::ToFormattedString() const -{ - char* pJsonString = NULL; - std::string strJsonData = ""; - if (m_pJsonData != NULL) - { - pJsonString = cJSON_Print(m_pJsonData); - } - else if (m_pExternJsonDataRef != NULL) - { - pJsonString = cJSON_Print(m_pExternJsonDataRef); - } - if (pJsonString != NULL) - { - strJsonData = pJsonString; - free(pJsonString); - } - return(strJsonData); -} - - -bool CJsonObject::Get(const std::string& strKey, CJsonObject& oJsonObject) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - char* pJsonString = cJSON_Print(pJsonStruct); - std::string strJsonData = pJsonString; - free(pJsonString); - if (oJsonObject.Parse(strJsonData)) - { - return(true); - } - else - { - return(false); - } -} - -bool CJsonObject::Get(const std::string& strKey, std::string& strValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type != cJSON_String) - { - return(false); - } - strValue = pJsonStruct->valuestring; - return(true); -} - -bool CJsonObject::Get(const std::string& strKey, int32& iValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Int) - { - iValue = (int32)(pJsonStruct->valueint); - return(true); - } - else if (pJsonStruct->type == cJSON_Double) - { - iValue = (int32)(pJsonStruct->valuedouble); - return(true); - } - return(false); -} - -bool CJsonObject::Get(const std::string& strKey, uint32& uiValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Int) - { - uiValue = (uint32)(pJsonStruct->valueint); - return(true); - } - else if (pJsonStruct->type == cJSON_Double) - { - uiValue = (uint32)(pJsonStruct->valuedouble); - return(true); - } - return(false); -} - -bool CJsonObject::Get(const std::string& strKey, int64& llValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Int) - { - llValue = (int64)(pJsonStruct->valueint); - return(true); - } - else if (pJsonStruct->type == cJSON_Double) - { - llValue = (int64)(pJsonStruct->valuedouble); - return(true); - } - return(false); -} - -bool CJsonObject::Get(const std::string& strKey, uint64& ullValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Int) - { - ullValue = (uint64)(pJsonStruct->valueint); - return(true); - } - else if (pJsonStruct->type == cJSON_Double) - { - ullValue = (uint64)(pJsonStruct->valuedouble); - return(true); - } - return(false); -} - -bool CJsonObject::Get(const std::string& strKey, bool& bValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type > cJSON_True) - { - return(false); - } - bValue = pJsonStruct->type; - return(true); -} - -bool CJsonObject::Get(const std::string& strKey, float& fValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Double || pJsonStruct->type == cJSON_Int) - { - fValue = (float)(pJsonStruct->valuedouble); - return(true); - } - return(false); -} - -bool CJsonObject::Get(const std::string& strKey, double& dValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Double || pJsonStruct->type == cJSON_Int) - { - dValue = pJsonStruct->valuedouble; - return(true); - } - return(false); -} - -bool CJsonObject::IsNull(const std::string& strKey) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pJsonData, strKey.c_str()); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Object) - { - pJsonStruct = cJSON_GetObjectItem(m_pExternJsonDataRef, strKey.c_str()); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type != cJSON_NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Add(const std::string& strKey, const CJsonObject& oJsonObject) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_Parse(oJsonObject.ToString().c_str()); - if (pJsonStruct == NULL) - { - m_strErrMsg = std::string("prase json string error at ") + cJSON_GetErrorPtr(); - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::Add(const std::string& strKey, const std::string& strValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateString(strValue.c_str()); - if (pJsonStruct == NULL) - { - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::Add(const std::string& strKey, int32 iValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)iValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::Add(const std::string& strKey, uint32 uiValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)uiValue, 1); - if (pJsonStruct == NULL) - { - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::Add(const std::string& strKey, int64 llValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)llValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::Add(const std::string& strKey, uint64 ullValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt(ullValue, 1); - if (pJsonStruct == NULL) - { - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::Add(const std::string& strKey, bool bValue, bool bValueAgain) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateBool(bValue); - if (pJsonStruct == NULL) - { - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::Add(const std::string& strKey, float fValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateDouble((double)fValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::Add(const std::string& strKey, double dValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateDouble((double)dValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::AddNull(const std::string& strKey) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateObject(); - m_pKeyTravers = m_pJsonData; - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) != NULL) - { - m_strErrMsg = "key exists!"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateNull(); - if (pJsonStruct == NULL) - { - return(false); - } - cJSON_AddItemToObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::Delete(const std::string& strKey) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - cJSON_DeleteItemFromObject(pFocusData, strKey.c_str()); - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - m_pKeyTravers = pFocusData; - return(true); -} - -bool CJsonObject::Replace(const std::string& strKey, const CJsonObject& oJsonObject) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - cJSON* pJsonStruct = cJSON_Parse(oJsonObject.ToString().c_str()); - if (pJsonStruct == NULL) - { - m_strErrMsg = std::string("prase json string error at ") + cJSON_GetErrorPtr(); - return(false); - } - cJSON_ReplaceItemInObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - return(true); -} - -bool CJsonObject::Replace(const std::string& strKey, const std::string& strValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateString(strValue.c_str()); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - cJSON_ReplaceItemInObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(const std::string& strKey, int32 iValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)iValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - cJSON_ReplaceItemInObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(const std::string& strKey, uint32 uiValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)uiValue, 1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - cJSON_ReplaceItemInObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(const std::string& strKey, int64 llValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)llValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - cJSON_ReplaceItemInObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(const std::string& strKey, uint64 ullValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)ullValue, 1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - cJSON_ReplaceItemInObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(const std::string& strKey, bool bValue, bool bValueAgain) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateBool(bValue); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - cJSON_ReplaceItemInObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(const std::string& strKey, float fValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateDouble((double)fValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - cJSON_ReplaceItemInObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(const std::string& strKey, double dValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateDouble((double)dValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - cJSON_ReplaceItemInObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::ReplaceWithNull(const std::string& strKey) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Object) - { - m_strErrMsg = "not a json object! json array?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateNull(); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonObjectRef.find(strKey); - if (iter != m_mapJsonObjectRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonObjectRef.erase(iter); - } - cJSON_ReplaceItemInObject(pFocusData, strKey.c_str(), pJsonStruct); - if (cJSON_GetObjectItem(pFocusData, strKey.c_str()) == NULL) - { - return(false); - } - return(true); -} - -int CJsonObject::GetArraySize() -{ - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - return(cJSON_GetArraySize(m_pJsonData)); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - return(cJSON_GetArraySize(m_pExternJsonDataRef)); - } - } - return(0); -} - -bool CJsonObject::Get(int iWhich, CJsonObject& oJsonObject) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, iWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, iWhich); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - char* pJsonString = cJSON_Print(pJsonStruct); - std::string strJsonData = pJsonString; - free(pJsonString); - if (oJsonObject.Parse(strJsonData)) - { - return(true); - } - else - { - return(false); - } -} - -bool CJsonObject::Get(int iWhich, std::string& strValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, iWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, iWhich); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type != cJSON_String) - { - return(false); - } - strValue = pJsonStruct->valuestring; - return(true); -} - -bool CJsonObject::Get(int iWhich, int32& iValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, iWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, iWhich); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Int) - { - iValue = (int32)(pJsonStruct->valueint); - return(true); - } - else if (pJsonStruct->type == cJSON_Double) - { - iValue = (int32)(pJsonStruct->valuedouble); - return(true); - } - return(false); -} - -bool CJsonObject::Get(int iWhich, uint32& uiValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, iWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, iWhich); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Int) - { - uiValue = (uint32)(pJsonStruct->valueint); - return(true); - } - else if (pJsonStruct->type == cJSON_Double) - { - uiValue = (uint32)(pJsonStruct->valuedouble); - return(true); - } - return(false); -} - -bool CJsonObject::Get(int iWhich, int64& llValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, iWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, iWhich); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Int) - { - llValue = (int64)(pJsonStruct->valueint); - return(true); - } - else if (pJsonStruct->type == cJSON_Double) - { - llValue = (int64)(pJsonStruct->valuedouble); - return(true); - } - return(false); -} - -bool CJsonObject::Get(int iWhich, uint64& ullValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, iWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, iWhich); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Int) - { - ullValue = (uint64)(pJsonStruct->valueint); - return(true); - } - else if (pJsonStruct->type == cJSON_Double) - { - ullValue = (uint64)(pJsonStruct->valuedouble); - return(true); - } - return(false); -} - -bool CJsonObject::Get(int iWhich, bool& bValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, iWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, iWhich); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type > cJSON_True) - { - return(false); - } - bValue = pJsonStruct->type; - return(true); -} - -bool CJsonObject::Get(int iWhich, float& fValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, iWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, iWhich); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Double || pJsonStruct->type == cJSON_Int) - { - fValue = (float)(pJsonStruct->valuedouble); - return(true); - } - return(false); -} - -bool CJsonObject::Get(int iWhich, double& dValue) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, iWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, iWhich); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type == cJSON_Double || pJsonStruct->type == cJSON_Int) - { - dValue = pJsonStruct->valuedouble; - return(true); - } - return(false); -} - -bool CJsonObject::IsNull(int iWhich) const -{ - cJSON* pJsonStruct = NULL; - if (m_pJsonData != NULL) - { - if (m_pJsonData->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pJsonData, iWhich); - } - } - else if (m_pExternJsonDataRef != NULL) - { - if(m_pExternJsonDataRef->type == cJSON_Array) - { - pJsonStruct = cJSON_GetArrayItem(m_pExternJsonDataRef, iWhich); - } - } - if (pJsonStruct == NULL) - { - return(false); - } - if (pJsonStruct->type != cJSON_NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Add(const CJsonObject& oJsonObject) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_Parse(oJsonObject.ToString().c_str()); - if (pJsonStruct == NULL) - { - m_strErrMsg = std::string("prase json string error at ") + cJSON_GetErrorPtr(); - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArray(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - unsigned int uiLastIndex = (unsigned int)cJSON_GetArraySize(pFocusData) - 1; - for (std::map::iterator iter = m_mapJsonArrayRef.begin(); - iter != m_mapJsonArrayRef.end(); ) - { - if (iter->first >= uiLastIndex) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter++); - } - else - { - iter++; - } - } - return(true); -} - -bool CJsonObject::Add(const std::string& strValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateString(strValue.c_str()); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArray(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::Add(int32 iValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)iValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArray(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::Add(uint32 uiValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)uiValue, 1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArray(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::Add(int64 llValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)llValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArray(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::Add(uint64 ullValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)ullValue, 1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArray(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::Add(int iAnywhere, bool bValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateBool(bValue); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArray(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::Add(float fValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateDouble((double)fValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArray(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::Add(double dValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateDouble((double)dValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArray(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::AddNull() -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateNull(); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArray(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::AddAsFirst(const CJsonObject& oJsonObject) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_Parse(oJsonObject.ToString().c_str()); - if (pJsonStruct == NULL) - { - m_strErrMsg = std::string("prase json string error at ") + cJSON_GetErrorPtr(); - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArrayHead(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - for (std::map::iterator iter = m_mapJsonArrayRef.begin(); - iter != m_mapJsonArrayRef.end(); ) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter++); - } - return(true); -} - -bool CJsonObject::AddAsFirst(const std::string& strValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateString(strValue.c_str()); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArrayHead(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::AddAsFirst(int32 iValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)iValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArrayHead(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::AddAsFirst(uint32 uiValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)uiValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArrayHead(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::AddAsFirst(int64 llValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)llValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArrayHead(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::AddAsFirst(uint64 ullValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)ullValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArrayHead(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::AddAsFirst(int iAnywhere, bool bValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateBool(bValue); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArrayHead(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::AddAsFirst(float fValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateDouble((double)fValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArrayHead(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::AddAsFirst(double dValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateDouble((double)dValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArrayHead(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::AddNullAsFirst() -{ - cJSON* pFocusData = NULL; - if (m_pJsonData != NULL) - { - pFocusData = m_pJsonData; - } - else if (m_pExternJsonDataRef != NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - m_pJsonData = cJSON_CreateArray(); - pFocusData = m_pJsonData; - } - - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateNull(); - if (pJsonStruct == NULL) - { - return(false); - } - int iArraySizeBeforeAdd = cJSON_GetArraySize(pFocusData); - cJSON_AddItemToArrayHead(pFocusData, pJsonStruct); - int iArraySizeAfterAdd = cJSON_GetArraySize(pFocusData); - if (iArraySizeAfterAdd == iArraySizeBeforeAdd) - { - return(false); - } - return(true); -} - -bool CJsonObject::Delete(int iWhich) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON_DeleteItemFromArray(pFocusData, iWhich); - for (std::map::iterator iter = m_mapJsonArrayRef.begin(); - iter != m_mapJsonArrayRef.end(); ) - { - if (iter->first >= (unsigned int)iWhich) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter++); - } - else - { - iter++; - } - } - return(true); -} - -bool CJsonObject::Replace(int iWhich, const CJsonObject& oJsonObject) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_Parse(oJsonObject.ToString().c_str()); - if (pJsonStruct == NULL) - { - m_strErrMsg = std::string("prase json string error at ") + cJSON_GetErrorPtr(); - return(false); - } - cJSON_ReplaceItemInArray(pFocusData, iWhich, pJsonStruct); - if (cJSON_GetArrayItem(pFocusData, iWhich) == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonArrayRef.find(iWhich); - if (iter != m_mapJsonArrayRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter); - } - return(true); -} - -bool CJsonObject::Replace(int iWhich, const std::string& strValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateString(strValue.c_str()); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonArrayRef.find(iWhich); - if (iter != m_mapJsonArrayRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter); - } - cJSON_ReplaceItemInArray(pFocusData, iWhich, pJsonStruct); - if (cJSON_GetArrayItem(pFocusData, iWhich) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(int iWhich, int32 iValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)iValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonArrayRef.find(iWhich); - if (iter != m_mapJsonArrayRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter); - } - cJSON_ReplaceItemInArray(pFocusData, iWhich, pJsonStruct); - if (cJSON_GetArrayItem(pFocusData, iWhich) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(int iWhich, uint32 uiValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)uiValue, 1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonArrayRef.find(iWhich); - if (iter != m_mapJsonArrayRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter); - } - cJSON_ReplaceItemInArray(pFocusData, iWhich, pJsonStruct); - if (cJSON_GetArrayItem(pFocusData, iWhich) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(int iWhich, int64 llValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)((uint64)llValue), -1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonArrayRef.find(iWhich); - if (iter != m_mapJsonArrayRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter); - } - cJSON_ReplaceItemInArray(pFocusData, iWhich, pJsonStruct); - if (cJSON_GetArrayItem(pFocusData, iWhich) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(int iWhich, uint64 ullValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateInt((uint64)ullValue, 1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonArrayRef.find(iWhich); - if (iter != m_mapJsonArrayRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter); - } - cJSON_ReplaceItemInArray(pFocusData, iWhich, pJsonStruct); - if (cJSON_GetArrayItem(pFocusData, iWhich) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(int iWhich, bool bValue, bool bValueAgain) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateBool(bValue); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonArrayRef.find(iWhich); - if (iter != m_mapJsonArrayRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter); - } - cJSON_ReplaceItemInArray(pFocusData, iWhich, pJsonStruct); - if (cJSON_GetArrayItem(pFocusData, iWhich) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(int iWhich, float fValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateDouble((double)fValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonArrayRef.find(iWhich); - if (iter != m_mapJsonArrayRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter); - } - cJSON_ReplaceItemInArray(pFocusData, iWhich, pJsonStruct); - if (cJSON_GetArrayItem(pFocusData, iWhich) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::Replace(int iWhich, double dValue) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateDouble((double)dValue, -1); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonArrayRef.find(iWhich); - if (iter != m_mapJsonArrayRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter); - } - cJSON_ReplaceItemInArray(pFocusData, iWhich, pJsonStruct); - if (cJSON_GetArrayItem(pFocusData, iWhich) == NULL) - { - return(false); - } - return(true); -} - -bool CJsonObject::ReplaceWithNull(int iWhich) -{ - cJSON* pFocusData = NULL; - if (m_pJsonData == NULL) - { - pFocusData = m_pExternJsonDataRef; - } - else - { - pFocusData = m_pJsonData; - } - if (pFocusData == NULL) - { - m_strErrMsg = "json data is null!"; - return(false); - } - if (pFocusData->type != cJSON_Array) - { - m_strErrMsg = "not a json array! json object?"; - return(false); - } - cJSON* pJsonStruct = cJSON_CreateNull(); - if (pJsonStruct == NULL) - { - return(false); - } - std::map::iterator iter = m_mapJsonArrayRef.find(iWhich); - if (iter != m_mapJsonArrayRef.end()) - { - if (iter->second != NULL) - { - delete (iter->second); - iter->second = NULL; - } - m_mapJsonArrayRef.erase(iter); - } - cJSON_ReplaceItemInArray(pFocusData, iWhich, pJsonStruct); - if (cJSON_GetArrayItem(pFocusData, iWhich) == NULL) - { - return(false); - } - return(true); -} - -CJsonObject::CJsonObject(cJSON* pJsonData) - : m_pJsonData(NULL), m_pExternJsonDataRef(pJsonData), m_pKeyTravers(pJsonData) -{ -} - -} - - diff --git a/sop-sdk/sdk-c++/thirdparty/CJsonObject/CJsonObject.hpp b/sop-sdk/sdk-c++/thirdparty/CJsonObject/CJsonObject.hpp deleted file mode 100644 index 05637e00..00000000 --- a/sop-sdk/sdk-c++/thirdparty/CJsonObject/CJsonObject.hpp +++ /dev/null @@ -1,156 +0,0 @@ -/******************************************************************************* - * Project: neb - * @file CJsonObject.hpp - * @brief Json - * @author bwarliao - * @date: 2014-7-16 - * @note - * Modify history: - ******************************************************************************/ - -#ifndef CJSONOBJECT_HPP_ -#define CJSONOBJECT_HPP_ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifdef __cplusplus -extern "C" { -#endif -#include "cJSON.h" -#ifdef __cplusplus -} -#endif - - -namespace neb -{ - -class CJsonObject -{ -public: // method of ordinary json object or json array - CJsonObject(); - CJsonObject(const std::string& strJson); - CJsonObject(const CJsonObject* pJsonObject); - CJsonObject(const CJsonObject& oJsonObject); - virtual ~CJsonObject(); - - CJsonObject& operator=(const CJsonObject& oJsonObject); - bool operator==(const CJsonObject& oJsonObject) const; - bool Parse(const std::string& strJson); - void Clear(); - bool IsEmpty() const; - bool IsArray() const; - std::string ToString() const; - std::string ToFormattedString() const; - const std::string& GetErrMsg() const - { - return(m_strErrMsg); - } - -public: // method of ordinary json object - bool AddEmptySubObject(const std::string& strKey); - bool AddEmptySubArray(const std::string& strKey); - bool GetKey(std::string& strKey); - void ResetTraversing(); - CJsonObject& operator[](const std::string& strKey); - std::string operator()(const std::string& strKey) const; - bool Get(const std::string& strKey, CJsonObject& oJsonObject) const; - bool Get(const std::string& strKey, std::string& strValue) const; - bool Get(const std::string& strKey, int32& iValue) const; - bool Get(const std::string& strKey, uint32& uiValue) const; - bool Get(const std::string& strKey, int64& llValue) const; - bool Get(const std::string& strKey, uint64& ullValue) const; - bool Get(const std::string& strKey, bool& bValue) const; - bool Get(const std::string& strKey, float& fValue) const; - bool Get(const std::string& strKey, double& dValue) const; - bool IsNull(const std::string& strKey) const; - bool Add(const std::string& strKey, const CJsonObject& oJsonObject); - bool Add(const std::string& strKey, const std::string& strValue); - bool Add(const std::string& strKey, int32 iValue); - bool Add(const std::string& strKey, uint32 uiValue); - bool Add(const std::string& strKey, int64 llValue); - bool Add(const std::string& strKey, uint64 ullValue); - bool Add(const std::string& strKey, bool bValue, bool bValueAgain); - bool Add(const std::string& strKey, float fValue); - bool Add(const std::string& strKey, double dValue); - bool AddNull(const std::string& strKey); // add null like this: "key":null - bool Delete(const std::string& strKey); - bool Replace(const std::string& strKey, const CJsonObject& oJsonObject); - bool Replace(const std::string& strKey, const std::string& strValue); - bool Replace(const std::string& strKey, int32 iValue); - bool Replace(const std::string& strKey, uint32 uiValue); - bool Replace(const std::string& strKey, int64 llValue); - bool Replace(const std::string& strKey, uint64 ullValue); - bool Replace(const std::string& strKey, bool bValue, bool bValueAgain); - bool Replace(const std::string& strKey, float fValue); - bool Replace(const std::string& strKey, double dValue); - bool ReplaceWithNull(const std::string& strKey); // replace value with null - -public: // method of json array - int GetArraySize(); - CJsonObject& operator[](unsigned int uiWhich); - std::string operator()(unsigned int uiWhich) const; - bool Get(int iWhich, CJsonObject& oJsonObject) const; - bool Get(int iWhich, std::string& strValue) const; - bool Get(int iWhich, int32& iValue) const; - bool Get(int iWhich, uint32& uiValue) const; - bool Get(int iWhich, int64& llValue) const; - bool Get(int iWhich, uint64& ullValue) const; - bool Get(int iWhich, bool& bValue) const; - bool Get(int iWhich, float& fValue) const; - bool Get(int iWhich, double& dValue) const; - bool IsNull(int iWhich) const; - bool Add(const CJsonObject& oJsonObject); - bool Add(const std::string& strValue); - bool Add(int32 iValue); - bool Add(uint32 uiValue); - bool Add(int64 llValue); - bool Add(uint64 ullValue); - bool Add(int iAnywhere, bool bValue); - bool Add(float fValue); - bool Add(double dValue); - bool AddNull(); // add a null value - bool AddAsFirst(const CJsonObject& oJsonObject); - bool AddAsFirst(const std::string& strValue); - bool AddAsFirst(int32 iValue); - bool AddAsFirst(uint32 uiValue); - bool AddAsFirst(int64 llValue); - bool AddAsFirst(uint64 ullValue); - bool AddAsFirst(int iAnywhere, bool bValue); - bool AddAsFirst(float fValue); - bool AddAsFirst(double dValue); - bool AddNullAsFirst(); // add a null value - bool Delete(int iWhich); - bool Replace(int iWhich, const CJsonObject& oJsonObject); - bool Replace(int iWhich, const std::string& strValue); - bool Replace(int iWhich, int32 iValue); - bool Replace(int iWhich, uint32 uiValue); - bool Replace(int iWhich, int64 llValue); - bool Replace(int iWhich, uint64 ullValue); - bool Replace(int iWhich, bool bValue, bool bValueAgain); - bool Replace(int iWhich, float fValue); - bool Replace(int iWhich, double dValue); - bool ReplaceWithNull(int iWhich); // replace with a null value - -private: - CJsonObject(cJSON* pJsonData); - -private: - cJSON* m_pJsonData; - cJSON* m_pExternJsonDataRef; - cJSON* m_pKeyTravers; - std::string m_strErrMsg; - std::map m_mapJsonArrayRef; - std::map m_mapJsonObjectRef; -}; - -} - -#endif /* CJSONHELPER_HPP_ */ diff --git a/sop-sdk/sdk-c++/thirdparty/CJsonObject/cJSON.c b/sop-sdk/sdk-c++/thirdparty/CJsonObject/cJSON.c deleted file mode 100644 index daaac3fd..00000000 --- a/sop-sdk/sdk-c++/thirdparty/CJsonObject/cJSON.c +++ /dev/null @@ -1,1091 +0,0 @@ -/* - Copyright (c) 2009 Dave Gamble - - 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. - */ - -/* cJSON */ -/* JSON parser in C. */ - -#include -#include -#include -#include -#include -#include -#include -#include "cJSON.h" - -#ifndef INT_MAX -#define INT_MAX 2147483647 -#define INT_MIN (-INT_MAX - 1) -#define UINT_MAX 4294967295U -#endif - -static const char *ep; - -const char *cJSON_GetErrorPtr() -{ - return ep; -} - -static int cJSON_strcasecmp(const char *s1, const char *s2) -{ - if (!s1) - return (s1 == s2) ? 0 : 1; - if (!s2) - return 1; - for (; tolower(*s1) == tolower(*s2); ++s1, ++s2) - if (*s1 == 0) - return 0; - return tolower(*(const unsigned char *)s1) - - tolower(*(const unsigned char *)s2); -} - -static void *(*cJSON_malloc)(size_t sz) = malloc; -static void (*cJSON_free)(void *ptr) = free; - -static char* cJSON_strdup(const char* str) -{ - size_t len; - char* copy; - - len = strlen(str) + 1; - if (!(copy = (char*) cJSON_malloc(len))) - return 0; - memcpy(copy, str, len); - return copy; -} - -void cJSON_InitHooks(cJSON_Hooks* hooks) -{ - if (!hooks) - { /* Reset hooks */ - cJSON_malloc = malloc; - cJSON_free = free; - return; - } - - cJSON_malloc = (hooks->malloc_fn) ? hooks->malloc_fn : malloc; - cJSON_free = (hooks->free_fn) ? hooks->free_fn : free; -} - -/* Internal constructor. */ -static cJSON *cJSON_New_Item() -{ - cJSON* node = (cJSON*) cJSON_malloc(sizeof(cJSON)); - if (node) - memset(node, 0, sizeof(cJSON)); - return node; -} - -/* Delete a cJSON structure. */ -void cJSON_Delete(cJSON *c) -{ - cJSON *next; - while (c) - { - next = c->next; - if (!(c->type & cJSON_IsReference) && c->child) - cJSON_Delete(c->child); - if (!(c->type & cJSON_IsReference) && c->valuestring) - cJSON_free(c->valuestring); - if (c->string) - cJSON_free(c->string); - cJSON_free(c); - c = next; - } -} - -/* Parse the input text to generate a number, and populate the result into item. */ -static const char *parse_number(cJSON *item, const char *num) -{ - long double n = 0, scale = 0; - int subscale = 0, signsubscale = 1; - item->sign = 1; - - /* Could use sscanf for this? */ - if (*num == '-') - item->sign = -1, num++; /* Has sign? */ - if (*num == '0') - num++; /* is zero */ - if (*num >= '1' && *num <= '9') - do - n = (n * 10.0) + (*num++ - '0'); - while (*num >= '0' && *num <= '9'); /* Number? */ - if (*num == '.' && num[1] >= '0' && num[1] <= '9') - { - num++; - do - n = (n * 10.0) + (*num++ - '0'), scale--; - while (*num >= '0' && *num <= '9'); - } /* Fractional part? */ - if (*num == 'e' || *num == 'E') /* Exponent? */ - { - num++; - if (*num == '+') - num++; - else if (*num == '-') - signsubscale = -1, num++; /* With sign? */ - while (*num >= '0' && *num <= '9') - subscale = (subscale * 10) + (*num++ - '0'); /* Number? */ - } - - if (scale == 0 && subscale == 0) - { - item->valuedouble = (double)(item->sign * n); - item->valueint = item->sign * (int64)n; - item->type = cJSON_Int; - } - else - { - n = item->sign * n * pow(10.0, (scale + subscale * signsubscale)); /* number = +/- number.fraction * 10^+/- exponent */ - item->valuedouble = (double)n; - item->valueint = (int64)n; - item->type = cJSON_Double; - } - return num; -} - -/* Render the number nicely from the given item into a string. */ -static char *print_double(cJSON *item) -{ - char *str; - double d = item->valuedouble; - str = (char*) cJSON_malloc(64); /* This is a nice tradeoff. */ - if (str) - { - if (fabs(d) < 1.0e-6 || fabs(d) > 1.0e9) - sprintf(str, "%lf", d); - else - sprintf(str, "%f", d); - } - return str; -} - -static char *print_int(cJSON *item) -{ - char *str; - str = (char*) cJSON_malloc(22); /* 2^64+1 can be represented in 21 chars. */ - if (str) - { - if (item->sign == -1) - { - if ((int64)item->valueint <= (int64)INT_MAX && (int64)item->valueint >= (int64)INT_MIN) - { - sprintf(str, "%d", (int32)item->valueint); - } - else - { - sprintf(str, "%lld", (int64)item->valueint); - } - } - else - { - if (item->valueint <= (uint64)UINT_MAX) - { - sprintf(str, "%u", (uint32)item->valueint); - } - else - { - sprintf(str, "%llu", item->valueint); - } - } - } - return str; -} - -/* Parse the input text into an unescaped cstring, and populate item. */ -static const unsigned char firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, - 0xF8, 0xFC }; -static const char *parse_string(cJSON *item, const char *str) -{ - const char *ptr = str + 1; - char *ptr2; - char *out; - int len = 0; - unsigned uc, uc2; - if (*str != '\"') - { - ep = str; - return 0; - } /* not a string! */ - - while (*ptr != '\"' && *ptr && ++len) - if (*ptr++ == '\\') - ptr++; /* Skip escaped quotes. */ - - out = (char*) cJSON_malloc(len + 1); /* This is how long we need for the string, roughly. */ - if (!out) - return 0; - - ptr = str + 1; - ptr2 = out; - while (*ptr != '\"' && *ptr) - { - if (*ptr != '\\') - *ptr2++ = *ptr++; - else - { - ptr++; - switch (*ptr) - { - case 'b': - *ptr2++ = '\b'; - break; - case 'f': - *ptr2++ = '\f'; - break; - case 'n': - *ptr2++ = '\n'; - break; - case 'r': - *ptr2++ = '\r'; - break; - case 't': - *ptr2++ = '\t'; - break; - case 'u': /* transcode utf16 to utf8. */ - sscanf(ptr + 1, "%4x", &uc); - ptr += 4; /* get the unicode char. */ - - if ((uc >= 0xDC00 && uc <= 0xDFFF) || uc == 0) - break; // check for invalid. - - if (uc >= 0xD800 && uc <= 0xDBFF) // UTF16 surrogate pairs. - { - if (ptr[1] != '\\' || ptr[2] != 'u') - break; // missing second-half of surrogate. - sscanf(ptr + 3, "%4x", &uc2); - ptr += 6; - if (uc2 < 0xDC00 || uc2 > 0xDFFF) - break; // invalid second-half of surrogate. - uc = 0x10000 | ((uc & 0x3FF) << 10) | (uc2 & 0x3FF); - } - - len = 4; - if (uc < 0x80) - len = 1; - else if (uc < 0x800) - len = 2; - else if (uc < 0x10000) - len = 3; - ptr2 += len; - - switch (len) - { - case 4: - *--ptr2 = ((uc | 0x80) & 0xBF); - uc >>= 6; - case 3: - *--ptr2 = ((uc | 0x80) & 0xBF); - uc >>= 6; - case 2: - *--ptr2 = ((uc | 0x80) & 0xBF); - uc >>= 6; - case 1: - *--ptr2 = (uc | firstByteMark[len]); - } - ptr2 += len; - break; - default: - *ptr2++ = *ptr; - break; - } - ptr++; - } - } - *ptr2 = 0; - if (*ptr == '\"') - ptr++; - item->valuestring = out; - item->type = cJSON_String; - return ptr; -} - -/* Render the cstring provided to an escaped version that can be printed. */ -static char *print_string_ptr(const char *str) -{ - const char *ptr; - char *ptr2, *out; - int len = 0; - unsigned char token; - - if (!str) - return cJSON_strdup(""); - ptr = str; - while ((token = *ptr) && ++len) - { - if (strchr("\"\\\b\f\n\r\t", token)) - len++; - else if (token < 32) - len += 5; - ptr++; - } - - out = (char*) cJSON_malloc(len + 3); - if (!out) - return 0; - - ptr2 = out; - ptr = str; - *ptr2++ = '\"'; - while (*ptr) - { - if ((unsigned char) *ptr > 31 && *ptr != '\"' && *ptr != '\\') - *ptr2++ = *ptr++; - else - { - *ptr2++ = '\\'; - switch (token = *ptr++) - { - case '\\': - *ptr2++ = '\\'; - break; - case '\"': - *ptr2++ = '\"'; - break; - case '\b': - *ptr2++ = 'b'; - break; - case '\f': - *ptr2++ = 'f'; - break; - case '\n': - *ptr2++ = 'n'; - break; - case '\r': - *ptr2++ = 'r'; - break; - case '\t': - *ptr2++ = 't'; - break; - default: - sprintf(ptr2, "u%04x", token); - ptr2 += 5; - break; /* escape and print */ - } - } - } - *ptr2++ = '\"'; - *ptr2++ = 0; - return out; -} -/* Invote print_string_ptr (which is useful) on an item. */ -static char *print_string(cJSON *item) -{ - return print_string_ptr(item->valuestring); -} - -/* Predeclare these prototypes. */ -static const char *parse_value(cJSON *item, const char *value); -static char *print_value(cJSON *item, int depth, int fmt); -static const char *parse_array(cJSON *item, const char *value); -static char *print_array(cJSON *item, int depth, int fmt); -static const char *parse_object(cJSON *item, const char *value); -static char *print_object(cJSON *item, int depth, int fmt); - -/* Utility to jump whitespace and cr/lf */ -static const char *skip(const char *in) -{ - while (in && *in && (unsigned char) *in <= 32) - in++; - return in; -} - -/* Parse an object - create a new root, and populate. */ -cJSON *cJSON_Parse(const char *value) -{ - cJSON *c = cJSON_New_Item(); - ep = 0; - if (!c) - return 0; /* memory fail */ - - if (!parse_value(c, skip(value))) - { - cJSON_Delete(c); - return 0; - } - return c; -} - -/* Render a cJSON item/entity/structure to text. */ -char *cJSON_Print(cJSON *item) -{ - return print_value(item, 0, 1); -} -char *cJSON_PrintUnformatted(cJSON *item) -{ - return print_value(item, 0, 0); -} - -/* Parser core - when encountering text, process appropriately. */ -static const char *parse_value(cJSON *item, const char *value) -{ - if (!value) - return 0; /* Fail on null. */ - if (!strncmp(value, "null", 4)) - { - item->type = cJSON_NULL; - return value + 4; - } - if (!strncmp(value, "false", 5)) - { - item->type = cJSON_False; - return value + 5; - } - if (!strncmp(value, "true", 4)) - { - item->type = cJSON_True; - item->valueint = 1; - return value + 4; - } - if (*value == '\"') - { - return parse_string(item, value); - } - if (*value == '-' || (*value >= '0' && *value <= '9')) - { - return parse_number(item, value); - } - if (*value == '[') - { - return parse_array(item, value); - } - if (*value == '{') - { - return parse_object(item, value); - } - - ep = value; - return 0; /* failure. */ -} - -/* Render a value to text. */ -static char *print_value(cJSON *item, int depth, int fmt) -{ - char *out = 0; - if (!item) - return 0; - switch ((item->type) & 255) - { - case cJSON_NULL: - out = cJSON_strdup("null"); - break; - case cJSON_False: - out = cJSON_strdup("false"); - break; - case cJSON_True: - out = cJSON_strdup("true"); - break; - case cJSON_Int: - out = print_int(item); - break; - case cJSON_Double: - out = print_double(item); - break; - case cJSON_String: - out = print_string(item); - break; - case cJSON_Array: - out = print_array(item, depth, fmt); - break; - case cJSON_Object: - out = print_object(item, depth, fmt); - break; - } - return out; -} - -/* Build an array from input text. */ -static const char *parse_array(cJSON *item, const char *value) -{ - cJSON *child; - if (*value != '[') - { - ep = value; - return 0; - } /* not an array! */ - - item->type = cJSON_Array; - value = skip(value + 1); - if (*value == ']') - return value + 1; /* empty array. */ - - item->child = child = cJSON_New_Item(); - if (!item->child) - return 0; /* memory fail */ - value = skip(parse_value(child, skip(value))); /* skip any spacing, get the value. */ - if (!value) - return 0; - - while (*value == ',') - { - cJSON *new_item; - if (!(new_item = cJSON_New_Item())) - return 0; /* memory fail */ - child->next = new_item; - new_item->prev = child; - child = new_item; - value = skip(parse_value(child, skip(value + 1))); - if (!value) - return 0; /* memory fail */ - } - - if (*value == ']') - return value + 1; /* end of array */ - ep = value; - return 0; /* malformed. */ -} - -/* Render an array to text */ -static char *print_array(cJSON *item, int depth, int fmt) -{ - char **entries; - char *out = 0, *ptr, *ret; - int len = 5; - cJSON *child = item->child; - int numentries = 0, i = 0, fail = 0; - - /* How many entries in the array? */ - while (child) - numentries++, child = child->next; - /* Allocate an array to hold the values for each */ - entries = (char**) cJSON_malloc(numentries * sizeof(char*)); - if (!entries) - return 0; - memset(entries, 0, numentries * sizeof(char*)); - /* Retrieve all the results: */ - child = item->child; - while (child && !fail) - { - ret = print_value(child, depth + 1, fmt); - entries[i++] = ret; - if (ret) - len += strlen(ret) + 2 + (fmt ? 1 : 0); - else - fail = 1; - child = child->next; - } - - /* If we didn't fail, try to malloc the output string */ - if (!fail) - out = (char*) cJSON_malloc(len); - /* If that fails, we fail. */ - if (!out) - fail = 1; - - /* Handle failure. */ - if (fail) - { - for (i = 0; i < numentries; i++) - if (entries[i]) - cJSON_free(entries[i]); - cJSON_free(entries); - return 0; - } - - /* Compose the output array. */ - *out = '['; - ptr = out + 1; - *ptr = 0; - for (i = 0; i < numentries; i++) - { - strcpy(ptr, entries[i]); - ptr += strlen(entries[i]); - if (i != numentries - 1) - { - *ptr++ = ','; - if (fmt) - *ptr++ = ' '; - *ptr = 0; - } - cJSON_free(entries[i]); - } - cJSON_free(entries); - *ptr++ = ']'; - *ptr++ = 0; - return out; -} - -/* Build an object from the text. */ -static const char *parse_object(cJSON *item, const char *value) -{ - cJSON *child; - if (*value != '{') - { - ep = value; - return 0; - } /* not an object! */ - - item->type = cJSON_Object; - value = skip(value + 1); - if (*value == '}') - return value + 1; /* empty array. */ - - item->child = child = cJSON_New_Item(); - if (!item->child) - return 0; - value = skip(parse_string(child, skip(value))); - if (!value) - return 0; - child->string = child->valuestring; - child->valuestring = 0; - if (*value != ':') - { - ep = value; - return 0; - } /* fail! */ - value = skip(parse_value(child, skip(value + 1))); /* skip any spacing, get the value. */ - if (!value) - return 0; - - while (*value == ',') - { - cJSON *new_item; - if (!(new_item = cJSON_New_Item())) - return 0; /* memory fail */ - child->next = new_item; - new_item->prev = child; - child = new_item; - value = skip(parse_string(child, skip(value + 1))); - if (!value) - return 0; - child->string = child->valuestring; - child->valuestring = 0; - if (*value != ':') - { - ep = value; - return 0; - } /* fail! */ - value = skip(parse_value(child, skip(value + 1))); /* skip any spacing, get the value. */ - if (!value) - return 0; - } - - if (*value == '}') - return value + 1; /* end of array */ - ep = value; - return 0; /* malformed. */ -} - -/* Render an object to text. */ -static char *print_object(cJSON *item, int depth, int fmt) -{ - char **entries = 0, **names = 0; - char *out = 0, *ptr, *ret, *str; - int len = 7, i = 0, j; - cJSON *child = item->child; - int numentries = 0, fail = 0; - /* Count the number of entries. */ - while (child) - numentries++, child = child->next; - /* Allocate space for the names and the objects */ - entries = (char**) cJSON_malloc(numentries * sizeof(char*)); - if (!entries) - return 0; - names = (char**) cJSON_malloc(numentries * sizeof(char*)); - if (!names) - { - cJSON_free(entries); - return 0; - } - memset(entries, 0, sizeof(char*) * numentries); - memset(names, 0, sizeof(char*) * numentries); - - /* Collect all the results into our arrays: */ - child = item->child; - depth++; - if (fmt) - len += depth; - while (child) - { - names[i] = str = print_string_ptr(child->string); - entries[i++] = ret = print_value(child, depth, fmt); - if (str && ret) - len += strlen(ret) + strlen(str) + 2 + (fmt ? 2 + depth : 0); - else - fail = 1; - child = child->next; - } - - /* Try to allocate the output string */ - if (!fail) - out = (char*) cJSON_malloc(len); - if (!out) - fail = 1; - - /* Handle failure */ - if (fail) - { - for (i = 0; i < numentries; i++) - { - if (names[i]) - cJSON_free(names[i]); - if (entries[i]) - cJSON_free(entries[i]); - } - cJSON_free(names); - cJSON_free(entries); - return 0; - } - - /* Compose the output: */ - *out = '{'; - ptr = out + 1; - if (fmt) - *ptr++ = '\n'; - *ptr = 0; - for (i = 0; i < numentries; i++) - { - if (fmt) - for (j = 0; j < depth; j++) - *ptr++ = '\t'; - strcpy(ptr, names[i]); - ptr += strlen(names[i]); - *ptr++ = ':'; - if (fmt) - *ptr++ = '\t'; - strcpy(ptr, entries[i]); - ptr += strlen(entries[i]); - if (i != numentries - 1) - *ptr++ = ','; - if (fmt) - *ptr++ = '\n'; - *ptr = 0; - cJSON_free(names[i]); - cJSON_free(entries[i]); - } - - cJSON_free(names); - cJSON_free(entries); - if (fmt) - for (i = 0; i < depth - 1; i++) - *ptr++ = '\t'; - *ptr++ = '}'; - *ptr++ = 0; - return out; -} - -/* Get Array size/item / object item. */ -int cJSON_GetArraySize(cJSON *array) -{ - cJSON *c = array->child; - int i = 0; - while (c) - i++, c = c->next; - return i; -} -cJSON *cJSON_GetArrayItem(cJSON *array, int item) -{ - cJSON *c = array->child; - while (c && item > 0) - item--, c = c->next; - return c; -} -cJSON *cJSON_GetObjectItem(cJSON *object, const char *string) -{ - cJSON *c = object->child; - while (c && cJSON_strcasecmp(c->string, string)) - c = c->next; - return c; -} - -/* Utility for array list handling. */ -static void suffix_object(cJSON *prev, cJSON *item) -{ - prev->next = item; - item->prev = prev; -} -/* Utility for handling references. */ -static cJSON *create_reference(cJSON *item) -{ - cJSON *ref = cJSON_New_Item(); - if (!ref) - return 0; - memcpy(ref, item, sizeof(cJSON)); - ref->string = 0; - ref->type |= cJSON_IsReference; - ref->next = ref->prev = 0; - return ref; -} - -/* Add item to array/object. */ -void cJSON_AddItemToArray(cJSON *array, cJSON *item) -{ - cJSON *c = array->child; - if (!item) - return; - if (!c) - { - array->child = item; - } - else - { - while (c && c->next) - c = c->next; - suffix_object(c, item); - } -} - -void cJSON_AddItemToArrayHead(cJSON *array, cJSON *item) -{ - cJSON *c = array->child; - if (!item) - return; - if (!c) - { - array->child = item; - } - else - { - item->prev = c->prev; - item->next = c; - c->prev = item; - array->child = item; - } -} - -void cJSON_AddItemToObject(cJSON *object, const char *string, cJSON *item) -{ - if (!item) - return; - if (item->string) - cJSON_free(item->string); - item->string = cJSON_strdup(string); - cJSON_AddItemToArray(object, item); -} -void cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item) -{ - cJSON_AddItemToArray(array, create_reference(item)); -} -void cJSON_AddItemReferenceToObject(cJSON *object, const char *string, - cJSON *item) -{ - cJSON_AddItemToObject(object, string, create_reference(item)); -} - -cJSON *cJSON_DetachItemFromArray(cJSON *array, int which) -{ - cJSON *c = array->child; - while (c && which > 0) - c = c->next, which--; - if (!c) - return 0; - if (c->prev) - c->prev->next = c->next; - if (c->next) - c->next->prev = c->prev; - if (c == array->child) - array->child = c->next; - c->prev = c->next = 0; - return c; -} -void cJSON_DeleteItemFromArray(cJSON *array, int which) -{ - cJSON_Delete(cJSON_DetachItemFromArray(array, which)); -} -cJSON *cJSON_DetachItemFromObject(cJSON *object, const char *string) -{ - int i = 0; - cJSON *c = object->child; - while (c && cJSON_strcasecmp(c->string, string)) - i++, c = c->next; - if (c) - return cJSON_DetachItemFromArray(object, i); - return 0; -} -void cJSON_DeleteItemFromObject(cJSON *object, const char *string) -{ - cJSON_Delete(cJSON_DetachItemFromObject(object, string)); -} - -/* Replace array/object items with new ones. */ -void cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem) -{ - cJSON *c = array->child; - while (c && which > 0) - c = c->next, which--; - if (!c) - return; - newitem->next = c->next; - newitem->prev = c->prev; - if (newitem->next) - newitem->next->prev = newitem; - if (c == array->child) - array->child = newitem; - else - newitem->prev->next = newitem; - c->next = c->prev = 0; - cJSON_Delete(c); -} -void cJSON_ReplaceItemInObject(cJSON *object, const char *string, - cJSON *newitem) -{ - int i = 0; - cJSON *c = object->child; - while (c && cJSON_strcasecmp(c->string, string)) - i++, c = c->next; - if (c) - { - newitem->string = cJSON_strdup(string); - cJSON_ReplaceItemInArray(object, i, newitem); - } -} - -/* Create basic types: */ -cJSON *cJSON_CreateNull() -{ - cJSON *item = cJSON_New_Item(); - if (item) - item->type = cJSON_NULL; - return item; -} -cJSON *cJSON_CreateTrue() -{ - cJSON *item = cJSON_New_Item(); - if (item) - item->type = cJSON_True; - return item; -} -cJSON *cJSON_CreateFalse() -{ - cJSON *item = cJSON_New_Item(); - if (item) - item->type = cJSON_False; - return item; -} -cJSON *cJSON_CreateBool(int b) -{ - cJSON *item = cJSON_New_Item(); - if (item) - item->type = b ? cJSON_True : cJSON_False; - return item; -} -cJSON *cJSON_CreateDouble(double num, int sign) -{ - cJSON *item = cJSON_New_Item(); - if (item) - { - item->type = cJSON_Double; - item->valuedouble = num; - item->valueint = (int64)num; - item->sign = sign; - } - return item; -} -cJSON *cJSON_CreateInt(uint64 num, int sign) -{ - cJSON *item = cJSON_New_Item(); - if (item) - { - item->type = cJSON_Int; - item->valuedouble = (double)num; - item->valueint = (int64)num; - item->sign = sign; - } - return item; -} -cJSON *cJSON_CreateString(const char *string) -{ - cJSON *item = cJSON_New_Item(); - if (item) - { - item->type = cJSON_String; - item->valuestring = cJSON_strdup(string); - } - return item; -} -cJSON *cJSON_CreateArray() -{ - cJSON *item = cJSON_New_Item(); - if (item) - item->type = cJSON_Array; - return item; -} -cJSON *cJSON_CreateObject() -{ - cJSON *item = cJSON_New_Item(); - if (item) - item->type = cJSON_Object; - return item; -} - -/* Create Arrays: */ -cJSON *cJSON_CreateIntArray(int *numbers, int sign, int count) -{ - int i; - cJSON *n = 0, *p = 0, *a = cJSON_CreateArray(); - for (i = 0; a && i < count; i++) - { - n = cJSON_CreateDouble((long double)((unsigned int)numbers[i]), sign); - if (!i) - a->child = n; - else - suffix_object(p, n); - p = n; - } - return a; -} -cJSON *cJSON_CreateFloatArray(float *numbers, int count) -{ - int i; - cJSON *n = 0, *p = 0, *a = cJSON_CreateArray(); - for (i = 0; a && i < count; i++) - { - n = cJSON_CreateDouble((long double)numbers[i], -1); - if (!i) - a->child = n; - else - suffix_object(p, n); - p = n; - } - return a; -} -cJSON *cJSON_CreateDoubleArray(double *numbers, int count) -{ - int i; - cJSON *n = 0, *p = 0, *a = cJSON_CreateArray(); - for (i = 0; a && i < count; i++) - { - n = cJSON_CreateDouble((long double)numbers[i], -1); - if (!i) - a->child = n; - else - suffix_object(p, n); - p = n; - } - return a; -} -cJSON *cJSON_CreateStringArray(const char **strings, int count) -{ - int i; - cJSON *n = 0, *p = 0, *a = cJSON_CreateArray(); - for (i = 0; a && i < count; i++) - { - n = cJSON_CreateString(strings[i]); - if (!i) - a->child = n; - else - suffix_object(p, n); - p = n; - } - return a; -} - diff --git a/sop-sdk/sdk-c++/thirdparty/CJsonObject/cJSON.h b/sop-sdk/sdk-c++/thirdparty/CJsonObject/cJSON.h deleted file mode 100644 index a94ced54..00000000 --- a/sop-sdk/sdk-c++/thirdparty/CJsonObject/cJSON.h +++ /dev/null @@ -1,151 +0,0 @@ -/* - Copyright (c) 2009 Dave Gamble - - 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. - */ - -#ifndef cJSON__h -#define cJSON__h - -#include - -typedef int int32; -typedef unsigned int uint32; -#ifndef _WIN32 - #if __WORDSIZE == 64 - typedef long int64; - typedef unsigned long uint64; - #endif -#else - typedef long long int64; - typedef unsigned long long uint64; -#endif - - -#ifdef __cplusplus -extern "C" -{ -#endif - -/* cJSON Types: */ -#define cJSON_False 0 -#define cJSON_True 1 -#define cJSON_NULL 2 -#define cJSON_Int 3 -#define cJSON_Double 4 -#define cJSON_String 5 -#define cJSON_Array 6 -#define cJSON_Object 7 - -#define cJSON_IsReference 256 - -/* The cJSON structure: */ -typedef struct cJSON -{ - struct cJSON *next, *prev; /* next/prev allow you to walk array/object chains. Alternatively, use GetArraySize/GetArrayItem/GetObjectItem */ - struct cJSON *child; /* An array or object item will have a child pointer pointing to a chain of the items in the array/object. */ - - int type; /* The type of the item, as above. */ - - char *valuestring; /* The item's string, if type==cJSON_String */ - int64 valueint; /* The item's number, if type==cJSON_Number */ - double valuedouble; /* The item's number, if type==cJSON_Number */ - int sign; /* sign of valueint, 1(unsigned), -1(signed) */ - - char *string; /* The item's name string, if this item is the child of, or is in the list of subitems of an object. */ -} cJSON; - -typedef struct cJSON_Hooks -{ - void *(*malloc_fn)(size_t sz); - void (*free_fn)(void *ptr); -} cJSON_Hooks; - -/* Supply malloc, realloc and free functions to cJSON */ -extern void cJSON_InitHooks(cJSON_Hooks* hooks); - -/* Supply a block of JSON, and this returns a cJSON object you can interrogate. Call cJSON_Delete when finished. */ -extern cJSON *cJSON_Parse(const char *value); -/* Render a cJSON entity to text for transfer/storage. Free the char* when finished. */ -extern char *cJSON_Print(cJSON *item); -/* Render a cJSON entity to text for transfer/storage without any formatting. Free the char* when finished. */ -extern char *cJSON_PrintUnformatted(cJSON *item); -/* Delete a cJSON entity and all subentities. */ -extern void cJSON_Delete(cJSON *c); - -/* Returns the number of items in an array (or object). */ -extern int cJSON_GetArraySize(cJSON *array); -/* Retrieve item number "item" from array "array". Returns NULL if unsuccessful. */ -extern cJSON *cJSON_GetArrayItem(cJSON *array, int item); -/* Get item "string" from object. Case insensitive. */ -extern cJSON *cJSON_GetObjectItem(cJSON *object, const char *string); - -/* For analysing failed parses. This returns a pointer to the parse error. You'll probably need to look a few chars back to make sense of it. Defined when cJSON_Parse() returns 0. 0 when cJSON_Parse() succeeds. */ -extern const char *cJSON_GetErrorPtr(); - -/* These calls create a cJSON item of the appropriate type. */ -extern cJSON *cJSON_CreateNull(); -extern cJSON *cJSON_CreateTrue(); -extern cJSON *cJSON_CreateFalse(); -extern cJSON *cJSON_CreateBool(int b); -extern cJSON *cJSON_CreateDouble(double num, int sign); -extern cJSON *cJSON_CreateInt(uint64 num, int sign); -extern cJSON *cJSON_CreateString(const char *string); -extern cJSON *cJSON_CreateArray(); -extern cJSON *cJSON_CreateObject(); - -/* These utilities create an Array of count items. */ -extern cJSON *cJSON_CreateIntArray(int *numbers, int sign, int count); -extern cJSON *cJSON_CreateFloatArray(float *numbers, int count); -extern cJSON *cJSON_CreateDoubleArray(double *numbers, int count); -extern cJSON *cJSON_CreateStringArray(const char **strings, int count); - -/* Append item to the specified array/object. */ -extern void cJSON_AddItemToArray(cJSON *array, cJSON *item); -extern void cJSON_AddItemToArrayHead(cJSON *array, cJSON *item); /* add by Bwar on 2015-01-28 */ -extern void cJSON_AddItemToObject(cJSON *object, const char *string, - cJSON *item); -/* Append reference to item to the specified array/object. Use this when you want to add an existing cJSON to a new cJSON, but don't want to corrupt your existing cJSON. */ -extern void cJSON_AddItemReferenceToArray(cJSON *array, cJSON *item); -extern void cJSON_AddItemReferenceToObject(cJSON *object, const char *string, - cJSON *item); - -/* Remove/Detatch items from Arrays/Objects. */ -extern cJSON *cJSON_DetachItemFromArray(cJSON *array, int which); -extern void cJSON_DeleteItemFromArray(cJSON *array, int which); -extern cJSON *cJSON_DetachItemFromObject(cJSON *object, const char *string); -extern void cJSON_DeleteItemFromObject(cJSON *object, const char *string); - -/* Update array items. */ -extern void cJSON_ReplaceItemInArray(cJSON *array, int which, cJSON *newitem); -extern void cJSON_ReplaceItemInObject(cJSON *object, const char *string, - cJSON *newitem); - -#define cJSON_AddNullToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateNull()) -#define cJSON_AddTrueToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateTrue()) -#define cJSON_AddFalseToObject(object,name) cJSON_AddItemToObject(object, name, cJSON_CreateFalse()) -#define cJSON_AddNumberToObject(object,name,n) cJSON_AddItemToObject(object, name, cJSON_CreateNumber(n)) -#define cJSON_AddStringToObject(object,name,s) cJSON_AddItemToObject(object, name, cJSON_CreateString(s)) - - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/sop-sdk/sdk-rust/sdk-test/src/main.rs b/sop-sdk/sdk-rust/sdk-test/src/main.rs index 8c244ed4..759e6b93 100644 --- a/sop-sdk/sdk-rust/sdk-test/src/main.rs +++ b/sop-sdk/sdk-rust/sdk-test/src/main.rs @@ -13,11 +13,11 @@ fn main() { // 创建请求客户端 let client = OpenClient { // 应用ID - app_id: "2020051325943082302177280", + app_id: "201904035630907729292csharp", // 应用私钥 - private_key: "MIICXAIBAAKBgQCHJlAPN+1dCbgc3HiahQkT2W/skecGWOCkSX4CPvEc8oIk6544\nxihEwShHnfrapiQdF2fndv5agrhg4FyOHheST42L5MnCk+4Km+mWm5GDvmFS7Sa2\naZ5o3regY0MUoJ7D74dYjE3UYFuTujAXiXjGpAwa9qOcKotov5LCkSfUeQIDAQAB\nAoGAB1cyw8LYRQSHQCUO9Wiaq730jPNHSrJW4EGAIz/XMYjv/fCgx0lnDEX4CbzI\nUGoz/bME4R721YRyXoutJ0h14/cGrt/TEn/TMI0xnISzJHr8VSlyBkQEdfO/W3LO\nqjs/UYq2Bz4+kJROJHreM+7d5hiIWLzLBlyI8cSU92ySmHECQQDwju2SoRu88kQP\n1qr4seZyKQa8DHTVyCoa6LtPLXyJsdgWgY4KyqJHwMUumEC2Zhhu833CR0ZXbfta\nuQDmwAVJAkEAj9M225jrPasaD5vPO7thxtEqgV4F/ZyNKH0Z8bDH27KaKkQ+8GMt\nkxwKVckZXs2bMvg/6tCiDZkWAxawNrvFsQJBANmTrPWOmpQPW9gnhYRjA9gFm33C\nlno2DT9BeQloTtgL7zKMA3lnRdg4VyCJvR48waS4vupVpR228D1iT5pl22ECQF1M\nJUzkcM0rPheb+h2EW1QOgWU0Keyvbj4ykO7gv3T78dezN6TWoUzJpsapUiTWeXPh\n6AyZ1FW/1bChOiP3QLECQGAbObmsYlN0bjzPYChwWYeYjErXuv51a44GZCNWinFw\nGGiHU9ZAqF8RzmBVW4htwj0j/Yry/V1Sp0uoP0zu3uA=", + private_key: "MIIEowIBAAKCAQEA5+OvJxeSzf44NxQ/cl7Ii+BzPg2k6sRcvH4ffOtU5Dzq1/oEvg02nxIhmwOHBZmjbmuUu0aLsfglUTAwqfXftfAKZidshsgj9NNh0/kxk0avRZ1UoljWGz/FxVZA0ogbxxhohPZ9jWcD+eBQcIwF2DtHfAJqWWZrYFnCMeHD8mPzxo2kwXSvDzi0vf9I2tKiYvNG26a9FqeYtPOoi81sdS3+70HOMdxP8ejXtyfnKpKz7Dx506LCIRS5moWS3Q5eTLV3NGX/1CSJ8wpQA2DAQTjVhX5eVu7Yqz12t8W+sjWM/tHUR6cgwYYR10p7tSCeCPzkigjGxKm4cYXWtATQJQIDAQABAoIBAHFDsgrrJca+NKEan77ycwx3jnKx4WrWjOF4zVKL9AQjiSYDNgvKknJyPb3kpC/lEoHdxGERHSzJoxib7DkoIqRQYhPxj73pxj5QfYk3P7LLJNNg/LTrpXDb3nL8JV9wIflGf87qQvstZTDJEyFWE4jBs7Hr0BxovWvri8InnzkmERJ1cbGJgNHe1Y3Zo2tw0yaHxQCxLuajP+notRZhD9bEp7uKeI0w9AvlW6k8m/7y10F0BK/TlyW8rQiEC391yOiRYoMcUh4hd2Q9bMx3jngZgX8PXIvZZcup4/pvWlv1alwhB2tsnLdazP62r1MO80vLyLunzGO+7WwCjEYlVaECgYEA+lQRFmbhKaPuAuXMtY31Fbga8nedka5TjnEV7+/kX+yowE2OlNujF+ZG8UTddTxAGv56yVNi/mjRlgD74j8z0eOsgvOq9mwbCrgLhLo51H9O/wAxtb+hBKtC5l50pBr4gER6d8W6EQNTSGojnMIaLXTkAZ5Qf6Z8e2HFVdOn0X0CgYEA7SSrTokwzukt5KldNu5ukyyd+C3D1i6orbg6qD73EP9CfNMfGSBn7dDv9wMSJH01+Ty+RgTROgtjGRDbMJWnfbdt/61NePr9ar5sb6Nbsf7/I0w7cZF5dsaFYgzaOfQYquzXPbLQHkpMT64bqpv/Mwy4F2lFvaYWY5fA4pC2uckCgYEAg75Ym9ybJaoTqky8ttQ2Jy8UZ4VSVQhVC0My02sCWwWXLlXi8y7An+Rec73Ve0yxREOn5WrQT6pkmzh7V/ABWrYi5WxODpCIjtSbo0fLBa3Wqle00b0/hdCITetqIa/cFs1zUrOqICgK3bKWeXqiAkhhcwSZwwSgwOKM04Wn7ZUCgYBvhHX2mbdVJfyJ8kc+hMOE/E9RHRxiBVEXWHJlGi8PVCqNDq8qHr4g7Mdbzprig+s0yKblwHAvrpkseWvKHiZEjVTyDipHgShY4TGXEigVvUd37uppTrLi8xpYcJjS9gH/px7VCdiq1d+q/MJP6coJ1KphgATm2UrgDMYNBWaYWQKBgEHRxrmER7btUF60/YgcqPHFc8RpYQB2ZZE0kyKGDqk2Data1XYUY6vsPAU28yRLAaWr/D2H17iyLkxP80VLm6QhifxCadv90Q/Wl1DFfOJQMW6avyQ0so6G0wFq/LJxaFK4iLXQn1RJnmTp6BYiJMmK2BhFbRzw8ssMoF6ad2rr", // 请求地址 - url: "http://localhost:7071/prod/gw68uy85", + url: "http://localhost:8081", }; // 业务参数 let mut biz_model = HashMap::new(); diff --git a/sop-sdk/sdk-rust/sdk/src/client.rs b/sop-sdk/sdk-rust/sdk/src/client.rs index 5122de15..a63078a7 100644 --- a/sop-sdk/sdk-rust/sdk/src/client.rs +++ b/sop-sdk/sdk-rust/sdk/src/client.rs @@ -90,14 +90,11 @@ impl OpenClient { let mut all_params = HashMap::new(); all_params.insert("app_id", self.app_id.to_string()); all_params.insert("method", method.to_string()); + all_params.insert("sign_type", "RSA2".to_string()); all_params.insert("charset", "UTF-8".to_string()); all_params.insert("timestamp", Local::now().format("%Y-%m-%d %H:%M:%S").to_string()); all_params.insert("version", version.to_string()); - - // 添加业务参数 - for entry in &request.get_base().biz_model { - all_params.insert(entry.0, entry.1.to_string()); - } + all_params.insert("biz_content", serde_json::to_string(&request.get_base().biz_model).unwrap_or(String::from("{}"))); if !token.is_empty() { all_params.insert("app_auth_token", token.to_string()); diff --git a/sop-test/src/test/java/com/gitee/sop/test/ArrayTest.java b/sop-test/src/test/java/com/gitee/sop/test/ArrayTest.java new file mode 100644 index 00000000..748644a8 --- /dev/null +++ b/sop-test/src/test/java/com/gitee/sop/test/ArrayTest.java @@ -0,0 +1,63 @@ +package com.gitee.sop.test; + +import com.alibaba.fastjson.JSON; +import com.gitee.sop.test.alipay.AlipaySignature; +import org.junit.Test; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 接收数组 + */ +public class ArrayTest extends TestBase { + + String url = "http://localhost:8081"; + String appId = "2019032617262200001"; + // 平台提供的私钥 + String privateKey = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCXJv1pQFqWNA/++OYEV7WYXwexZK/J8LY1OWlP9X0T6wHFOvxNKRvMkJ5544SbgsJpVcvRDPrcxmhPbi/sAhdO4x2PiPKIz9Yni2OtYCCeaiE056B+e1O2jXoLeXbfi9fPivJZkxH/tb4xfLkH3bA8ZAQnQsoXA0SguykMRZntF0TndUfvDrLqwhlR8r5iRdZLB6F8o8qXH6UPDfNEnf/K8wX5T4EB1b8x8QJ7Ua4GcIUqeUxGHdQpzNbJdaQvoi06lgccmL+PHzminkFYON7alj1CjDN833j7QMHdPtS9l7B67fOU/p2LAAkPMtoVBfxQt9aFj7B8rEhGCz02iJIBAgMBAAECggEARqOuIpY0v6WtJBfmR3lGIOOokLrhfJrGTLF8CiZMQha+SRJ7/wOLPlsH9SbjPlopyViTXCuYwbzn2tdABigkBHYXxpDV6CJZjzmRZ+FY3S/0POlTFElGojYUJ3CooWiVfyUMhdg5vSuOq0oCny53woFrf32zPHYGiKdvU5Djku1onbDU0Lw8w+5tguuEZ76kZ/lUcccGy5978FFmYpzY/65RHCpvLiLqYyWTtaNT1aQ/9pw4jX9HO9NfdJ9gYFK8r/2f36ZE4hxluAfeOXQfRC/WhPmiw/ReUhxPznG/WgKaa/OaRtAx3inbQ+JuCND7uuKeRe4osP2jLPHPP6AUwQKBgQDUNu3BkLoKaimjGOjCTAwtp71g1oo+k5/uEInAo7lyEwpV0EuUMwLA/HCqUgR4K9pyYV+Oyb8d6f0+Hz0BMD92I2pqlXrD7xV2WzDvyXM3s63NvorRooKcyfd9i6ccMjAyTR2qfLkxv0hlbBbsPHz4BbU63xhTJp3Ghi0/ey/1HQKBgQC2VsgqC6ykfSidZUNLmQZe3J0p/Qf9VLkfrQ+xaHapOs6AzDU2H2osuysqXTLJHsGfrwVaTs00ER2z8ljTJPBUtNtOLrwNRlvgdnzyVAKHfOgDBGwJgiwpeE9voB1oAV/mXqSaUWNnuwlOIhvQEBwekqNyWvhLqC7nCAIhj3yvNQKBgQCqYbeec56LAhWP903Zwcj9VvG7sESqXUhIkUqoOkuIBTWFFIm54QLTA1tJxDQGb98heoCIWf5x/A3xNI98RsqNBX5JON6qNWjb7/dobitti3t99v/ptDp9u8JTMC7penoryLKK0Ty3bkan95Kn9SC42YxaSghzqkt+uvfVQgiNGQKBgGxU6P2aDAt6VNwWosHSe+d2WWXt8IZBhO9d6dn0f7ORvcjmCqNKTNGgrkewMZEuVcliueJquR47IROdY8qmwqcBAN7Vg2K7r7CPlTKAWTRYMJxCT1Hi5gwJb+CZF3+IeYqsJk2NF2s0w5WJTE70k1BSvQsfIzAIDz2yE1oPHvwVAoGAA6e+xQkVH4fMEph55RJIZ5goI4Y76BSvt2N5OKZKd4HtaV+eIhM3SDsVYRLIm9ZquJHMiZQGyUGnsvrKL6AAVNK7eQZCRDk9KQz+0GKOGqku0nOZjUbAu6A2/vtXAaAuFSFx1rUQVVjFulLexkXR3KcztL1Qu2k5pB6Si0K/uwQ="; + + @Test + public void testGet() throws Exception { + + // 公共请求参数 + Map params = new HashMap(); + params.put("app_id", appId); + params.put("method", "story.listparam"); + params.put("format", "json"); + params.put("charset", "utf-8"); + params.put("sign_type", "RSA2"); + params.put("timestamp", new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date())); + params.put("version", "1.0"); + + // 业务参数 + String bizContent = "{\n" + + " \"name\": \"jim\",\n" + + " \"list\": [{\n" + + " \"age\": 22,\n" + + " \"name\": \"jim\",\n" + + " \"address\": \"xx\"\n" + + " }]\n" + + "}"; + + params.put("biz_content", JSON.toJSONString(JSON.parseObject(bizContent))); + String content = AlipaySignature.getSignContent(params); + String sign = AlipaySignature.rsa256Sign(content, privateKey, "utf-8"); + params.put("sign", sign); + + System.out.println("----------- 请求信息 -----------"); + System.out.println("请求参数：" + buildParamQuery(params)); + System.out.println("商户秘钥：" + privateKey); + System.out.println("待签名内容：" + content); + System.out.println("签名(sign)：" + sign); + System.out.println("URL参数：" + buildUrlQuery(params)); + + System.out.println("----------- 返回结果 -----------"); + String responseData = postJson(url, params);// 发送请求 + System.out.println(responseData); + } + + +}