void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for post size limit in Http library.

Browse source
This commit is contained in:
Adam Ierymenko 2017-05-02 12:08:53 -07:00
parent 132643cd4a
commit fde99e2fcf
2 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
controller/JSONDB.cpp
View file

@ -97,7 +97,7 @@ bool JSONDB::writeRaw(const std::string &n,const std::string &obj)
Utils::snprintf(tmp,sizeof(tmp),"%lu",(unsigned long)obj.length()); Utils::snprintf(tmp,sizeof(tmp),"%lu",(unsigned long)obj.length());
reqHeaders["Content-Length"] = tmp; reqHeaders["Content-Length"] = tmp;
reqHeaders["Content-Type"] = "application/json"; reqHeaders["Content-Type"] = "application/json";
const unsigned int sc = Http::PUT(1048576,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),(_basePath+"/"+n).c_str(),reqHeaders,obj.data(),(unsigned long)obj.length(),headers,body); const unsigned int sc = Http::PUT(0,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),(_basePath+"/"+n).c_str(),reqHeaders,obj.data(),(unsigned long)obj.length(),headers,body);
return (sc == 200); return (sc == 200);
} else { } else {
const std::string path(_genPath(n,true)); const std::string path(_genPath(n,true));
@ -208,7 +208,7 @@ nlohmann::json JSONDB::eraseNetwork(const uint64_t networkId)
// Deletion is currently done by Central in harnessed mode // Deletion is currently done by Central in harnessed mode
//std::map<std::string,std::string> headers; //std::map<std::string,std::string> headers;
//std::string body; //std::string body;
//Http::DEL(1048576,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),(_basePath+"/"+n).c_str(),_ZT_JSONDB_GET_HEADERS,headers,body); //Http::DEL(0,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),(_basePath+"/"+n).c_str(),_ZT_JSONDB_GET_HEADERS,headers,body);
} else { } else {
const std::string path(_genPath(n,false)); const std::string path(_genPath(n,false));
if (path.length()) if (path.length())
@ -235,7 +235,7 @@ nlohmann::json JSONDB::eraseNetworkMember(const uint64_t networkId,const uint64_
// Deletion is currently done by the caller in Central harnessed mode // Deletion is currently done by the caller in Central harnessed mode
//std::map<std::string,std::string> headers; //std::map<std::string,std::string> headers;
//std::string body; //std::string body;
//Http::DEL(1048576,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),(_basePath+"/"+n).c_str(),_ZT_JSONDB_GET_HEADERS,headers,body); //Http::DEL(0,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),(_basePath+"/"+n).c_str(),_ZT_JSONDB_GET_HEADERS,headers,body);
} else { } else {
const std::string path(_genPath(n,false)); const std::string path(_genPath(n,false));
if (path.length()) if (path.length())
@ -347,7 +347,7 @@ bool JSONDB::_load(const std::string &p)
std::string body; std::string body;
std::map<std::string,std::string> headers; std::map<std::string,std::string> headers;
const unsigned int sc = Http::GET(2147483647,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),_basePath.c_str(),_ZT_JSONDB_GET_HEADERS,headers,body); const unsigned int sc = Http::GET(0,ZT_JSONDB_HTTP_TIMEOUT,reinterpret_cast<const struct sockaddr *>(&_httpAddr),_basePath.c_str(),_ZT_JSONDB_GET_HEADERS,headers,body);
if (sc == 200) { if (sc == 200) {
try { try {
nlohmann::json dbImg(OSUtils::jsonParse(body)); nlohmann::json dbImg(OSUtils::jsonParse(body));

35
osdep/Http.cpp
View file

@ -112,12 +112,12 @@ struct HttpPhyHandler
inline void phyOnTcpWritable(PhySocket *sock,void **uptr) inline void phyOnTcpWritable(PhySocket *sock,void **uptr)
{ {
if (writePtr < writeSize) { if (writePtr < (unsigned long)writeBuf.length()) {
long n = phy->streamSend(sock,writeBuf + writePtr,writeSize - writePtr,true); long n = phy->streamSend(sock,writeBuf.data() + writePtr,(unsigned long)writeBuf.length() - writePtr,true);
if (n > 0) if (n > 0)
writePtr += n; writePtr += n;
} }
if (writePtr >= writeSize) if (writePtr >= (unsigned long)writeBuf.length())
phy->setNotifyWritable(sock,false); phy->setNotifyWritable(sock,false);
} }
@ -135,8 +135,7 @@ struct HttpPhyHandler
unsigned long messageSize; unsigned long messageSize;
unsigned long writePtr; unsigned long writePtr;
uint64_t lastActivity; uint64_t lastActivity;
unsigned long writeSize; std::string writeBuf;
char writeBuf[32768];
unsigned long maxResponseSize; unsigned long maxResponseSize;
std::map<std::string,std::string> *responseHeaders; std::map<std::string,std::string> *responseHeaders;
@ -244,24 +243,26 @@ unsigned int Http::_do(
handler.lastActivity = OSUtils::now(); handler.lastActivity = OSUtils::now();
try { try {
handler.writeSize = Utils::snprintf(handler.writeBuf,sizeof(handler.writeBuf),"%s %s HTTP/1.1\r\n",method,path); char tmp[1024];
for(std::map<std::string,std::string>::const_iterator h(requestHeaders.begin());h!=requestHeaders.end();++h) Utils::snprintf(tmp,sizeof(tmp),"%s %s HTTP/1.1\r\n",method,path);
handler.writeSize += Utils::snprintf(handler.writeBuf + handler.writeSize,sizeof(handler.writeBuf) - handler.writeSize,"%s: %s\r\n",h->first.c_str(),h->second.c_str()); handler.writeBuf.append(tmp);
handler.writeSize += Utils::snprintf(handler.writeBuf + handler.writeSize,sizeof(handler.writeBuf) - handler.writeSize,"\r\n"); for(std::map<std::string,std::string>::const_iterator h(requestHeaders.begin());h!=requestHeaders.end();++h) {
if ((requestBody)&&(requestBodyLength)) { Utils::snprintf(tmp,sizeof(tmp),"%s: %s\r\n",h->first.c_str(),h->second.c_str());
if ((handler.writeSize + requestBodyLength) > sizeof(handler.writeBuf)) { handler.writeBuf.append(tmp);
responseBody = "request too large";
return 0;
}
memcpy(handler.writeBuf + handler.writeSize,requestBody,requestBodyLength);
handler.writeSize += requestBodyLength;
} }
handler.writeBuf.append("\r\n");
if ((requestBody)&&(requestBodyLength))
handler.writeBuf.append((const char *)requestBody,requestBodyLength);
} catch ( ... ) { } catch ( ... ) {
responseBody = "request too large"; responseBody = "request too large";
return 0; return 0;
} }
handler.maxResponseSize = maxResponseSize; if (maxResponseSize) {
handler.maxResponseSize = maxResponseSize;
} else {
handler.maxResponseSize = 2147483647;
}
handler.responseHeaders = &responseHeaders; handler.responseHeaders = &responseHeaders;
handler.responseBody = &responseBody; handler.responseBody = &responseBody;
handler.error = false; handler.error = false;