Skip to content

Add upper limit of dowloaded response size #743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metsma wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add upper limit of dowloaded response size #743

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/crypto/Connect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ using namespace std;
throw ex; \
}

static constexpr size_t MAX_RESPONSE_SIZE = 10 * 1024 * 1024;



Connect::Connect(const string &_url, string _method, int _timeout, const vector<X509Cert> &certs, const string &userAgentData, const string &version)
Expand Down Expand Up @@ -207,8 +209,11 @@ string Connect::decompress(const string &encoding, const string &data)

string out(2048, 0);
do {
if(s.total_out >= out.size())
if(s.total_out >= out.size()) {
if(out.size() >= MAX_RESPONSE_SIZE)
THROW_NETWORKEXCEPTION("HTTP decompressed response exceeds maximum allowed size of %zu bytes", MAX_RESPONSE_SIZE)
out.resize(out.size() * 2);
}
s.next_out = (Bytef*)&out[s.total_out];
s.avail_out = uInt(uLong(out.size()) - s.total_out);
switch(inflate(&s, Z_NO_FLUSH))
Expand Down Expand Up @@ -244,8 +249,13 @@ Connect::Result Connect::exec(initializer_list<pair<string_view,string_view>> he
r.content.resize(1024);
chrono::high_resolution_clock::time_point start = chrono::high_resolution_clock::now();
do {
if(rc > 0 && (pos += size_t(rc)) >= r.content.size())
r.content.resize(r.content.size()*2);
if(rc > 0) {
pos += size_t(rc);
if(pos > MAX_RESPONSE_SIZE)
THROW_NETWORKEXCEPTION("HTTP response exceeds maximum allowed size of %zu bytes", MAX_RESPONSE_SIZE)
if(pos >= r.content.size())
r.content.resize(r.content.size() * 2);
}
rc = BIO_read(d, &r.content[pos], int(r.content.size() - pos));
if(rc == -1 && BIO_should_read(d) != 1)
break;
Expand Down
Loading