lib/cpp-httplib
1
0
Fork 0
mirror of synced 2025-04-21 22:25:55 +03:00
Code

Fix multipart Content-Type headers with both boundary and charset parameters (#1516)

Browse Source 
* Fix multipart Content-Type headers with both boundary and charset parameters

* Improve code readability

* Add missing forward declaration

---------

Co-authored-by: Mathieu Gaillard <gaillard@adobe.com>
This commit is contained in:
Mathieu Gaillard 2023-03-08 20:57:17 -08:00 committed by GitHub
parent 9f7ae0737a
commit df74526f91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
httplib.h
View File

@ -1823,6 +1823,8 @@ std::string params_to_query_str(const Params &params);
void parse_query_text(const std::string &s, Params &params); void parse_query_text(const std::string &s, Params &params);
bool parse_multipart_boundary(const std::string &content_type, std::string &boundary);
bool parse_range_header(const std::string &s, Ranges &ranges); bool parse_range_header(const std::string &s, Ranges &ranges);
int close_socket(socket_t sock); int close_socket(socket_t sock);
@ -3888,9 +3890,12 @@ inline void parse_query_text(const std::string &s, Params &params) {
inline bool parse_multipart_boundary(const std::string &content_type, inline bool parse_multipart_boundary(const std::string &content_type,
std::string &boundary) { std::string &boundary) {
auto pos = content_type.find("boundary="); auto boundary_keyword = "boundary=";
auto pos = content_type.find(boundary_keyword);
if (pos == std::string::npos) { return false; } if (pos == std::string::npos) { return false; }
boundary = content_type.substr(pos + 9); auto end = content_type.find(';', pos);
auto beg = pos + strlen(boundary_keyword);
boundary = content_type.substr(beg, end - beg);
if (boundary.length() >= 2 && boundary.front() == '"' && if (boundary.length() >= 2 && boundary.front() == '"' &&
boundary.back() == '"') { boundary.back() == '"') {
boundary = boundary.substr(1, boundary.size() - 2); boundary = boundary.substr(1, boundary.size() - 2);

33
test/test.cc
View File

@ -169,6 +169,39 @@ TEST(ParamsToQueryTest, ConvertParamsToQuery) {
EXPECT_EQ(detail::params_to_query_str(dic), "key1=val1&key2=val2&key3=val3"); EXPECT_EQ(detail::params_to_query_str(dic), "key1=val1&key2=val2&key3=val3");
} }
TEST(ParseMultipartBoundaryTest, DefaultValue) {
string content_type = "multipart/form-data; boundary=something";
string boundary;
auto ret = detail::parse_multipart_boundary(content_type, boundary);
EXPECT_TRUE(ret);
EXPECT_EQ(boundary, "something");
}
TEST(ParseMultipartBoundaryTest, ValueWithQuote) {
string content_type = "multipart/form-data; boundary=\"gc0pJq0M:08jU534c0p\"";
string boundary;
auto ret = detail::parse_multipart_boundary(content_type, boundary);
EXPECT_TRUE(ret);
EXPECT_EQ(boundary, "gc0pJq0M:08jU534c0p");
}
TEST(ParseMultipartBoundaryTest, ValueWithCharset) {
string content_type = "multipart/mixed; boundary=THIS_STRING_SEPARATES;charset=UTF-8";
string boundary;
auto ret = detail::parse_multipart_boundary(content_type, boundary);
EXPECT_TRUE(ret);
EXPECT_EQ(boundary, "THIS_STRING_SEPARATES");
}
TEST(ParseMultipartBoundaryTest, ValueWithQuotesAndCharset) {
string content_type =
"multipart/mixed; boundary=\"cpp-httplib-multipart-data\"; charset=UTF-8";
string boundary;
auto ret = detail::parse_multipart_boundary(content_type, boundary);
EXPECT_TRUE(ret);
EXPECT_EQ(boundary, "cpp-httplib-multipart-data");
}
TEST(GetHeaderValueTest, DefaultValue) { TEST(GetHeaderValueTest, DefaultValue) {
Headers headers = {{"Dummy", "Dummy"}}; Headers headers = {{"Dummy", "Dummy"}};
auto val = detail::get_header_value(headers, "Content-Type", 0, "text/plain"); auto val = detail::get_header_value(headers, "Content-Type", 0, "text/plain");