lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-07-02 20:02:24 +03:00
Code Activity

Fix warnings created by #2152

Browse Source
This commit is contained in:
yhirose
2025-06-24 17:12:12 -04:00
parent de5a255ac6
commit aabd0634ae
2 changed files with 103 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
httplib.h
View File

@ -553,6 +553,15 @@ struct MultipartFormData {
using MultipartFormDataItems = std::vector<MultipartFormData>;
using MultipartFormDataMap = std::multimap<std::string, MultipartFormData>;
struct MultipartFormDataForClientInput {
std::string name;
std::string content;
std::string filename;
std::string content_type;
};
using MultipartFormDataItemsForClientInput =
std::vector<MultipartFormDataForClientInput>;
class DataSink {
public:
DataSink() : os(&sb_), sb_(*this) {}
@ -1330,13 +1339,15 @@ public:
const Params &params);
Result Post(const std::string &path, const Headers &headers,
const Params &params, Progress progress);
Result Post(const std::string &path, const MultipartFormDataItems &items);
Result Post(const std::string &path,
const MultipartFormDataItemsForClientInput &items);
Result Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items);
const MultipartFormDataItemsForClientInput &items);
Result Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items, const std::string &boundary);
const MultipartFormDataItemsForClientInput &items,
const std::string &boundary);
Result Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
const MultipartFormDataItemsForClientInput &items,
const MultipartFormDataProviderItems &provider_items);
Result Put(const std::string &path);
@ -1372,13 +1383,15 @@ public:
const Params &params);
Result Put(const std::string &path, const Headers &headers,
const Params &params, Progress progress);
Result Put(const std::string &path, const MultipartFormDataItems &items);
Result Put(const std::string &path,
const MultipartFormDataItemsForClientInput &items);
Result Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items);
const MultipartFormDataItemsForClientInput &items);
Result Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items, const std::string &boundary);
const MultipartFormDataItemsForClientInput &items,
const std::string &boundary);
Result Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
const MultipartFormDataItemsForClientInput &items,
const MultipartFormDataProviderItems &provider_items);
Result Patch(const std::string &path);
@ -1664,7 +1677,8 @@ private:
ContentProviderWithoutLength content_provider_without_length,
const std::string &content_type, Progress progress);
ContentProviderWithoutLength get_multipart_content_provider(
const std::string &boundary, const MultipartFormDataItems &items,
const std::string &boundary,
const MultipartFormDataItemsForClientInput &items,
const MultipartFormDataProviderItems &provider_items) const;
std::string adjust_host_string(const std::string &host) const;
@ -1769,13 +1783,15 @@ public:
const Params &params);
Result Post(const std::string &path, const Headers &headers,
const Params &params, Progress progress);
Result Post(const std::string &path, const MultipartFormDataItems &items);
Result Post(const std::string &path,
const MultipartFormDataItemsForClientInput &items);
Result Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items);
const MultipartFormDataItemsForClientInput &items);
Result Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items, const std::string &boundary);
const MultipartFormDataItemsForClientInput &items,
const std::string &boundary);
Result Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
const MultipartFormDataItemsForClientInput &items,
const MultipartFormDataProviderItems &provider_items);
Result Put(const std::string &path);
@ -1811,13 +1827,15 @@ public:
const Params &params);
Result Put(const std::string &path, const Headers &headers,
const Params &params, Progress progress);
Result Put(const std::string &path, const MultipartFormDataItems &items);
Result Put(const std::string &path,
const MultipartFormDataItemsForClientInput &items);
Result Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items);
const MultipartFormDataItemsForClientInput &items);
Result Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items, const std::string &boundary);
const MultipartFormDataItemsForClientInput &items,
const std::string &boundary);
Result Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
const MultipartFormDataItemsForClientInput &items,
const MultipartFormDataProviderItems &provider_items);
Result Patch(const std::string &path);
@ -5331,7 +5349,7 @@ serialize_multipart_formdata_get_content_type(const std::string &boundary) {
}
inline std::string
serialize_multipart_formdata(const MultipartFormDataItems &items,
serialize_multipart_formdata(const MultipartFormDataItemsForClientInput &items,
const std::string &boundary, bool finish = true) {
std::string body;
@ -8370,7 +8388,8 @@ inline bool ClientImpl::process_request(Stream &strm, Request &req,
}
inline ContentProviderWithoutLength ClientImpl::get_multipart_content_provider(
const std::string &boundary, const MultipartFormDataItems &items,
const std::string &boundary,
const MultipartFormDataItemsForClientInput &items,
const MultipartFormDataProviderItems &provider_items) const {
size_t cur_item = 0;
size_t cur_start = 0;
@ -8671,13 +8690,15 @@ inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
progress);
}
inline Result ClientImpl::Post(const std::string &path,
const MultipartFormDataItems &items) {
inline Result
ClientImpl::Post(const std::string &path,
const MultipartFormDataItemsForClientInput &items) {
return Post(path, Headers(), items);
}
inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items) {
inline Result
ClientImpl::Post(const std::string &path, const Headers &headers,
const MultipartFormDataItemsForClientInput &items) {
const auto &boundary = detail::make_multipart_data_boundary();
const auto &content_type =
detail::serialize_multipart_formdata_get_content_type(boundary);
@ -8685,8 +8706,9 @@ inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
return Post(path, headers, body, content_type);
}
inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
inline Result
ClientImpl::Post(const std::string &path, const Headers &headers,
const MultipartFormDataItemsForClientInput &items,
const std::string &boundary) {
if (!detail::is_multipart_boundary_chars_valid(boundary)) {
return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
@ -8700,7 +8722,7 @@ inline Result ClientImpl::Post(const std::string &path, const Headers &headers,
inline Result
ClientImpl::Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
const MultipartFormDataItemsForClientInput &items,
const MultipartFormDataProviderItems &provider_items) {
const auto &boundary = detail::make_multipart_data_boundary();
const auto &content_type =
@ -8811,13 +8833,15 @@ inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
progress);
}
inline Result ClientImpl::Put(const std::string &path,
const MultipartFormDataItems &items) {
inline Result
ClientImpl::Put(const std::string &path,
const MultipartFormDataItemsForClientInput &items) {
return Put(path, Headers(), items);
}
inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items) {
inline Result
ClientImpl::Put(const std::string &path, const Headers &headers,
const MultipartFormDataItemsForClientInput &items) {
const auto &boundary = detail::make_multipart_data_boundary();
const auto &content_type =
detail::serialize_multipart_formdata_get_content_type(boundary);
@ -8826,7 +8850,7 @@ inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
}
inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
const MultipartFormDataItemsForClientInput &items,
const std::string &boundary) {
if (!detail::is_multipart_boundary_chars_valid(boundary)) {
return Result{nullptr, Error::UnsupportedMultipartBoundaryChars};
@ -8840,7 +8864,7 @@ inline Result ClientImpl::Put(const std::string &path, const Headers &headers,
inline Result
ClientImpl::Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
const MultipartFormDataItemsForClientInput &items,
const MultipartFormDataProviderItems &provider_items) {
const auto &boundary = detail::make_multipart_data_boundary();
const auto &content_type =
@ -10251,21 +10275,21 @@ inline Result Client::Post(const std::string &path, const Headers &headers,
return cli_->Post(path, headers, params, progress);
}
inline Result Client::Post(const std::string &path,
const MultipartFormDataItems &items) {
const MultipartFormDataItemsForClientInput &items) {
return cli_->Post(path, items);
}
inline Result Client::Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items) {
const MultipartFormDataItemsForClientInput &items) {
return cli_->Post(path, headers, items);
}
inline Result Client::Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
const MultipartFormDataItemsForClientInput &items,
const std::string &boundary) {
return cli_->Post(path, headers, items, boundary);
}
inline Result
Client::Post(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
const MultipartFormDataItemsForClientInput &items,
const MultipartFormDataProviderItems &provider_items) {
return cli_->Post(path, headers, items, provider_items);
}
@ -10338,21 +10362,21 @@ inline Result Client::Put(const std::string &path, const Headers &headers,
return cli_->Put(path, headers, params, progress);
}
inline Result Client::Put(const std::string &path,
const MultipartFormDataItems &items) {
const MultipartFormDataItemsForClientInput &items) {
return cli_->Put(path, items);
}
inline Result Client::Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items) {
const MultipartFormDataItemsForClientInput &items) {
return cli_->Put(path, headers, items);
}
inline Result Client::Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
const MultipartFormDataItemsForClientInput &items,
const std::string &boundary) {
return cli_->Put(path, headers, items, boundary);
}
inline Result
Client::Put(const std::string &path, const Headers &headers,
const MultipartFormDataItems &items,
const MultipartFormDataItemsForClientInput &items,
const MultipartFormDataProviderItems &provider_items) {
return cli_->Put(path, headers, items, provider_items);
}

40
test/test.cc
View File

@ -3191,13 +3191,16 @@ TEST(BenchmarkTest, SimpleGetPerformance) {
}
auto end = std::chrono::high_resolution_clock::now();
auto total_ms = std::chrono::duration_cast<std::chrono::milliseconds>(end - start).count();
auto total_ms =
std::chrono::duration_cast<std::chrono::milliseconds>(end - start)
.count();
double avg_ms = static_cast<double>(total_ms) / NUM_REQUESTS;
std::cout << "Standalone: " << NUM_REQUESTS << " requests in " << total_ms
<< "ms (avg: " << avg_ms << "ms)" << std::endl;
EXPECT_LE(avg_ms, MAX_AVERAGE_MS) << "Standalone test too slow: " << avg_ms << "ms (Issue #1777)";
EXPECT_LE(avg_ms, MAX_AVERAGE_MS)
<< "Standalone test too slow: " << avg_ms << "ms (Issue #1777)";
}
TEST_F(ServerTest, GetEmptyFile) {
@ -3842,9 +3845,7 @@ TEST_F(ServerTest, HeaderCountAtLimit) {
// This should work fine as we're under the limit
auto res = cli_.Get("/hi", headers);
EXPECT_TRUE(res);
if (res) {
EXPECT_EQ(StatusCode::OK_200, res->status);
}
if (res) { EXPECT_EQ(StatusCode::OK_200, res->status); }
}
TEST_F(ServerTest, HeaderCountExceedsLimit) {
@ -3914,7 +3915,8 @@ TEST_F(ServerTest, HeaderCountSecurityTest) {
httplib::Headers attack_headers;
// Attempt to add many headers like an attacker would (200 headers to far exceed limit)
// Attempt to add many headers like an attacker would (200 headers to far
// exceed limit)
for (int i = 0; i < 200; i++) {
std::string name = "X-Attack-Header-" + std::to_string(i);
std::string value = "attack_payload_" + std::to_string(i);
@ -3935,7 +3937,7 @@ TEST_F(ServerTest, HeaderCountSecurityTest) {
}
TEST_F(ServerTest, MultipartFormData) {
MultipartFormDataItems items = {
MultipartFormDataItemsForClientInput items = {
{"text1", "text default", "", ""},
{"text2", "aωb", "", ""},
{"file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
@ -3950,7 +3952,7 @@ TEST_F(ServerTest, MultipartFormData) {
}
TEST_F(ServerTest, MultipartFormDataMultiFileValues) {
MultipartFormDataItems items = {
MultipartFormDataItemsForClientInput items = {
{"text", "default text", "", ""},
{"multi_text1", "aaaaa", "", ""},
@ -4890,7 +4892,7 @@ TEST_F(ServerTest, PostContentReceiver) {
}
TEST_F(ServerTest, PostMultipartFileContentReceiver) {
MultipartFormDataItems items = {
MultipartFormDataItemsForClientInput items = {
{"text1", "text default", "", ""},
{"text2", "aωb", "", ""},
{"file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
@ -4905,7 +4907,7 @@ TEST_F(ServerTest, PostMultipartFileContentReceiver) {
}
TEST_F(ServerTest, PostMultipartPlusBoundary) {
MultipartFormDataItems items = {
MultipartFormDataItemsForClientInput items = {
{"text1", "text default", "", ""},
{"text2", "aωb", "", ""},
{"file1", "h\ne\n\nl\nl\no\n", "hello.txt", "text/plain"},
@ -5160,7 +5162,7 @@ TEST_F(ServerTest, NoGzipWithContentReceiver) {
}
TEST_F(ServerTest, MultipartFormDataGzip) {
MultipartFormDataItems items = {
MultipartFormDataItemsForClientInput items = {
{"key1", "test", "", ""},
{"key2", "--abcdefg123", "", ""},
};
@ -5324,7 +5326,7 @@ TEST_F(ServerTest, NoZstdWithContentReceiver) {
// TODO: How to enable zstd ??
TEST_F(ServerTest, MultipartFormDataZstd) {
MultipartFormDataItems items = {
MultipartFormDataItemsForClientInput items = {
{"key1", "test", "", ""},
{"key2", "--abcdefg123", "", ""},
};
@ -7507,7 +7509,7 @@ TEST(MultipartFormDataTest, LargeData) {
Client cli("https://localhost:8080");
cli.enable_server_certificate_verification(false);
MultipartFormDataItems items{
MultipartFormDataItemsForClientInput items{
{"document", buffer.str(), "2MB_data", "application/octet-stream"},
{"hello", "world", "", ""},
};
@ -7650,7 +7652,7 @@ TEST(MultipartFormDataTest, DataProviderItems) {
Client cli("https://localhost:8080");
cli.enable_server_certificate_verification(false);
MultipartFormDataItems items{
MultipartFormDataItemsForClientInput items{
{"name1", "Testing123", "filename1", "application/octet-stream"},
{"name2", "Testing456", "", ""}, // not a file
};
@ -7855,7 +7857,7 @@ TEST(MultipartFormDataTest, PostCustomBoundary) {
Client cli("https://localhost:8080");
cli.enable_server_certificate_verification(false);
MultipartFormDataItems items{
MultipartFormDataItemsForClientInput items{
{"document", buffer.str(), "2MB_data", "application/octet-stream"},
{"hello", "world", "", ""},
};
@ -7873,7 +7875,7 @@ TEST(MultipartFormDataTest, PostInvalidBoundaryChars) {
Client cli("https://localhost:8080");
MultipartFormDataItems items{
MultipartFormDataItemsForClientInput items{
{"document", buffer.str(), "2MB_data", "application/octet-stream"},
{"hello", "world", "", ""},
};
@ -7938,7 +7940,7 @@ TEST(MultipartFormDataTest, PutFormData) {
Client cli("https://localhost:8080");
cli.enable_server_certificate_verification(false);
MultipartFormDataItems items{
MultipartFormDataItemsForClientInput items{
{"document", buffer.str(), "2MB_data", "application/octet-stream"},
{"hello", "world", "", ""},
};
@ -8002,7 +8004,7 @@ TEST(MultipartFormDataTest, PutFormDataCustomBoundary) {
Client cli("https://localhost:8080");
cli.enable_server_certificate_verification(false);
MultipartFormDataItems items{
MultipartFormDataItemsForClientInput items{
{"document", buffer.str(), "2MB_data", "application/octet-stream"},
{"hello", "world", "", ""},
};
@ -8021,7 +8023,7 @@ TEST(MultipartFormDataTest, PutInvalidBoundaryChars) {
Client cli("https://localhost:8080");
cli.enable_server_certificate_verification(false);
MultipartFormDataItems items{
MultipartFormDataItemsForClientInput items{
{"document", buffer.str(), "2MB_data", "application/octet-stream"},
{"hello", "world", "", ""},
};