-/* +------------------------------------+
+/* +------------------------------------+
* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
using namespace std;
-#include <stdio.h>
-#include "users.h"
-#include "channels.h"
+#include <algorithm>
#include "modules.h"
-#include "inspsocket.h"
#include "inspircd.h"
#include "httpd.h"
static ModuleHttp* HttpModule;
static bool claimed;
+/** HTTP socket states
+ */
enum HttpState
{
HTTP_LISTEN = 0,
HTTP_SERVE_SEND_DATA = 3
};
+class HttpSocket;
+
+/** This class is used to handle HTTP socket timeouts
+ */
+class HTTPTimeout : public InspTimer
+{
+ private:
+ /** HttpSocket we are attached to
+ */
+ HttpSocket* s;
+ /** Socketengine the file descriptor is in
+ */
+ SocketEngine* SE;
+ public:
+ /** Attach timeout to HttpSocket
+ */
+ HTTPTimeout(HttpSocket* sock, SocketEngine* engine);
+ /** Handle timer tick
+ */
+ void Tick(time_t TIME);
+};
+
+/** A socket used for HTTP transport
+ */
class HttpSocket : public InspSocket
{
FileReader* index;
std::string uri;
std::string http_version;
unsigned int postsize;
- unsigned int amount;
+ HTTPTimeout* Timeout;
public:
{
SI->Log(DEBUG,"HttpSocket constructor");
InternalState = HTTP_LISTEN;
+ Timeout = NULL;
}
HttpSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, newfd, ip), index(ind), postsize(0)
{
InternalState = HTTP_SERVE_WAIT_REQUEST;
+ Timeout = new HTTPTimeout(this, Instance->SE);
+ Instance->Timers->AddTimer(Timeout);
+ }
+
+ FileReader* GetIndex()
+ {
+ return index;
+ }
+
+ ~HttpSocket()
+ {
+ if (Instance->Time() < Timeout->GetTimer())
+ {
+ if (Timeout)
+ Instance->Timers->DelTimer(Timeout);
+ Timeout = NULL;
+ }
}
virtual int OnIncomingConnection(int newsock, char* ip)
void SendHeaders(unsigned long size, int response, const std::string &extraheaders)
{
time_t local = this->Instance->Time();
- struct tm *timeinfo = localtime(&local);
+ struct tm *timeinfo = gmtime(&local);
this->Write("HTTP/1.1 "+ConvToStr(response)+" "+Response(response)+"\r\nDate: ");
this->Write(asctime(timeinfo));
if (extraheaders.empty())
headers >> request_type;
headers >> uri;
headers >> http_version;
+
+ 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 ((InternalState == HTTP_SERVE_WAIT_REQUEST) && (request_type == "POST"))
{
/* Do we need to fetch postdata? */
postdata = "";
- amount = 0;
InternalState = HTTP_SERVE_RECV_POSTDATA;
std::string header_item;
while (headers >> header_item)
{
InternalState = HTTP_SERVE_SEND_DATA;
SendHeaders(0, 400, "");
+ Timeout = new HTTPTimeout(this, Instance->SE);
+ Instance->Timers->AddTimer(Timeout);
}
else
{
Instance->Log(DEBUG,"%d bytes to read for POST",postsize);
std::string::size_type x = headers.str().find("\r\n\r\n");
- postdata = headers.str().substr(x+5, headers.str().length());
+ postdata = headers.str().substr(x+4, headers.str().length());
/* Get content length and store */
+ Instance->Log(DEBUG,"Initial postdata: '%s'", postdata.c_str());
if (postdata.length() >= postsize)
ServeData();
}
else if (InternalState == HTTP_SERVE_RECV_POSTDATA)
{
/* Add postdata, once we have it all, send the event */
- amount += strlen(data);
postdata.append(data);
- if (amount >= postsize)
+ if (postdata.length() >= postsize)
ServeData();
}
else
{
/* Headers are complete */
InternalState = HTTP_SERVE_SEND_DATA;
+
+ Instance->Timers->DelTimer(Timeout);
+ Timeout = NULL;
if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
{
}
}
}
+ Timeout = new HTTPTimeout(this, Instance->SE);
+ Instance->Timers->AddTimer(Timeout);
}
void Page(std::stringstream* n, int response, std::string& extraheaders)
}
};
-class ModuleHttp : public Module
+HTTPTimeout::HTTPTimeout(HttpSocket* sock, SocketEngine* engine) : InspTimer(60, time(NULL)), s(sock), SE(engine)
{
- int port;
- std::string host;
- std::string bindip;
- std::string indexfile;
-
- FileReader* index;
+}
- HttpSocket* http;
+void HTTPTimeout::Tick(time_t TIME)
+{
+ SE->DelFd(s);
+ s->Close();
+ delete s;
+}
+class ModuleHttp : public Module
+{
+ std::vector<HttpSocket*> httpsocks;
public:
void ReadConfig()
{
+ int port;
+ std::string host;
+ std::string bindip;
+ std::string indexfile;
+ FileReader* index;
+ HttpSocket* http;
ConfigReader c(ServerInstance);
- this->host = c.ReadValue("http", "host", 0);
- this->bindip = c.ReadValue("http", "ip", 0);
- this->port = c.ReadInteger("http", "port", 0, true);
- this->indexfile = c.ReadValue("http", "index", 0);
- if (index)
+ httpsocks.clear();
+
+ for (int i = 0; i < c.Enumerate("http"); i++)
{
- delete index;
- index = NULL;
+ host = c.ReadValue("http", "host", i);
+ bindip = c.ReadValue("http", "ip", i);
+ port = c.ReadInteger("http", "port", i, true);
+ indexfile = c.ReadValue("http", "index", i);
+ index = new FileReader(ServerInstance, indexfile);
+ http = new HttpSocket(ServerInstance, bindip, port, true, 0, index);
+ httpsocks.push_back(http);
}
- index = new FileReader(ServerInstance, this->indexfile);
- }
-
- void CreateListener()
- {
- http = new HttpSocket(ServerInstance, this->bindip, this->port, true, 0, index);
}
ModuleHttp(InspIRCd* Me) : Module::Module(Me)
{
- index = NULL;
ReadConfig();
- CreateListener();
}
void OnEvent(Event* event)
virtual ~ModuleHttp()
{
- ServerInstance->SE->DelFd(http);
+ for (size_t i = 0; i < httpsocks.size(); i++)
+ {
+ ServerInstance->SE->DelFd(httpsocks[i]);
+ delete httpsocks[i]->GetIndex();
+ delete httpsocks[i];
+ }
}
virtual Version GetVersion()
{
- return Version(1,0,0,0,VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER);
+ return Version(1,0,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
}
};
projects / user / henk / code / inspircd.git / blobdiff