oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Don't restrict multipart requests to POST

Browse source
This commit is contained in:
sfan5 2025-04-25 15:19:28 +02:00
parent 4164cea58f
commit d937cd9b90
3 changed files with 45 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/lua_api.md
View file

@ -11849,7 +11849,7 @@ Used by `HTTPApiTable.fetch` and `HTTPApiTable.fetch_async`.
multipart = boolean
-- Optional, if true performs a multipart HTTP request.
-- Default is false.
-- Post only, data must be array
-- Not allowed for GET method and `data` must be a table.
post_data = "Raw POST request data string" OR {field1 = "data1", field2 = "data2"},
-- Deprecated, use `data` instead. Forces `method = "POST"`.

32
src/httpfetch.cpp
View file

@ -275,17 +275,10 @@ HTTPFetchOngoing::HTTPFetchOngoing(const HTTPFetchRequest &request_,
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &result.data);
}
// Set data from fields or raw_data
if (request.multipart) {
multipart_mime = curl_mime_init(curl);
for (auto &it : request.fields) {
curl_mimepart *part = curl_mime_addpart(multipart_mime);
curl_mime_name(part, it.first.c_str());
curl_mime_data(part, it.second.c_str(), it.second.size());
}
curl_easy_setopt(curl, CURLOPT_MIMEPOST, multipart_mime);
} else {
// Configure the method
switch (request.method) {
default:
assert(false);
case HTTP_GET:
curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
break;
@ -299,7 +292,18 @@ HTTPFetchOngoing::HTTPFetchOngoing(const HTTPFetchRequest &request_,
curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "DELETE");
break;
}
if (request.method != HTTP_GET) {
// Set data from fields or raw_data
if (request.multipart) {
assert(request.method != HTTP_GET);
multipart_mime = curl_mime_init(curl);
for (auto &it : request.fields) {
curl_mimepart *part = curl_mime_addpart(multipart_mime);
curl_mime_name(part, it.first.c_str());
curl_mime_data(part, it.second.c_str(), it.second.size());
}
curl_easy_setopt(curl, CURLOPT_MIMEPOST, multipart_mime);
} else if (request.method != HTTP_GET) {
if (request.fields.empty()) {
// Note that we need to set this to an empty buffer (not NULL)
// even if no data is to be sent.
@ -320,10 +324,10 @@ HTTPFetchOngoing::HTTPFetchOngoing(const HTTPFetchRequest &request_,
curl_easy_setopt(curl, CURLOPT_COPYPOSTFIELDS, str.c_str());
}
}
}
// Set additional HTTP headers
for (const std::string &extra_header : request.extra_headers) {
http_header = curl_slist_append(http_header, extra_header.c_str());
for (const auto &s : request.extra_headers) {
http_header = curl_slist_append(http_header, s.c_str());
}
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, http_header);

9
src/httpfetch.h
View file

@ -55,23 +55,22 @@ struct HTTPFetchRequest
long connect_timeout;
// Indicates if this is multipart/form-data or
// application/x-www-form-urlencoded. POST-only.
// application/x-www-form-urlencoded. Not allowed for GET.
bool multipart = false;
// The Method to use default = GET
// Avaible methods GET, POST, PUT, DELETE
// Method to use
HttpMethod method = HTTP_GET;
// Fields of the request
StringMap fields;
// Raw data of the request (instead of fields)
// Raw data of the request (instead of fields, ignored if multipart)
std::string raw_data;
// If not empty, should contain entries such as "Accept: text/html"
std::vector<std::string> extra_headers;
// useragent to use
// User agent to send
std::string useragent;
HTTPFetchRequest();