X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=3342ba37d425690fa365649f6d9b36fe47ca033a;hb=7f00015727fab50e37de46aa90d218b31c852c87;hp=7d670ea2b67b8d5d5936170f8ddd5bfc310487ca;hpb=1e4120dd22e70782a72057a0d41f35daffbd6b01;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 7d670ea2b..3342ba37d 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -2,69 +2,109 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * 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 -#include "users.h" -#include "channels.h" +#include #include "modules.h" -#include "inspsocket.h" -#include "helperfuncs.h" +#include "inspircd.h" #include "httpd.h" /* $ModDesc: Provides HTTP serving facilities to modules */ -class ModuleHttp; +class ModuleHttpServer; -static Server *Srv; -static ModuleHttp* HttpModule; -extern time_t TIME; +static ModuleHttpServer* HttpModule; static bool claimed; +/** HTTP socket states + */ enum HttpState { HTTP_LISTEN = 0, HTTP_SERVE_WAIT_REQUEST = 1, - HTTP_SERVE_SEND_DATA = 2 + HTTP_SERVE_RECV_POSTDATA = 2, + HTTP_SERVE_SEND_DATA = 3 +}; + +class HttpServerSocket; + +/** This class is used to handle HTTP socket timeouts + */ +class HttpServerTimeout : public InspTimer +{ + private: + /** HttpServerSocket we are attached to + */ + HttpServerSocket* s; + /** Socketengine the file descriptor is in + */ + SocketEngine* SE; + public: + /** Attach timeout to HttpServerSocket + */ + HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine); + /** Handle timer tick + */ + void Tick(time_t TIME); }; -class HttpSocket : public InspSocket +/** A socket used for HTTP transport + */ +class HttpServerSocket : public InspSocket { FileReader* index; HttpState InternalState; std::stringstream headers; + std::string postdata; + std::string request_type; + std::string uri; + std::string http_version; + unsigned int postsize; + HttpServerTimeout* Timeout; public: - HttpSocket(std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(host, port, listening, maxtime), index(index_page) + 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) { - log(DEBUG,"HttpSocket constructor"); InternalState = HTTP_LISTEN; + Timeout = NULL; } - HttpSocket(int newfd, char* ip, FileReader* ind) : InspSocket(newfd, ip), index(ind) + HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, newfd, ip), index(ind), postsize(0) { InternalState = HTTP_SERVE_WAIT_REQUEST; + Timeout = new HttpServerTimeout(this, Instance->SE); + Instance->Timers->AddTimer(Timeout); + } + + FileReader* GetIndex() + { + return index; + } + + ~HttpServerSocket() + { + if (Timeout) + { + 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(newsock, ip, index); - Srv->AddSocket(s); + HttpServerSocket* s = new HttpServerSocket(this->Instance, newsock, ip, index); + s = s; /* Stop GCC whining */ } return true; } @@ -164,21 +204,27 @@ class HttpSocket : public InspSocket } } - void SendHeaders(unsigned long size, int response) + void SendHeaders(unsigned long size, int response, const std::string &extraheaders) { - struct tm *timeinfo = localtime(&TIME); + time_t local = this->Instance->Time(); + struct tm *timeinfo = gmtime(&local); this->Write("HTTP/1.1 "+ConvToStr(response)+" "+Response(response)+"\r\nDate: "); this->Write(asctime(timeinfo)); + if (extraheaders.empty()) + { + this->Write("Content-Type: text/html\r\n"); + } + else + { + this->Write(extraheaders); + } this->Write("Server: InspIRCd/m_httpd.so/1.1\r\nContent-Length: "+ConvToStr(size)+ - "\r\nConnection: close\r\nContent-Type: text/html\r\n\r\n"); + "\r\nConnection: close\r\n\r\n"); } virtual bool OnDataReady() { char* data = this->Read(); - std::string request_type; - std::string uri; - std::string http_version; /* Check that the data read is a valid pointer and it has some content */ if (data && *data) @@ -187,94 +233,154 @@ class HttpSocket : public InspSocket if (headers.str().find("\r\n\r\n") != std::string::npos) { - /* Headers are complete */ - InternalState = HTTP_SERVE_SEND_DATA; - - headers >> request_type; - headers >> uri; - headers >> http_version; - - if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0")) + if (request_type == "") { - SendHeaders(0, 505); + 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); } - else + + if ((InternalState == HTTP_SERVE_WAIT_REQUEST) && (request_type == "POST")) { - if ((request_type == "GET") && (uri == "/")) + /* Do we need to fetch postdata? */ + postdata = ""; + InternalState = HTTP_SERVE_RECV_POSTDATA; + std::string header_item; + while (headers >> header_item) { - SendHeaders(index->ContentSize(),200); - this->Write(index->Contents()); + if (header_item == "Content-Length:") + { + headers >> header_item; + postsize = atoi(header_item.c_str()); + } + } + if (!postsize) + { + InternalState = HTTP_SERVE_SEND_DATA; + SendHeaders(0, 400, ""); + Timeout = new HttpServerTimeout(this, Instance->SE); + Instance->Timers->AddTimer(Timeout); } else { - claimed = false; - HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP()); - Event e((char*)&httpr, (Module*)HttpModule, "httpd_url"); - e.Send(); - - if (!claimed) - SendHeaders(0, 404); + 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 */ + if (postdata.length() >= postsize) + ServeData(); } } - - return false; + else if (InternalState == HTTP_SERVE_RECV_POSTDATA) + { + /* Add postdata, once we have it all, send the event */ + postdata.append(data); + if (postdata.length() >= postsize) + ServeData(); + } + else + { + ServeData(); + } + return true; } return true; } else { - /* Bastard client closed the socket on us! - * Oh wait, theyre SUPPOSED to do that! - */ return false; } } - void Page(std::stringstream* n, int response) + void ServeData() { - SendHeaders(n->str().length(),response); + /* 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")) + { + SendHeaders(0, 505, ""); + } + else + { + if ((request_type == "GET") && (uri == "/")) + { + SendHeaders(index->ContentSize(), 200, ""); + this->Write(index->Contents()); + } + 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); + if (!claimed) + { + SendHeaders(0, 404, ""); + } + } + } + Timeout = new HttpServerTimeout(this, Instance->SE); + Instance->Timers->AddTimer(Timeout); + } + + void Page(std::stringstream* n, int response, std::string& extraheaders) + { + SendHeaders(n->str().length(), response, extraheaders); this->Write(n->str()); } }; -class ModuleHttp : public Module +HttpServerTimeout::HttpServerTimeout(HttpServerSocket* 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 HttpServerTimeout::Tick(time_t TIME) +{ + SE->DelFd(s); + s->Close(); + delete s; +} +class ModuleHttpServer : public Module +{ + std::vector httpsocks; public: void ReadConfig() { - ConfigReader c; - 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); + int port; + std::string host; + std::string bindip; + std::string indexfile; + FileReader* index; + HttpServerSocket* http; + ConfigReader c(ServerInstance); - index.LoadFile(this->indexfile); - } + httpsocks.clear(); - void CreateListener() - { - http = new HttpSocket(this->bindip, this->port, true, 0, &index); - if ((http) && (http->GetState() == I_LISTENING)) + for (int i = 0; i < c.Enumerate("http"); i++) { - Srv->AddSocket(http); + 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); } } - ModuleHttp(Server* Me) : Module::Module(Me) + ModuleHttpServer(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; ReadConfig(); - CreateListener(); } void OnEvent(Event* event) @@ -285,8 +391,8 @@ class ModuleHttp : public Module { claimed = true; HTTPDocument* doc = (HTTPDocument*)request->GetData(); - HttpSocket* sock = (HttpSocket*)doc->sock; - sock->Page(doc->GetDocument(), doc->GetResponseCode()); + HttpServerSocket* sock = (HttpServerSocket*)doc->sock; + sock->Page(doc->GetDocument(), doc->GetResponseCode(), doc->GetExtraHeaders()); return NULL; } @@ -295,32 +401,37 @@ class ModuleHttp : public Module List[I_OnEvent] = List[I_OnRequest] = 1; } - virtual ~ModuleHttp() + virtual ~ModuleHttpServer() { - Srv->DelSocket(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); + 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(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { - HttpModule = new ModuleHttp(Me); + HttpModule = new ModuleHttpServer(Me); return HttpModule; } }; @@ -328,5 +439,5 @@ class ModuleHttpFactory : public ModuleFactory extern "C" void * init_module( void ) { - return new ModuleHttpFactory; + return new ModuleHttpServerFactory; }