*/
enum HttpState
{
- HTTP_LISTEN = 0,
- HTTP_SERVE_WAIT_REQUEST = 1, /* Waiting for a full request */
- HTTP_SERVE_RECV_POSTDATA = 2, /* Waiting to finish recieving POST data */
- HTTP_SERVE_SEND_DATA = 3 /* Sending response */
+ HTTP_SERVE_WAIT_REQUEST = 0, /* Waiting for a full request */
+ HTTP_SERVE_RECV_POSTDATA = 1, /* Waiting to finish recieving POST data */
+ HTTP_SERVE_SEND_DATA = 2 /* Sending response */
};
/** A socket used for HTTP transport
{
FileReader* index;
HttpState InternalState;
-
+
HTTPHeaders headers;
std::string reqbuffer;
std::string postdata;
std::string request_type;
std::string uri;
std::string http_version;
-
- public:
- HttpServerSocket(InspIRCd* SI, std::string shost, int iport, bool listening, unsigned long maxtime, FileReader* index_page) : BufferedSocket(SI, shost, iport, listening, maxtime), index(index_page), postsize(0)
- {
- InternalState = HTTP_LISTEN;
- }
+ public:
HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : BufferedSocket(SI, newfd, ip), index(ind), postsize(0)
{
~HttpServerSocket()
{
}
-
- virtual int OnIncomingConnection(int newsock, char* ip)
- {
- if (InternalState == HTTP_LISTEN)
- {
- new HttpServerSocket(this->Instance, newsock, ip, index);
- }
- return true;
- }
virtual void OnClose()
{
default:
return "WTF";
break;
-
+
}
}
-
+
void SendHTTPError(int response)
{
HTTPHeaders empty;
std::string data = "<html><head></head><body>Server error "+ConvToStr(response)+": "+Response(response)+"<br>"+
"<small>Powered by <a href='http://www.inspircd.org'>InspIRCd</a></small></body></html>";
-
+
SendHeaders(data.length(), response, empty);
this->Write(data);
}
-
+
void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders)
{
this->Write(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n");
- time_t local = this->Instance->Time();
+ time_t local = this->ServerInstance->Time();
struct tm *timeinfo = gmtime(&local);
char *date = asctime(timeinfo);
date[strlen(date) - 1] = '\0';
rheaders.CreateHeader("Date", date);
-
- rheaders.CreateHeader("Server", "InspIRCd/m_httpd.so/1.1");
+
+ rheaders.CreateHeader("Server", "InspIRCd/m_httpd.so/1.2");
rheaders.SetHeader("Content-Length", ConvToStr(size));
-
+
if (size)
rheaders.CreateHeader("Content-Type", "text/html");
else
rheaders.RemoveHeader("Content-Type");
-
+
/* Supporting Connection: keep-alive causes a whole world of hurt syncronizing timeouts,
* so remove it, its not essential for what we need.
*/
rheaders.SetHeader("Connection", "Close");
-
+
this->Write(rheaders.GetFormattedHeaders());
this->Write("\r\n");
}
/* Check that the data read is a valid pointer and it has some content */
if (!data || !*data)
return false;
-
+
if (InternalState == HTTP_SERVE_RECV_POSTDATA)
{
postdata.append(data);
else
{
reqbuffer.append(data);
-
+
if (reqbuffer.length() >= 8192)
{
- Instance->Logs->Log("m_httpd",DEBUG, "m_httpd dropped connection due to an oversized request buffer");
+ ServerInstance->Logs->Log("m_httpd",DEBUG, "m_httpd dropped connection due to an oversized request buffer");
reqbuffer.clear();
return false;
}
-
+
if (InternalState == HTTP_SERVE_WAIT_REQUEST)
CheckRequestBuffer();
}
-
+
return true;
}
-
+
void CheckRequestBuffer()
{
std::string::size_type reqend = reqbuffer.find("\r\n\r\n");
if (reqend == std::string::npos)
return;
-
+
// We have the headers; parse them all
std::string::size_type hbegin = 0, hend;
while ((hend = reqbuffer.find("\r\n", hbegin)) != std::string::npos)
{
if (hbegin == hend)
break;
-
+
if (request_type.empty())
{
std::istringstream cheader(std::string(reqbuffer, hbegin, hend - hbegin));
cheader >> request_type;
cheader >> uri;
cheader >> http_version;
-
+
if (request_type.empty() || uri.empty() || http_version.empty())
{
SendHTTPError(400);
- Instance->SE->WantWrite(this);
return;
}
-
+
hbegin = hend + 2;
continue;
}
-
+
std::string cheader = reqbuffer.substr(hbegin, hend - hbegin);
-
+
std::string::size_type fieldsep = cheader.find(':');
if ((fieldsep == std::string::npos) || (fieldsep == 0) || (fieldsep == cheader.length() - 1))
{
SendHTTPError(400);
- Instance->SE->WantWrite(this);
return;
}
-
+
headers.SetHeader(cheader.substr(0, fieldsep), cheader.substr(fieldsep + 2));
-
+
hbegin = hend + 2;
}
-
+
reqbuffer.erase(0, reqend + 4);
-
+
std::transform(request_type.begin(), request_type.end(), request_type.begin(), ::toupper);
std::transform(http_version.begin(), http_version.end(), http_version.begin(), ::toupper);
-
+
if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
{
SendHTTPError(505);
- Instance->SE->WantWrite(this);
return;
}
-
+
if (headers.IsSet("Content-Length") && (postsize = atoi(headers.GetHeader("Content-Length").c_str())) != 0)
{
InternalState = HTTP_SERVE_RECV_POSTDATA;
-
+
if (reqbuffer.length() >= postsize)
{
postdata = reqbuffer.substr(0, postsize);
postdata = reqbuffer;
reqbuffer.clear();
}
-
+
if (postdata.length() >= postsize)
ServeData();
-
+
return;
}
-
+
ServeData();
}
HTTPHeaders empty;
SendHeaders(index->ContentSize(), 200, empty);
this->Write(index->Contents());
- Instance->SE->WantWrite(this);
}
else
{
claimed = false;
HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP(),postdata);
- Event e((char*)&httpr, (Module*)HttpModule, "httpd_url");
- e.Send(this->Instance);
+ Event acl((char*)&httpr, (Module*)HttpModule, "httpd_acl");
+ acl.Send(this->ServerInstance);
if (!claimed)
{
- SendHTTPError(404);
- Instance->SE->WantWrite(this);
+ Event e((char*)&httpr, (Module*)HttpModule, "httpd_url");
+ e.Send(this->ServerInstance);
+ if (!claimed)
+ {
+ SendHTTPError(404);
+ }
}
}
}
+ void Page(std::stringstream* n, int response, HTTPHeaders *hheaders)
+ {
+ SendHeaders(n->str().length(), response, *hheaders);
+ this->Write(n->str());
+ }
+};
+
+/** Spawn HTTP sockets from a listener
+ */
+class HttpListener : public ListenSocketBase
+{
+ FileReader* index;
- bool OnWriteReady()
+ public:
+ HttpListener(InspIRCd* Instance, FileReader *idx, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr)
{
- return false;
+ this->index = idx;
}
- void Page(std::stringstream* n, int response, HTTPHeaders *hheaders)
+ virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
{
- SendHeaders(n->str().length(), response, *hheaders);
- this->Write(n->str());
- Instance->SE->WantWrite(this);
+ new HttpServerSocket(ServerInstance, nfd, (char *)incomingip.c_str(), index); // ugly cast courtesy of bufferedsocket
}
};
class ModuleHttpServer : public Module
{
- std::vector<HttpServerSocket*> httpsocks;
+ std::vector<HttpServerSocket *> httpsocks;
+ std::vector<HttpListener *> httplisteners;
public:
void ReadConfig()
std::string bindip;
std::string indexfile;
FileReader* index;
- HttpServerSocket* http;
+ HttpListener *http;
ConfigReader c(ServerInstance);
- httpsocks.clear();
+ httpsocks.clear(); // XXX this will BREAK if this module is made rehashable
+ httplisteners.clear();
for (int i = 0; i < c.Enumerate("http"); i++)
{
index = new FileReader(ServerInstance, indexfile);
if (!index->Exists())
throw ModuleException("Can't read index file: "+indexfile);
- http = new HttpServerSocket(ServerInstance, bindip, port, true, 0, index);
- httpsocks.push_back(http);
+ http = new HttpListener(ServerInstance, index, port, (char *)bindip.c_str()); // XXX this cast SUCKS.
+ httplisteners.push_back(http);
}
}
virtual ~ModuleHttpServer()
{
+ for (size_t i = 0; i < httplisteners.size(); i++)
+ {
+ delete httplisteners[i];
+ }
+
for (size_t i = 0; i < httpsocks.size(); i++)
{
ServerInstance->SE->DelFd(httpsocks[i]);
virtual Version GetVersion()
{
- return Version(1,2,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+ return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
}
};
projects / user / henk / code / inspircd.git / blobdiff