-/* +------------------------------------+
+/* +------------------------------------+
* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- * E-mail:
- * <brain@chatspike.net>
- * <Craig@chatspike.net>
- *
- * Written by Craig Edwards, Craig McLure, and others.
+ * InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
* This program is free but copyrighted software; see
- * the file COPYING for details.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
-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"
/* $ModDesc: Provides HTTP serving facilities to modules */
-class ModuleHttp;
+class ModuleHttpServer;
-static ModuleHttp* HttpModule;
+static ModuleHttpServer* HttpModule;
static bool claimed;
/** HTTP socket states
HTTP_SERVE_SEND_DATA = 3
};
-class HttpSocket;
+class HttpServerSocket;
-class HTTPTimeout : public InspTimer
+/** This class is used to handle HTTP socket timeouts
+ */
+class HttpServerTimeout : public InspTimer
{
private:
- HttpSocket* s;
+ /** HttpServerSocket we are attached to
+ */
+ HttpServerSocket* s;
+ /** Socketengine the file descriptor is in
+ */
SocketEngine* SE;
public:
- HTTPTimeout(HttpSocket* sock, SocketEngine* engine);
+ /** Attach timeout to HttpServerSocket
+ */
+ HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine);
+ /** Handle timer tick
+ */
void Tick(time_t TIME);
};
/** A socket used for HTTP transport
*/
-class HttpSocket : public InspSocket
+class HttpServerSocket : public InspSocket
{
FileReader* index;
HttpState InternalState;
std::string uri;
std::string http_version;
unsigned int postsize;
- unsigned int amount;
- HTTPTimeout* Timeout;
+ HttpServerTimeout* Timeout;
public:
- HttpSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(SI, host, port, listening, maxtime), index(index_page), postsize(0)
+ HttpServerSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(SI, host, port, listening, maxtime), index(index_page), postsize(0)
{
- 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)
+ HttpServerSocket(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);
+ Timeout = new HttpServerTimeout(this, Instance->SE);
Instance->Timers->AddTimer(Timeout);
}
- ~HttpSocket()
+ FileReader* GetIndex()
+ {
+ return index;
+ }
+
+ ~HttpServerSocket()
{
if (Timeout)
- Instance->Timers->DelTimer(Timeout);
- Timeout = NULL;
+ {
+ if (Instance->Time() < Timeout->GetTimer())
+ Instance->Timers->DelTimer(Timeout);
+ Timeout = NULL;
+ }
}
virtual int OnIncomingConnection(int newsock, char* ip)
{
if (InternalState == HTTP_LISTEN)
{
- HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index);
+ HttpServerSocket* s = new HttpServerSocket(this->Instance, newsock, ip, index);
s = s; /* Stop GCC whining */
}
return true;
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);
+ Timeout = new HttpServerTimeout(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+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
if (!claimed)
{
SendHeaders(0, 404, "");
- Instance->Log(DEBUG,"Page not claimed, 404");
}
}
}
- Timeout = new HTTPTimeout(this, Instance->SE);
+ Timeout = new HttpServerTimeout(this, Instance->SE);
Instance->Timers->AddTimer(Timeout);
}
void Page(std::stringstream* n, int response, std::string& extraheaders)
{
- Instance->Log(DEBUG,"Sending page");
SendHeaders(n->str().length(), response, extraheaders);
this->Write(n->str());
}
};
-HTTPTimeout::HTTPTimeout(HttpSocket* sock, SocketEngine* engine) : InspTimer(60, time(NULL)), s(sock), SE(engine)
+HttpServerTimeout::HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine) : InspTimer(60, time(NULL)), s(sock), SE(engine)
{
}
-void HTTPTimeout::Tick(time_t TIME)
+void HttpServerTimeout::Tick(time_t TIME)
{
SE->DelFd(s);
s->Close();
+ delete s;
}
-class ModuleHttp : public Module
+class ModuleHttpServer : public Module
{
- int port;
- std::string host;
- std::string bindip;
- std::string indexfile;
-
- FileReader* index;
-
- HttpSocket* http;
-
+ std::vector<HttpServerSocket*> httpsocks;
public:
void ReadConfig()
{
+ int port;
+ std::string host;
+ std::string bindip;
+ std::string indexfile;
+ FileReader* index;
+ HttpServerSocket* 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);
+ if (!index->Exists())
+ throw ModuleException("Can't read index file: "+indexfile);
+ http = new HttpServerSocket(ServerInstance, bindip, port, true, 0, index);
+ httpsocks.push_back(http);
}
- index = new FileReader(ServerInstance, this->indexfile);
}
- void CreateListener()
+ ModuleHttpServer(InspIRCd* Me) : Module::Module(Me)
{
- 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)
char* OnRequest(Request* request)
{
- ServerInstance->Log(DEBUG,"Got HTTPDocument object");
claimed = true;
HTTPDocument* doc = (HTTPDocument*)request->GetData();
- HttpSocket* sock = (HttpSocket*)doc->sock;
+ HttpServerSocket* sock = (HttpServerSocket*)doc->sock;
sock->Page(doc->GetDocument(), doc->GetResponseCode(), doc->GetExtraHeaders());
return NULL;
}
List[I_OnEvent] = List[I_OnRequest] = 1;
}
- virtual ~ModuleHttp()
+ virtual ~ModuleHttpServer()
{
- 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,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
}
};
-class ModuleHttpFactory : public ModuleFactory
+class ModuleHttpServerFactory : public ModuleFactory
{
public:
- ModuleHttpFactory()
+ ModuleHttpServerFactory()
{
}
- ~ModuleHttpFactory()
+ ~ModuleHttpServerFactory()
{
}
virtual Module * CreateModule(InspIRCd* Me)
{
- HttpModule = new ModuleHttp(Me);
+ HttpModule = new ModuleHttpServer(Me);
return HttpModule;
}
};
extern "C" void * init_module( void )
{
- return new ModuleHttpFactory;
+ return new ModuleHttpServerFactory;
}
projects / user / henk / code / inspircd.git / blobdiff