PurpleI2P
/
i2pd
mirror of https://github.com/PurpleI2P/i2pd.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

* HTTPProxy.cpp : 

* migrate to HTTPReq
  * change work with buffers
  * code cleanup
pull/572/head
hagen 9 years ago
parent
642b01bf0d
commit
8deb327b3b
1 changed files with 101 additions and 161 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 258
      HTTPProxy.cpp

258
HTTPProxy.cpp
Unescape View File

@ -34,47 +34,29 @@ namespace proxy {
class HTTPReqHandler: public i2p::client::I2PServiceHandler, public std::enable_shared_from_this<HTTPReqHandler> class HTTPReqHandler: public i2p::client::I2PServiceHandler, public std::enable_shared_from_this<HTTPReqHandler>
{ {
private: private:
enum state
{
GET_METHOD,
GET_HOSTNAME,
GET_HTTPV,
GET_HTTPVNL, //TODO: fallback to finding HOst: header if needed
DONE
};
void EnterState(state nstate); bool HandleRequest();
bool HandleData(uint8_t *http_buff, std::size_t len);
void HandleSockRecv(const boost::system::error_code & ecode, std::size_t bytes_transfered); void HandleSockRecv(const boost::system::error_code & ecode, std::size_t bytes_transfered);
void Terminate(); void Terminate();
void AsyncSockRead(); void AsyncSockRead();
void HTTPRequestFailed(const char *message); void HTTPRequestFailed(const char *message);
void RedirectToJumpService(std::string & host); void RedirectToJumpService(std::string & host);
bool ValidateHTTPRequest();
bool ExtractAddressHelper(i2p::http::URL & url, std::string & b64); bool ExtractAddressHelper(i2p::http::URL & url, std::string & b64);
void SanitizeHTTPRequest(i2p::http::HTTPReq & req); void SanitizeHTTPRequest(i2p::http::HTTPReq & req);
bool CreateHTTPRequest(uint8_t *http_buff, std::size_t len);
void SentHTTPFailed(const boost::system::error_code & ecode); void SentHTTPFailed(const boost::system::error_code & ecode);
void HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream); void HandleStreamRequestComplete (std::shared_ptr<i2p::stream::Stream> stream);
uint8_t m_recv_buf[8192]; uint8_t m_recv_chunk[8192];
std::string m_request; //Data left to be sent. TODO: rename to m_send_buf std::string m_recv_buf; // from client
std::string m_send_buf; // to upstream
std::shared_ptr<boost::asio::ip::tcp::socket> m_sock; std::shared_ptr<boost::asio::ip::tcp::socket> m_sock;
std::string m_url; //URL
std::string m_method; //Method
std::string m_version; //HTTP version
std::string m_address; //Address
std::string m_path; //Path
int m_port; //Port
state m_state;//Parsing state
public: public:
HTTPReqHandler(HTTPProxy * parent, std::shared_ptr<boost::asio::ip::tcp::socket> sock) : HTTPReqHandler(HTTPProxy * parent, std::shared_ptr<boost::asio::ip::tcp::socket> sock) :
I2PServiceHandler(parent), m_sock(sock) I2PServiceHandler(parent), m_sock(sock) {}
{ EnterState(GET_METHOD); }
~HTTPReqHandler() { Terminate(); } ~HTTPReqHandler() { Terminate(); }
void Handle () { AsyncSockRead(); } void Handle () { AsyncSockRead(); } /* overload */
}; };
void HTTPReqHandler::AsyncSockRead() void HTTPReqHandler::AsyncSockRead()
@ -84,7 +66,7 @@ namespace proxy {
LogPrint(eLogError, "HTTPProxy: no socket for read"); LogPrint(eLogError, "HTTPProxy: no socket for read");
return; return;
} }
m_sock->async_receive(boost::asio::buffer(m_recv_buf, sizeof(m_recv_buf)), m_sock->async_read_some(boost::asio::buffer(m_recv_chunk, sizeof(m_recv_chunk)),
std::bind(&HTTPReqHandler::HandleSockRecv, shared_from_this(), std::bind(&HTTPReqHandler::HandleSockRecv, shared_from_this(),
std::placeholders::_1, std::placeholders::_2)); std::placeholders::_1, std::placeholders::_2));
} }
@ -100,8 +82,6 @@ namespace proxy {
Done(shared_from_this()); Done(shared_from_this());
} }
/* All hope is lost beyond this point */
//TODO: handle this apropriately
void HTTPReqHandler::HTTPRequestFailed(const char *message) void HTTPReqHandler::HTTPRequestFailed(const char *message)
{ {
i2p::http::HTTPRes res; i2p::http::HTTPRes res;
@ -137,22 +117,6 @@ namespace proxy {
std::bind(&HTTPReqHandler::SentHTTPFailed, shared_from_this(), std::placeholders::_1)); std::bind(&HTTPReqHandler::SentHTTPFailed, shared_from_this(), std::placeholders::_1));
} }
void HTTPReqHandler::EnterState(HTTPReqHandler::state nstate)
{
m_state = nstate;
}
bool HTTPReqHandler::ValidateHTTPRequest()
{
if ( m_version != "HTTP/1.0" && m_version != "HTTP/1.1" )
{
LogPrint(eLogError, "HTTPProxy: unsupported version: ", m_version);
HTTPRequestFailed("unsupported HTTP version");
return false;
}
return true;
}
bool HTTPReqHandler::ExtractAddressHelper(i2p::http::URL & url, std::string & b64) bool HTTPReqHandler::ExtractAddressHelper(i2p::http::URL & url, std::string & b64)
{ {
const char *param = "i2paddresshelper="; const char *param = "i2paddresshelper=";
@ -197,129 +161,110 @@ namespace proxy {
req.add_header("User-Agent", "MYOB/6.66 (AN/ON)", true); /* privacy */ req.add_header("User-Agent", "MYOB/6.66 (AN/ON)", true); /* privacy */
} }
bool HTTPReqHandler::CreateHTTPRequest(uint8_t *http_buff, std::size_t len) /**
{ * @brief Try to parse request from @a m_recv_buf
std::string b64; * If parsing success, rebuild request and store to @a m_send_buf
* with remaining data tail
* @return true on processed request or false if more data needed
*/
bool HTTPReqHandler::HandleRequest()
{
i2p::http::HTTPReq req;
i2p::http::URL url; i2p::http::URL url;
url.parse(m_url); std::string b64;
m_address = url.host; /* < compatibility */ int req_len = 0;
m_port = url.port; /* < compatibility */
if (!m_port) { req_len = req.parse(m_recv_buf);
m_port = (url.schema == "https") ? 443 : 80;
if (req_len == 0)
return false; /* need more data */
if (req_len < 0) {
LogPrint(eLogError, "HTTPProxy: unable to parse request");
HTTPRequestFailed("invalid request");
return true; /* parse error */
} }
url.schema = "";
url.host = "";
m_path = url.to_string(); /* < compatibility */
if (!ValidateHTTPRequest()) return false;
/* TODO: notify user */ /* parsing success, now let's look inside request */
LogPrint(eLogDebug, "HTTPProxy: requested: ", req.uri);
url.parse(req.uri);
/* TODO: show notice page with original link */
if (ExtractAddressHelper(url, b64)) { if (ExtractAddressHelper(url, b64)) {
i2p::client::context.GetAddressBook ().InsertAddress (url.host, b64); i2p::client::context.GetAddressBook ().InsertAddress (url.host, b64);
LogPrint (eLogInfo, "HTTPProxy: added b64 from addresshelper for ", url.host, " to address book"); std::string message = "added b64 from addresshelper for " + url.host + " to address book";
LogPrint (eLogInfo, "HTTPProxy: ", message);
message += ", please reload page";
HTTPRequestFailed(message.c_str());
return true; /* request processed */
} }
i2p::data::IdentHash identHash; SanitizeHTTPRequest(req);
if (str_rmatch(m_address, ".i2p"))
{
if (!i2p::client::context.GetAddressBook ().GetIdentHash (m_address, identHash)){
RedirectToJumpService(m_address);
return false;
}
}
m_request = m_method; std::string dest_host = url.host;
m_request.push_back(' '); uint16_t dest_port = url.port;
m_request += m_path; /* always set port, even if missing in request */
m_request.push_back(' '); if (!dest_port) {
m_request += m_version; dest_port = (url.schema == "https") ? 443 : 80;
m_request.push_back('\r'); }
m_request.push_back('\n'); /* detect dest_host, set proper 'Host' header in upstream request */
m_request.append("Connection: close\r\n"); auto h = req.headers.find("Host");
// TODO: temporary shortcut. Must be implemented properly if (dest_host != "") {
uint8_t * eol = nullptr; /* absolute url, replace 'Host' header */
bool isEndOfHeader = false; std::string h = dest_host;
while (!isEndOfHeader && len && (eol = (uint8_t *)memchr (http_buff, '\r', len))) if (dest_port != 0 && dest_port != 80)
{ h += ":" + std::to_string(dest_port);
if (eol) req.add_header("Host", h, true);
{ } else if (h != req.headers.end()) {
*eol = 0; eol++; /* relative url and 'Host' header provided. transparent proxy mode? */
if (strncmp ((const char *)http_buff, "Referer", 7) && strncmp ((const char *)http_buff, "Connection", 10)) // strip out referer and connection i2p::http::URL u;
{ std::string t = "http://" + h->second;
if (!strncmp ((const char *)http_buff, "User-Agent", 10)) // replace UserAgent u.parse(t);
m_request.append("User-Agent: MYOB/6.66 (AN/ON)"); dest_host = u.host;
else dest_port = u.port;
m_request.append ((const char *)http_buff); } else {
m_request.append ("\r\n"); /* relative url and missing 'Host' header */
} const char *message = "Can't detect destination host from request";
isEndOfHeader = !http_buff[0]; HTTPRequestFailed(message);
auto l = eol - http_buff;
http_buff = eol;
len -= l;
if (len > 0) // \r
{
http_buff++;
len--;
}
}
}
m_request.append(reinterpret_cast<const char *>(http_buff),len);
return true; return true;
} }
bool HTTPReqHandler::HandleData(uint8_t *http_buff, std::size_t len) /* check dest_host really exists and inside I2P network */
{ i2p::data::IdentHash identHash;
while (len > 0) if (str_rmatch(dest_host, ".i2p")) {
{ if (!i2p::client::context.GetAddressBook ().GetIdentHash (dest_host, identHash)) {
//TODO: fallback to finding HOst: header if needed RedirectToJumpService(dest_host); /* unknown host */
switch (m_state) return true; /* request processed */
{
case GET_METHOD:
switch (*http_buff)
{
case ' ': EnterState(GET_HOSTNAME); break;
default: m_method.push_back(*http_buff); break;
}
break;
case GET_HOSTNAME:
switch (*http_buff)
{
case ' ': EnterState(GET_HTTPV); break;
default: m_url.push_back(*http_buff); break;
}
break;
case GET_HTTPV:
switch (*http_buff)
{
case '\r': EnterState(GET_HTTPVNL); break;
default: m_version.push_back(*http_buff); break;
}
break;
case GET_HTTPVNL:
switch (*http_buff)
{
case '\n': EnterState(DONE); break;
default:
LogPrint(eLogError, "HTTPProxy: rejected invalid request ending with: ", ((int)*http_buff));
HTTPRequestFailed("rejected invalid request");
return false;
}
break;
default:
LogPrint(eLogError, "HTTPProxy: invalid state: ", m_state);
HTTPRequestFailed("invalid parser state");
return false;
} }
http_buff++; /* TODO: outproxy handler here */
len--; } else {
if (m_state == DONE) std::string message = "Host " + url.host + " not inside i2p network, but outproxy support still missing";
return CreateHTTPRequest(http_buff,len); HTTPRequestFailed(message.c_str());
LogPrint (eLogWarning, "HTTPProxy: ", message);
return true;
} }
/* make relative url */
url.schema = "";
url.host = "";
req.uri = url.to_string();
/* drop original request from recv buffer */
m_recv_buf.erase(0, req_len);
/* build new buffer from modified request and data from original request */
m_send_buf = req.to_string();
m_send_buf.append(m_recv_buf);
/* connect to destination */
LogPrint(eLogDebug, "HTTPProxy: connecting to host ", dest_host, ":", dest_port);
GetOwner()->CreateStream (std::bind (&HTTPReqHandler::HandleStreamRequestComplete,
shared_from_this(), std::placeholders::_1), dest_host, dest_port);
return true; return true;
} }
/* will be called after some data received from client */
void HTTPReqHandler::HandleSockRecv(const boost::system::error_code & ecode, std::size_t len) void HTTPReqHandler::HandleSockRecv(const boost::system::error_code & ecode, std::size_t len)
{ {
LogPrint(eLogDebug, "HTTPProxy: sock recv: ", len, " bytes"); LogPrint(eLogDebug, "HTTPProxy: sock recv: ", len, " bytes, recv buf: ", m_recv_buf.length(), ", send buf: ", m_send_buf.length());
if(ecode) if(ecode)
{ {
LogPrint(eLogWarning, "HTTPProxy: sock recv got error: ", ecode); LogPrint(eLogWarning, "HTTPProxy: sock recv got error: ", ecode);
@ -327,18 +272,13 @@ namespace proxy {
return; return;
} }
if (HandleData(m_recv_buf, len)) m_recv_buf.append(reinterpret_cast<const char *>(m_recv_chunk), len);
{ if (HandleRequest()) {
if (m_state == DONE) m_recv_buf.clear();
{ return;
LogPrint(eLogDebug, "HTTPProxy: requested: ", m_url);
GetOwner()->CreateStream (std::bind (&HTTPReqHandler::HandleStreamRequestComplete,
shared_from_this(), std::placeholders::_1), m_address, m_port);
} }
else
AsyncSockRead(); AsyncSockRead();
} }
}
void HTTPReqHandler::SentHTTPFailed(const boost::system::error_code & ecode) void HTTPReqHandler::SentHTTPFailed(const boost::system::error_code & ecode)
{ {
@ -356,10 +296,10 @@ namespace proxy {
} }
if (Kill()) if (Kill())
return; return;
LogPrint (eLogDebug, "HTTPProxy: New I2PTunnel connection"); LogPrint (eLogDebug, "HTTPProxy: Created new I2PTunnel stream");
auto connection = std::make_shared<i2p::client::I2PTunnelConnection>(GetOwner(), m_sock, stream); auto connection = std::make_shared<i2p::client::I2PTunnelConnection>(GetOwner(), m_sock, stream);
GetOwner()->AddHandler (connection); GetOwner()->AddHandler (connection);
connection->I2PConnect (reinterpret_cast<const uint8_t*>(m_request.data()), m_request.size()); connection->I2PConnect (reinterpret_cast<const uint8_t*>(m_send_buf.data()), m_send_buf.length());
Done (shared_from_this()); Done (shared_from_this());
} }

Write Preview
Loading…
Cancel
Save