X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=eaf6712671ccfb39b73f5996099d4255096aa1ea;hb=be609949e3ec2543d6cb16d23240870028732f36;hp=ba8990afb4001b307b6642e2a20f2ba01c201856;hpb=383caa90d568d8d997a9624a9e6174ddc1a9a3da;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index ba8990afb..eaf671267 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -1,104 +1,65 @@ -/* +------------------------------------+ +/* +------------------------------------+ * | 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 "inspircd.h" #include "httpd.h" /* $ModDesc: Provides HTTP serving facilities to modules */ +/* $ModDep: httpd.h */ -class ModuleHttp; +class ModuleHttpServer; -static ModuleHttp* HttpModule; +static ModuleHttpServer* HttpModule; static bool claimed; /** HTTP socket states */ enum HttpState { - HTTP_LISTEN = 0, - HTTP_SERVE_WAIT_REQUEST = 1, - HTTP_SERVE_RECV_POSTDATA = 2, - HTTP_SERVE_SEND_DATA = 3 -}; - -class HttpSocket; - -class HTTPTimeout : public InspTimer -{ - private: - HttpSocket* s; - SocketEngine* SE; - public: - HTTPTimeout(HttpSocket* sock, SocketEngine* engine); - void Tick(time_t TIME); + 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 */ -class HttpSocket : public InspSocket +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; - unsigned int postsize; - unsigned int amount; - HTTPTimeout* 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) - { - 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) : BufferedSocket(SI, newfd, ip), index(ind), postsize(0) { InternalState = HTTP_SERVE_WAIT_REQUEST; - Timeout = new HTTPTimeout(this, Instance->SE); - Instance->Timers->AddTimer(Timeout); } - ~HttpSocket() + FileReader* GetIndex() { - if (Timeout) - Instance->Timers->DelTimer(Timeout); - Timeout = NULL; + return index; } - virtual int OnIncomingConnection(int newsock, char* ip) + ~HttpServerSocket() { - if (InternalState == HTTP_LISTEN) - { - HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index); - s = s; /* Stop GCC whining */ - } - return true; } virtual void OnClose() @@ -192,247 +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) { + + this->Write(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n"); + 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()) + 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() + { + const char* data = this->Read(); + + /* 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) { - this->Write("Content-Type: text/html\r\n"); + postdata.append(data); + if (postdata.length() >= postsize) + ServeData(); } else { - this->Write(extraheaders); + reqbuffer.append(data); + + if (reqbuffer.length() >= 8192) + { + Instance->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(); } - this->Write("Server: InspIRCd/m_httpd.so/1.1\r\nContent-Length: "+ConvToStr(size)+ - "\r\nConnection: close\r\n\r\n"); + + return true; } - virtual bool OnDataReady() + void CheckRequestBuffer() { - char* data = this->Read(); + std::string::size_type reqend = reqbuffer.find("\r\n\r\n"); + if (reqend == std::string::npos) + return; - /* Check that the data read is a valid pointer and it has some content */ - if (data && *data) + // We have the headers; parse them all + std::string::size_type hbegin = 0, hend; + while ((hend = reqbuffer.find("\r\n", hbegin)) != std::string::npos) { - headers << data; + if (hbegin == hend) + break; - if (headers.str().find("\r\n\r\n") != std::string::npos) + if (request_type.empty()) { - if (request_type == "") - { - headers >> request_type; - headers >> uri; - headers >> http_version; - } + std::istringstream cheader(std::string(reqbuffer, hbegin, hend - hbegin)); + cheader >> request_type; + cheader >> uri; + cheader >> http_version; - 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) - { - 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 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+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) + if (request_type.empty() || uri.empty() || http_version.empty()) { - /* Add postdata, once we have it all, send the event */ - amount += strlen(data); - postdata.append(data); - if (amount >= postsize) - ServeData(); + SendHTTPError(400); + return; } - else - { - ServeData(); - } - return true; + + 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); + return; } - return true; + + headers.SetHeader(cheader.substr(0, fieldsep), cheader.substr(fieldsep + 2)); + + hbegin = hend + 2; } - else + + 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")) { - return false; + 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() { - /* 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")) + if ((request_type == "GET") && (uri == "/")) { - SendHeaders(0, 505, ""); + HTTPHeaders empty; + SendHeaders(index->ContentSize(), 200, empty); + this->Write(index->Contents()); } 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 acl((char*)&httpr, (Module*)HttpModule, "httpd_acl"); + acl.Send(this->Instance); + if (!claimed) { - 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, ""); - Instance->Log(DEBUG,"Page not claimed, 404"); + SendHTTPError(404); } } } - Timeout = new HTTPTimeout(this, Instance->SE); - Instance->Timers->AddTimer(Timeout); } - void Page(std::stringstream* n, int response, std::string& extraheaders) + void Page(std::stringstream* n, int response, HTTPHeaders *hheaders) { - Instance->Log(DEBUG,"Sending page"); - SendHeaders(n->str().length(), response, extraheaders); + SendHeaders(n->str().length(), response, *hheaders); this->Write(n->str()); } }; -HTTPTimeout::HTTPTimeout(HttpSocket* sock, SocketEngine* engine) : InspTimer(60, time(NULL)), s(sock), SE(engine) -{ -} - -void HTTPTimeout::Tick(time_t TIME) -{ - SE->DelFd(s); - s->Close(); -} - -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; + public: + HttpListener(InspIRCd* Instance, FileReader *idx, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr) + { + this->index = idx; + } + 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 + } +}; + +class ModuleHttpServer : public Module +{ + std::vector httpsocks; + std::vector httplisteners; public: void ReadConfig() { + int port; + std::string host; + std::string bindip; + std::string indexfile; + FileReader* index; + HttpListener *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(); // XXX this will BREAK if this module is made rehashable + httplisteners.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 HttpListener(ServerInstance, index, port, (char *)bindip.c_str()); // XXX this cast SUCKS. + httplisteners.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) + ModuleHttpServer(InspIRCd* Me) : Module(Me) { - index = NULL; ReadConfig(); - CreateListener(); + HttpModule = this; + Implementation eventlist[] = { I_OnRequest }; + ServerInstance->Modules->Attach(eventlist, this, 1); } - void OnEvent(Event* event) + virtual const char* OnRequest(Request* request) { - } - - char* OnRequest(Request* request) - { - ServerInstance->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() { - ServerInstance->SE->DelFd(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|VF_SERVICEPROVIDER); + 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(InspIRCd* 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)