PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 08:14:15 +00:00
Code Issues Releases Activity

Merge pull request #22 from orignal/master

Browse Source 
Merge pull request from orignal/master
This commit is contained in:
chertov 2014-03-29 23:20:46 +03:00
commit 94f5a0f9c5
2 changed files with 94 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

152
HTTPProxy.cpp
View File

@ -1,5 +1,7 @@
#include <boost/bind.hpp> #include <boost/bind.hpp>
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
#include <boost/bind/protect.hpp>
#include <boost/regex.hpp>
#include "base64.h" #include "base64.h"
#include "Log.h" #include "Log.h"
@ -61,17 +63,12 @@ namespace proxy
{ {
m_Buffer[bytes_transferred] = 0; m_Buffer[bytes_transferred] = 0;
std::pair<std::string,std::string> requestInfo = ExtractRequest ();
request m_Request; request m_Request;
ExtractRequest (m_Request);
parseHeaders (m_Buffer, m_Request.headers); parseHeaders (m_Buffer, m_Request.headers);
LogPrint("Requesting ", requestInfo.first, " with path ", requestInfo.second); LogPrint("Requesting ", m_Request.host, " with path ", m_Request.uri, " and method ", m_Request.method);
HandleDestinationRequest (requestInfo.first, requestInfo.second); HandleDestinationRequest (m_Request.host, m_Request.uri);
boost::asio::async_write (*m_Socket, m_Reply.to_buffers(),
boost::bind (&HTTPConnection::HandleWrite, this,
boost::asio::placeholders::error));
//Receive ();
} }
else if (ecode != boost::asio::error::operation_aborted) else if (ecode != boost::asio::error::operation_aborted)
Terminate (); Terminate ();
@ -100,40 +97,46 @@ namespace proxy
} }
} }
// TODO: Support other requests than GET. void HTTPConnection::ExtractRequest (request &m_Request)
std::pair<std::string, std::string> HTTPConnection::ExtractRequest ()
{ {
char * get = strstr (m_Buffer, "GET"); std::string requestString = m_Buffer;
if (get) int idx=requestString.find(" ");
{ std::string method = requestString.substr(0,idx);
char * http = strstr (get, "HTTP"); requestString = requestString.substr(idx+1);
if (http) idx=requestString.find(" ");
{ std::string requestUrl = requestString.substr(0,idx);
std::string url (get + 4, http - get - 5); LogPrint("method is: ", method, "\nRequest is: ", requestUrl);
size_t sp = url.find_first_of ('/', 7 /* skip http:// part */ ); std::string server="";
if (sp != std::string::npos) std::string port="80";
{ boost::regex rHTTP("http://(.*?)(:(\\d+))?(/.*)");
std::string base_url (url.begin()+7, url.begin()+sp); boost::smatch m;
LogPrint ("Base URL is: ", base_url, "\n"); std::string path;
if ( sp != std::string::npos ) if(boost::regex_search(requestUrl, m, rHTTP, boost::match_extra)) {
{ server=m[1].str();
std::string query (url.begin ()+sp+1, url.end ()); if(m[2].str() != "") {
LogPrint ("Query is: ", "/" + query); port=m[3].str();
return std::make_pair (base_url, "/" + query);
}
return std::make_pair (base_url, "/");
}
} }
path=m[4].str();
} }
return std::make_pair ("",""); LogPrint("server is: ",server, "\n path is: ",path);
m_Request.uri = path;
m_Request.method = method;
m_Request.host = server;
} }
void HTTPConnection::HandleWrite (const boost::system::error_code& ecode) void HTTPConnection::HandleWriteReply (const boost::system::error_code& ecode)
{ {
Terminate (); Terminate ();
} }
void HTTPConnection::HandleWrite (const boost::system::error_code& ecode)
{
if (ecode || (m_Stream && !m_Stream->IsOpen ()))
Terminate ();
else // data keeps coming
AsyncStreamReceive ();
}
void HTTPConnection::HandleDestinationRequest (const std::string& address, const std::string& uri) void HTTPConnection::HandleDestinationRequest (const std::string& address, const std::string& uri)
{ {
i2p::data::IdentHash destination; i2p::data::IdentHash destination;
@ -155,11 +158,12 @@ namespace proxy
if (!addr) if (!addr)
{ {
LogPrint ("Unknown address ", address); LogPrint ("Unknown address ", address);
SendReply("<html>"+ i2p::proxy::itoopieImage +"<br>Unknown address " + address + "</html>");
return; return;
} }
destination = *addr; destination = *addr;
fullAddress = address; fullAddress = address;
} }
auto leaseSet = i2p::data::netdb.FindLeaseSet (destination); auto leaseSet = i2p::data::netdb.FindLeaseSet (destination);
if (!leaseSet || !leaseSet->HasNonExpiredLeases ()) if (!leaseSet || !leaseSet->HasNonExpiredLeases ())
@ -169,47 +173,57 @@ namespace proxy
leaseSet = i2p::data::netdb.FindLeaseSet (destination); leaseSet = i2p::data::netdb.FindLeaseSet (destination);
if (!leaseSet || !leaseSet->HasNonExpiredLeases ()) // still no LeaseSet if (!leaseSet || !leaseSet->HasNonExpiredLeases ()) // still no LeaseSet
{ {
m_Reply.content = leaseSet ? "<html>"+ i2p::proxy::itoopieImage +"<br>Leases expired</html>" : "<html>"+ i2p::proxy::itoopieImage +"LeaseSet not found</html>"; SendReply(leaseSet ? "<html>"+ i2p::proxy::itoopieImage +"<br>Leases expired</html>" : "<html>"+ i2p::proxy::itoopieImage +"LeaseSet not found</html>");
m_Reply.headers.resize(2);
m_Reply.headers[0].name = "Content-Length";
m_Reply.headers[0].value = boost::lexical_cast<std::string>(m_Reply.content.size());
m_Reply.headers[1].name = "Content-Type";
m_Reply.headers[1].value = "text/html";
return; return;
} }
} }
auto s = i2p::stream::CreateStream (*leaseSet); if (!m_Stream)
if (s) m_Stream = i2p::stream::CreateStream (*leaseSet);
if (m_Stream)
{ {
std::string request = "GET " + uri + " HTTP/1.1\n Host:" + fullAddress + "\n"; std::string request = "GET " + uri + " HTTP/1.1\n Host:" + fullAddress + "\n";
s->Send ((uint8_t *)request.c_str (), request.length (), 10); m_Stream->Send ((uint8_t *)request.c_str (), request.length (), 10);
std::stringstream ss; AsyncStreamReceive ();
uint8_t buf[8192]; }
size_t r = s->Receive (buf, 8192, 30); // 30 seconds }
if (!r && s->IsEstablished ()) // nothing received but connection is established
r = s->Receive (buf, 8192, 30); // wait for another 30 secondd void HTTPConnection::AsyncStreamReceive ()
if (r) // we recieved data {
{ if (m_Stream)
ss << std::string ((char *)buf, r); m_Stream->AsyncReceive (boost::asio::buffer (m_StreamBuffer, 8192),
while (s->IsOpen () && (r = s->Receive (buf, 8192, 30)) > 0) boost::protect (boost::bind (&HTTPConnection::HandleStreamReceive, this,
ss << std::string ((char *)buf,r); boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)),
45); // 45 seconds timeout
m_Reply.content = ss.str (); // send "as is" }
m_Reply.headers.resize(0); // no headers
return; void HTTPConnection::HandleStreamReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred)
} {
else // nothing received if (bytes_transferred)
ss << "<html>"+ i2p::proxy::itoopieImage +"<br>Not responding</html>"; {
s->Close (); boost::asio::async_write (*m_Socket, boost::asio::buffer (m_StreamBuffer, bytes_transferred),
DeleteStream (s); boost::bind (&HTTPConnection::HandleWrite, this, boost::asio::placeholders::error));
}
m_Reply.content = ss.str (); else
m_Reply.headers.resize(2); {
m_Reply.headers[0].name = "Content-Length"; if (m_Stream && m_Stream->IsOpen ())
m_Reply.headers[0].value = boost::lexical_cast<std::string>(m_Reply.content.size()); SendReply ("<html>"+ i2p::proxy::itoopieImage +"<br>Not responding</html>");
m_Reply.headers[1].name = "Content-Type"; else
m_Reply.headers[1].value = "text/html"; Terminate ();
} }
}
void HTTPConnection::SendReply (const std::string& content)
{
m_Reply.content = content;
m_Reply.headers.resize(2);
m_Reply.headers[0].name = "Content-Length";
m_Reply.headers[0].value = boost::lexical_cast<std::string>(m_Reply.content.size());
m_Reply.headers[1].name = "Content-Type";
m_Reply.headers[1].value = "text/html";
boost::asio::async_write (*m_Socket, m_Reply.to_buffers(),
boost::bind (&HTTPConnection::HandleWriteReply, this,
boost::asio::placeholders::error));
} }

