X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=88b635f6f3008e08a959fec93554e6b38500aabc;hb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;hp=fab4e19dd119e2511106b0a39de9b0968944fd5a;hpb=f54aa39428e7100a331a1364664262f8b36d7082;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index fab4e19dd..88b635f6f 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -2,77 +2,69 @@ * | 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-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/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 + 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; + std::string ip; + + HTTPHeaders headers; + std::string reqbuffer; std::string postdata; + unsigned int postsize; std::string request_type; std::string uri; std::string http_version; 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) + HttpServerSocket(int newfd, const char* IP, FileReader* ind) + : BufferedSocket(newfd), index(ind), ip(IP), postsize(0) { - SI->Log(DEBUG,"HttpSocket constructor"); - InternalState = HTTP_LISTEN; + InternalState = HTTP_SERVE_WAIT_REQUEST; } - HttpSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, 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(this->Instance, newsock, ip, index); - s = s; /* Stop GCC whining */ - } - return true; } - virtual void OnClose() + virtual void OnError(BufferedSocketError) { } @@ -163,199 +155,274 @@ class HttpSocket : public InspSocket default: return "WTF"; break; - + } } - void SendHeaders(unsigned long size, int response, const std::string &extraheaders) + void SendHTTPError(int response) { - time_t local = this->Instance->Time(); - struct tm *timeinfo = localtime(&local); - this->Write("HTTP/1.1 "+ConvToStr(response)+" "+Response(response)+"\r\nDate: "); - this->Write(asctime(timeinfo)); - if (extraheaders.empty()) + HTTPHeaders empty; + std::string data = "Server error "+ConvToStr(response)+": "+Response(response)+"
"+ + "Powered by InspIRCd"; + + SendHeaders(data.length(), response, empty); + WriteData(data); + } + + void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders) + { + + WriteData(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n"); + + time_t local = 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"); + + WriteData(rheaders.GetFormattedHeaders()); + WriteData("\r\n"); + } + + void OnDataReady() + { + if (InternalState == HTTP_SERVE_RECV_POSTDATA) { - this->Write("Content-Type: text/html\r\n"); + postdata.append(recvq); + if (postdata.length() >= postsize) + ServeData(); } else { - this->Write(extraheaders); + reqbuffer.append(recvq); + + if (reqbuffer.length() >= 8192) + { + ServerInstance->Logs->Log("m_httpd",DEBUG, "m_httpd dropped connection due to an oversized request buffer"); + reqbuffer.clear(); + SetError("Buffer"); + } + + 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"); } - 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()) { - 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 = ""; - InternalState = HTTP_SERVE_RECV_POSTDATA; - /* TODO: Get content length and store */ - } - else if (InternalState == HTTP_SERVE_RECV_POSTDATA) - { - /* Add postdata, once we have it all, send the event */ - } - else + if (request_type.empty() || uri.empty() || http_version.empty()) { - /* Headers are complete */ - InternalState = HTTP_SERVE_SEND_DATA; - - 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, ""); - Instance->Log(DEBUG,"Page not claimed, 404"); - } - } - } + SendHTTPError(400); + return; } - return false; + 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")) { - /* Bastard client closed the socket on us! - * Oh wait, theyre SUPPOSED to do that! - */ - return false; + SendHTTPError(505); + return; } - } - 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()); - } -}; + if (headers.IsSet("Content-Length") && (postsize = atoi(headers.GetHeader("Content-Length").c_str())) != 0) + { + InternalState = HTTP_SERVE_RECV_POSTDATA; -class ModuleHttp : public Module -{ - int port; - std::string host; - std::string bindip; - std::string indexfile; + if (reqbuffer.length() >= postsize) + { + postdata = reqbuffer.substr(0, postsize); + reqbuffer.erase(0, postsize); + } + else if (!reqbuffer.empty()) + { + postdata = reqbuffer; + reqbuffer.clear(); + } - FileReader* index; + if (postdata.length() >= postsize) + ServeData(); - HttpSocket* http; + return; + } - public: + ServeData(); + } - void ReadConfig() + void ServeData() { - 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); + InternalState = HTTP_SERVE_SEND_DATA; - if (index) + if ((request_type == "GET") && (uri == "/")) { - delete index; - index = NULL; + HTTPHeaders empty; + SendHeaders(index->ContentSize(), 200, empty); + WriteData(index->Contents()); + } + else + { + claimed = false; + HTTPRequest acl((Module*)HttpModule, "httpd_acl", request_type, uri, &headers, this, ip, postdata); + acl.Send(); + if (!claimed) + { + HTTPRequest url((Module*)HttpModule, "httpd_url", request_type, uri, &headers, this, ip, postdata); + url.Send(); + if (!claimed) + { + SendHTTPError(404); + } + } } - index = new FileReader(ServerInstance, this->indexfile); } - void CreateListener() + void Page(std::stringstream* n, int response, HTTPHeaders *hheaders) { - http = new HttpSocket(ServerInstance, this->bindip, this->port, true, 0, index); + SendHeaders(n->str().length(), response, *hheaders); + WriteData(n->str()); } +}; - ModuleHttp(InspIRCd* Me) : Module::Module(Me) - { - index = NULL; - ReadConfig(); - CreateListener(); - } +/** Spawn HTTP sockets from a listener + */ +class HttpListener : public ListenSocketBase +{ + FileReader* index; - void OnEvent(Event* event) + public: + HttpListener(FileReader *idx, int port, const std::string &addr) + : ListenSocketBase(port, addr, "httpd", "plaintext") { + this->index = idx; } - char* OnRequest(Request* request) + virtual void OnAcceptReady(int nfd) { - 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()); - return NULL; + int port; + std::string incomingip; + irc::sockets::satoap(&client, incomingip, port); + new HttpServerSocket(nfd, incomingip.c_str(), index); } +}; - void Implements(char* List) +class ModuleHttpServer : public Module +{ + std::vector httpsocks; + std::vector httplisteners; + public: + + void ReadConfig() { - List[I_OnEvent] = List[I_OnRequest] = 1; + int port; + std::string host; + std::string bindip; + std::string indexfile; + FileReader* index; + HttpListener *http; + ConfigReader c; + + httpsocks.clear(); // XXX this will BREAK if this module is made rehashable + httplisteners.clear(); + + for (int i = 0; i < c.Enumerate("http"); i++) + { + 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(indexfile); + if (!index->Exists()) + throw ModuleException("Can't read index file: "+indexfile); + http = new HttpListener(index, port, bindip); + httplisteners.push_back(http); + } } - virtual ~ModuleHttp() - { - ServerInstance->SE->DelFd(http); + ModuleHttpServer() { + ReadConfig(); + HttpModule = this; } - virtual Version GetVersion() + void OnRequest(Request& request) { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER); + if (strcmp(request.id, "HTTP-DOC") != 0) + return; + HTTPDocumentResponse& resp = static_cast(request); + claimed = true; + resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers); } -}; -class ModuleHttpFactory : public ModuleFactory -{ - public: - ModuleHttpFactory() - { - } - - ~ModuleHttpFactory() + virtual ~ModuleHttpServer() { + for (size_t i = 0; i < httplisteners.size(); i++) + { + delete httplisteners[i]; + } + + for (size_t i = 0; i < httpsocks.size(); i++) + { + ServerInstance->SE->DelFd(httpsocks[i]); + httpsocks[i]->Close(); + delete httpsocks[i]->GetIndex(); + } } - - virtual Module * CreateModule(InspIRCd* Me) + + virtual Version GetVersion() { - HttpModule = new ModuleHttp(Me); - return HttpModule; + return Version("Provides HTTP serving facilities to modules", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); } }; - -extern "C" void * init_module( void ) -{ - return new ModuleHttpFactory; -} +MODULE_INIT(ModuleHttpServer)