|
|
|
|
@ -1,12 +1,7 @@
@@ -1,12 +1,7 @@
|
|
|
|
|
#include <cstdlib> |
|
|
|
|
#include <string> |
|
|
|
|
#include <algorithm> |
|
|
|
|
#include <cctype> |
|
|
|
|
#include <functional> |
|
|
|
|
#include <fstream> |
|
|
|
|
#include <set> |
|
|
|
|
#include <boost/asio.hpp> |
|
|
|
|
#include <boost/lexical_cast.hpp> |
|
|
|
|
|
|
|
|
|
#include "util.h" |
|
|
|
|
#include "Log.h" |
|
|
|
|
|
|
|
|
|
@ -60,158 +55,6 @@ namespace i2p
@@ -60,158 +55,6 @@ namespace i2p
|
|
|
|
|
{ |
|
|
|
|
namespace util |
|
|
|
|
{ |
|
|
|
|
namespace http |
|
|
|
|
{ |
|
|
|
|
std::string GetHttpContent (std::istream& response) |
|
|
|
|
{ |
|
|
|
|
std::string version, statusMessage; |
|
|
|
|
response >> version; // HTTP version
|
|
|
|
|
int status; |
|
|
|
|
response >> status; // status
|
|
|
|
|
std::getline (response, statusMessage); |
|
|
|
|
if (status == 200) // OK
|
|
|
|
|
{ |
|
|
|
|
bool isChunked = false; |
|
|
|
|
std::string header; |
|
|
|
|
while (!response.eof () && header != "\r") |
|
|
|
|
{ |
|
|
|
|
std::getline(response, header); |
|
|
|
|
auto colon = header.find (':'); |
|
|
|
|
if (colon != std::string::npos) |
|
|
|
|
{ |
|
|
|
|
std::string field = header.substr (0, colon); |
|
|
|
|
std::transform(field.begin(), field.end(), field.begin(), ::tolower); |
|
|
|
|
if (field == i2p::util::http::TRANSFER_ENCODING) |
|
|
|
|
isChunked = (header.find ("chunked", colon + 1) != std::string::npos); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
std::stringstream ss; |
|
|
|
|
if (isChunked) |
|
|
|
|
MergeChunkedResponse (response, ss); |
|
|
|
|
else |
|
|
|
|
ss << response.rdbuf(); |
|
|
|
|
return ss.str(); |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
{ |
|
|
|
|
LogPrint (eLogError, "HTTPClient: error, server responds ", status); |
|
|
|
|
return ""; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
void MergeChunkedResponse (std::istream& response, std::ostream& merged) |
|
|
|
|
{ |
|
|
|
|
while (!response.eof ()) |
|
|
|
|
{ |
|
|
|
|
std::string hexLen; |
|
|
|
|
size_t len; |
|
|
|
|
std::getline (response, hexLen); |
|
|
|
|
std::istringstream iss (hexLen); |
|
|
|
|
iss >> std::hex >> len; |
|
|
|
|
if (!len || len > 10000000L) // 10M
|
|
|
|
|
{ |
|
|
|
|
LogPrint (eLogError, "Unexpected chunk length ", len); |
|
|
|
|
break; |
|
|
|
|
} |
|
|
|
|
char * buf = new char[len]; |
|
|
|
|
response.read (buf, len); |
|
|
|
|
merged.write (buf, len); |
|
|
|
|
delete[] buf; |
|
|
|
|
std::getline (response, hexLen); // read \r\n after chunk
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
url::url(const std::string& url_s) |
|
|
|
|
{ |
|
|
|
|
portstr_ = "80"; |
|
|
|
|
port_ = 80; |
|
|
|
|
user_ = ""; |
|
|
|
|
pass_ = ""; |
|
|
|
|
|
|
|
|
|
parse(url_s); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// code for parser tests
|
|
|
|
|
//{
|
|
|
|
|
// i2p::util::http::url u_0("http://127.0.0.1:7070/asdasd?qqqqqqqqqqqq");
|
|
|
|
|
// i2p::util::http::url u_1("http://user:password@site.com:8080/asdasd?qqqqqqqqqqqqq");
|
|
|
|
|
// i2p::util::http::url u_2("http://user:password@site.com/asdasd?qqqqqqqqqqqqqq");
|
|
|
|
|
// i2p::util::http::url u_3("http://user:@site.com/asdasd?qqqqqqqqqqqqq");
|
|
|
|
|
// i2p::util::http::url u_4("http://user@site.com/asdasd?qqqqqqqqqqqq");
|
|
|
|
|
// i2p::util::http::url u_5("http://@site.com:800/asdasd?qqqqqqqqqqqq");
|
|
|
|
|
// i2p::util::http::url u_6("http://@site.com:err_port/asdasd?qqqqqqqqqqqq");
|
|
|
|
|
// i2p::util::http::url u_7("http://user:password@site.com:err_port/asdasd?qqqqqqqqqqqq");
|
|
|
|
|
//}
|
|
|
|
|
void url::parse(const std::string& url_s) |
|
|
|
|
{ |
|
|
|
|
const std::string prot_end("://"); |
|
|
|
|
std::string::const_iterator prot_i = search(url_s.begin(), url_s.end(), |
|
|
|
|
prot_end.begin(), prot_end.end()); |
|
|
|
|
protocol_.reserve(distance(url_s.begin(), prot_i)); |
|
|
|
|
transform(url_s.begin(), prot_i, |
|
|
|
|
back_inserter(protocol_), |
|
|
|
|
std::ptr_fun<int,int>(tolower)); // protocol is icase
|
|
|
|
|
if( prot_i == url_s.end() ) |
|
|
|
|
return; |
|
|
|
|
advance(prot_i, prot_end.length()); |
|
|
|
|
std::string::const_iterator path_i = find(prot_i, url_s.end(), '/'); |
|
|
|
|
host_.reserve(distance(prot_i, path_i)); |
|
|
|
|
transform(prot_i, path_i, |
|
|
|
|
back_inserter(host_), |
|
|
|
|
std::ptr_fun<int,int>(tolower)); // host is icase
|
|
|
|
|
|
|
|
|
|
// parse user/password
|
|
|
|
|
auto user_pass_i = find(host_.begin(), host_.end(), '@'); |
|
|
|
|
if (user_pass_i != host_.end()) |
|
|
|
|
{ |
|
|
|
|
std::string user_pass = std::string(host_.begin(), user_pass_i); |
|
|
|
|
auto pass_i = find(user_pass.begin(), user_pass.end(), ':'); |
|
|
|
|
if (pass_i != user_pass.end()) |
|
|
|
|
{ |
|
|
|
|
user_ = std::string(user_pass.begin(), pass_i); |
|
|
|
|
pass_ = std::string(pass_i + 1, user_pass.end()); |
|
|
|
|
} |
|
|
|
|
else |
|
|
|
|
user_ = user_pass; |
|
|
|
|
|
|
|
|
|
host_.assign(user_pass_i + 1, host_.end()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// parse port
|
|
|
|
|
auto port_i = find(host_.begin(), host_.end(), ':'); |
|
|
|
|
if (port_i != host_.end()) |
|
|
|
|
{ |
|
|
|
|
portstr_ = std::string(port_i + 1, host_.end()); |
|
|
|
|
host_.assign(host_.begin(), port_i); |
|
|
|
|
try{ |
|
|
|
|
port_ = boost::lexical_cast<decltype(port_)>(portstr_); |
|
|
|
|
} |
|
|
|
|
catch (std::exception e) { |
|
|
|
|
port_ = 80; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
std::string::const_iterator query_i = find(path_i, url_s.end(), '?'); |
|
|
|
|
path_.assign(path_i, query_i); |
|
|
|
|
if( query_i != url_s.end() ) |
|
|
|
|
++query_i; |
|
|
|
|
query_.assign(query_i, url_s.end()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
std::string urlDecode(const std::string& data) |
|
|
|
|
{ |
|
|
|
|
std::string res(data); |
|
|
|
|
for (size_t pos = res.find('%'); pos != std::string::npos; pos = res.find('%',pos+1)) |
|
|
|
|
{ |
|
|
|
|
char c = strtol(res.substr(pos+1,2).c_str(), NULL, 16); |
|
|
|
|
res.replace(pos,3,1,c); |
|
|
|
|
} |
|
|
|
|
return res; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
namespace net |
|
|
|
|
{ |
|
|
|
|
#ifdef WIN32 |
|
|
|
|
|
Jeff Becker
9 years ago