X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=f85046fd75713dfcd32696695f0658b4d998b1f9;hb=dd501fba3fd7e5806186b79fa1d7c2b464884e69;hp=e0a3e9d5c55ba91193783908e7c6ee8340aec35d;hpb=31958fcac3198685291b072743f11300d27251af;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index e0a3e9d5c..f85046fd7 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -2,71 +2,64 @@ * | 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-2008 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 "modules.h" -#include "inspsocket.h" -#include "helperfuncs.h" +#include "inspircd.h" #include "httpd.h" /* $ModDesc: Provides HTTP serving facilities to modules */ +/* $ModDep: httpd.h */ -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_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 */ }; -class HttpSocket : public InspSocket +/** A socket used for HTTP transport + */ +class HttpServerSocket : public BufferedSocket { FileReader* index; HttpState InternalState; - std::stringstream headers; + + HTTPHeaders headers; + std::string reqbuffer; + std::string postdata; + unsigned int postsize; + std::string request_type; + std::string uri; + std::string http_version; 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, int newfd, char* ip, FileReader* ind) : BufferedSocket(SI, newfd, ip), index(ind), postsize(0) { - log(DEBUG,"HttpSocket constructor"); - InternalState = HTTP_LISTEN; + InternalState = HTTP_SERVE_WAIT_REQUEST; } - HttpSocket(int newfd, char* ip, FileReader* ind) : InspSocket(newfd, ip), index(ind) + FileReader* GetIndex() { - InternalState = HTTP_SERVE_WAIT_REQUEST; + return index; } - virtual int OnIncomingConnection(int newsock, char* ip) + ~HttpServerSocket() { - if (InternalState == HTTP_LISTEN) - { - HttpSocket* s = new HttpSocket(newsock, ip, index); - Srv->AddSocket(s); - } - return true; } virtual void OnClose() @@ -160,179 +153,283 @@ class HttpSocket : public InspSocket default: return "WTF"; break; - + } } - void SendHeaders(unsigned long size, int response, const std::string &extraheaders) + void SendHTTPError(int response) + { + HTTPHeaders empty; + std::string data = "Server error "+ConvToStr(response)+": "+Response(response)+"
"+ + "Powered by InspIRCd"; + + SendHeaders(data.length(), response, empty); + this->Write(data); + } + + void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders) { - struct tm *timeinfo = localtime(&TIME); - this->Write("HTTP/1.1 "+ConvToStr(response)+" "+Response(response)+"\r\nDate: "); - this->Write(asctime(timeinfo)); - 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"); + + this->Write(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n"); + + 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.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"); } virtual bool OnDataReady() { - char* data = this->Read(); - std::string request_type; - std::string uri; - std::string http_version; + const char* data = this->Read(); /* Check that the data read is a valid pointer and it has some content */ - if (data && *data) + if (!data || !*data) + return false; + + if (InternalState == HTTP_SERVE_RECV_POSTDATA) { - headers << data; + postdata.append(data); + if (postdata.length() >= postsize) + ServeData(); + } + else + { + reqbuffer.append(data); - if (headers.str().find("\r\n\r\n") != std::string::npos) + if (reqbuffer.length() >= 8192) { - /* Headers are complete */ - InternalState = HTTP_SERVE_SEND_DATA; + ServerInstance->Logs->Log("m_httpd",DEBUG, "m_httpd dropped connection due to an oversized request buffer"); + reqbuffer.clear(); + return false; + } - headers >> request_type; - headers >> uri; - headers >> http_version; + if (InternalState == HTTP_SERVE_WAIT_REQUEST) + CheckRequestBuffer(); + } - if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0")) - { - SendHeaders(0, 505, ""); - } - else + 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()) { - 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()); - Event e((char*)&httpr, (Module*)HttpModule, "httpd_url"); - e.Send(); - - if (!claimed) - { - SendHeaders(0, 404, ""); - log(DEBUG,"Page not claimed, 404"); - } - } + SendHTTPError(400); + return; } - return false; + hbegin = hend + 2; + continue; } - return true; + + 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); + 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); + 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); + reqbuffer.erase(0, postsize); + } + else if (!reqbuffer.empty()) + { + postdata = reqbuffer; + reqbuffer.clear(); + } + + if (postdata.length() >= postsize) + ServeData(); + + return; + } + + ServeData(); + } + + void ServeData() + { + InternalState = HTTP_SERVE_SEND_DATA; + + if ((request_type == "GET") && (uri == "/")) + { + HTTPHeaders empty; + SendHeaders(index->ContentSize(), 200, empty); + this->Write(index->Contents()); } else { - /* Bastard client closed the socket on us! - * Oh wait, theyre SUPPOSED to do that! - */ - return false; + claimed = false; + HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP(),postdata); + Event acl((char*)&httpr, (Module*)HttpModule, "httpd_acl"); + acl.Send(this->ServerInstance); + if (!claimed) + { + Event e((char*)&httpr, (Module*)HttpModule, "httpd_url"); + e.Send(this->ServerInstance); + if (!claimed) + { + SendHTTPError(404); + } + } } } - void Page(std::stringstream* n, int response, std::string& extraheaders) + void Page(std::stringstream* n, int response, HTTPHeaders *hheaders) { - log(DEBUG,"Sending page"); - SendHeaders(n->str().length(), response, extraheaders); + SendHeaders(n->str().length(), response, *hheaders); this->Write(n->str()); } }; -class ModuleHttp : public Module +/** Spawn HTTP sockets from a listener + */ +class HttpListener : public ListenSocketBase { - int port; - std::string host; - std::string bindip; - std::string indexfile; - - FileReader index; - - HttpSocket* http; + FileReader* index; public: - - void ReadConfig() + HttpListener(InspIRCd* Instance, FileReader *idx, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr) { - 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); + this->index = idx; + } - index.LoadFile(this->indexfile); + virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip) + { + new HttpServerSocket(ServerInstance, nfd, (char *)incomingip.c_str(), index); // ugly cast courtesy of bufferedsocket } +}; - void CreateListener() +class ModuleHttpServer : public Module +{ + std::vector httpsocks; + std::vector httplisteners; + public: + + void ReadConfig() { - http = new HttpSocket(this->bindip, this->port, true, 0, &index); - if ((http) && (http->GetState() == I_LISTENING)) + int port; + std::string host; + std::string bindip; + std::string indexfile; + FileReader* index; + HttpListener *http; + ConfigReader c(ServerInstance); + + httpsocks.clear(); // XXX this will BREAK if this module is made rehashable + httplisteners.clear(); + + 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 HttpListener(ServerInstance, index, port, (char *)bindip.c_str()); // XXX this cast SUCKS. + httplisteners.push_back(http); } } - ModuleHttp(Server* Me) : Module::Module(Me) + ModuleHttpServer(InspIRCd* Me) : Module(Me) { - Srv = Me; ReadConfig(); - CreateListener(); - } - - void OnEvent(Event* event) - { + HttpModule = this; + Implementation eventlist[] = { I_OnRequest }; + ServerInstance->Modules->Attach(eventlist, this, 1); } - char* OnRequest(Request* request) + virtual const char* OnRequest(Request* request) { - log(DEBUG,"Got HTTPDocument object"); claimed = true; HTTPDocument* doc = (HTTPDocument*)request->GetData(); - HttpSocket* sock = (HttpSocket*)doc->sock; - sock->Page(doc->GetDocument(), doc->GetResponseCode(), doc->GetExtraHeaders()); + HttpServerSocket* sock = (HttpServerSocket*)doc->sock; + sock->Page(doc->GetDocument(), doc->GetResponseCode(), &doc->headers); return NULL; } - void Implements(char* List) - { - List[I_OnEvent] = List[I_OnRequest] = 1; - } - virtual ~ModuleHttp() + virtual ~ModuleHttpServer() { - Srv->DelSocket(http); - } + for (size_t i = 0; i < httplisteners.size(); i++) + { + delete httplisteners[i]; + } - virtual Version GetVersion() - { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + for (size_t i = 0; i < httpsocks.size(); i++) + { + ServerInstance->SE->DelFd(httpsocks[i]); + httpsocks[i]->Close(); + delete httpsocks[i]->GetIndex(); + } + ServerInstance->BufferedSocketCull(); } -}; - -class ModuleHttpFactory : public ModuleFactory -{ - public: - ModuleHttpFactory() - { - } - - ~ModuleHttpFactory() - { - } - - virtual Module * CreateModule(Server* Me) + virtual Version GetVersion() { - HttpModule = new ModuleHttp(Me); - return HttpModule; + return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); } }; - -extern "C" void * init_module( void ) -{ - return new ModuleHttpFactory; -} +MODULE_INIT(ModuleHttpServer)