7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-14 19:15:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge 9c61f74efd into 13b30e591a

Browse source
This commit is contained in:
B1rtek 2024-11-14 11:53:16 -03:00 committed by GitHub
commit 120ea81743
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
loader/include/Geode/utils/web.hpp
View file

@ -83,6 +83,7 @@ namespace geode::utils::web {
std::vector<std::string> headers() const;
std::optional<std::string> header(std::string_view name) const;
std::optional<std::vector<std::string>> headersWithName(std::string_view name) const;
};
class GEODE_DLL WebProgress final {
@ -288,7 +289,7 @@ namespace geode::utils::web {
*
* @return std::unordered_map<std::string, std::string>
*/
std::unordered_map<std::string, std::string> getHeaders() const;
std::unordered_map<std::string, std::vector<std::string>> getHeaders() const;
/**
* Gets the parameters inside the URL

40
loader/src/utils/web.cpp
View file

@ -96,7 +96,7 @@ class WebResponse::Impl {
public:
int m_code;
ByteVector m_data;
std::unordered_map<std::string, std::string> m_headers;
std::unordered_map<std::string, std::vector<std::string>> m_headers;
Result<> into(std::filesystem::path const& path) const;
};
@ -146,8 +146,14 @@ std::vector<std::string> WebResponse::headers() const {
}
std::optional<std::string> WebResponse::header(std::string_view name) const {
auto str = std::string(name);
if (m_impl->m_headers.contains(str)) {
if (auto str = std::string(name); m_impl->m_headers.contains(str)) {
return m_impl->m_headers.at(str).at(0);
}
return std::nullopt;
}
std::optional<std::vector<std::string>> WebResponse::headersWithName(std::string_view name) const {
if (auto str = std::string(name); m_impl->m_headers.contains(str)) {
return m_impl->m_headers.at(str);
}
return std::nullopt;
@ -189,7 +195,7 @@ public:
std::string m_method;
std::string m_url;
std::unordered_map<std::string, std::string> m_headers;
std::unordered_map<std::string, std::vector<std::string>> m_headers;
std::unordered_map<std::string, std::string> m_urlParameters;
std::optional<std::string> m_userAgent;
std::optional<std::string> m_acceptEncodingType;
@ -270,16 +276,18 @@ WebTask WebRequest::send(std::string_view method, std::string_view url) {
// Set headers
curl_slist* headers = nullptr;
for (auto& [name, value] : impl->m_headers) {
for (auto& [name, values] : impl->m_headers) {
// Sanitize header name
auto header = name;
header.erase(std::remove_if(header.begin(), header.end(), [](char c) {
return c == '\r' || c == '\n';
}), header.end());
// Append value
for (const auto& value: values) {
header += ": " + value;
headers = curl_slist_append(headers, header.c_str());
}
}
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers);
// Add parameters to the URL and pass it to curl
@ -406,7 +414,14 @@ WebTask WebRequest::send(std::string_view method, std::string_view url) {
if (value.ends_with('\r')) {
value = value.substr(0, value.size() - 1);
}
headers.insert_or_assign(key, value);
// Create a new vector and add to it or add to an already existing one
if (headers.contains(key)) {
headers.at(key).push_back(value);
} else {
std::vector<std::string> headerValues;
headerValues.push_back(value);
headers.insert_or_assign(key, headerValues);
}
}
return size * nitems;
}));
@ -508,7 +523,16 @@ WebRequest& WebRequest::header(std::string_view name, std::string_view value) {
}
}
m_impl->m_headers.insert_or_assign(std::string(name), std::string(value));
// Create a new vector and add to it or add to an already existing one
std::string strName = std::string(name);
std::string strValue = std::string(value);
if (m_impl->m_headers.contains(strName)) {
m_impl->m_headers.at(strName).push_back(strValue);
} else {
std::vector<std::string> headerValues;
headerValues.push_back(strValue);
m_impl->m_headers.insert_or_assign(strName, headerValues);
}
return *this;
}
@ -609,7 +633,7 @@ std::string WebRequest::getUrl() const {
return m_impl->m_url;
}
std::unordered_map<std::string, std::string> WebRequest::getHeaders() const {
std::unordered_map<std::string, std::vector<std::string>> WebRequest::getHeaders() const {
return m_impl->m_headers;
}