16
HTTPProxy.h
View File

@ -24,6 +24,7 @@ namespace proxy
{ {
std::string method; std::string method;
std::string uri; std::string uri;
std::string host;
int http_version_major; int http_version_major;
int http_version_minor; int http_version_minor;
std::vector<header> headers; std::vector<header> headers;
@ -39,24 +40,29 @@ namespace proxy
public: public:
HTTPConnection (boost::asio::ip::tcp::socket * socket): m_Socket (socket) { Receive (); }; HTTPConnection (boost::asio::ip::tcp::socket * socket): m_Socket (socket), m_Stream (nullptr) { Receive (); };
~HTTPConnection () { delete m_Socket; } ~HTTPConnection () { delete m_Socket; }
private: private:
void Terminate (); void Terminate ();
void Receive (); void Receive ();
void HandleReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred); void HandleReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred);
void HandleWrite(const boost::system::error_code& ecode); void AsyncStreamReceive ();
void HandleStreamReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred);
void HandleWriteReply(const boost::system::error_code& ecode);
void HandleWrite (const boost::system::error_code& ecode);
void SendReply (const std::string& content);
void HandleDestinationRequest (const std::string& address, const std::string& uri); void HandleDestinationRequest (const std::string& address, const std::string& uri);
std::pair<std::string, std::string> ExtractRequest (); void ExtractRequest (request& m_Request);
void parseHeaders(const std::string& h, std::vector<header>& hm); void parseHeaders(const std::string& h, std::vector<header>& hm);
private: private:
boost::asio::ip::tcp::socket * m_Socket; boost::asio::ip::tcp::socket * m_Socket;
char m_Buffer[8192]; i2p::stream::Stream * m_Stream;
char m_Buffer[8192], m_StreamBuffer[8192];
request m_Request; request m_Request;
reply m_Reply; reply m_Reply;
}; };