X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=189a80b8971788c203ea9a371f2f655dbb94fec2;hb=82243d9beb827fca5708efe9e047ff2fec4bfe8c;hp=b618e01f9ed2e0e1fd9bf4ae776fcfad1427f700;hpb=3f80008ba387b1e1e9e360f047fd6d1684c85d4c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index b618e01f9..189a80b89 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -1,4 +1,4 @@ -/* +------------------------------------+ +/* +------------------------------------+ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * @@ -16,54 +16,101 @@ 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; -static Server *Srv; static ModuleHttp* HttpModule; -extern time_t TIME; +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 HttpSocket; + +/** This class is used to handle HTTP socket timeouts + */ +class HTTPTimeout : public InspTimer +{ + private: + /** HttpSocket we are attached to + */ + HttpSocket* s; + /** Socketengine the file descriptor is in + */ + SocketEngine* SE; + public: + /** Attach timeout to HttpSocket + */ + HTTPTimeout(HttpSocket* sock, SocketEngine* engine); + /** Handle timer tick + */ + void Tick(time_t TIME); }; +/** A socket used for HTTP transport + */ class HttpSocket : 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; + HTTPTimeout* Timeout; public: - HttpSocket(std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(host, port, listening, maxtime), index(index_page) + 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) { - log(DEBUG,"HttpSocket constructor"); + SI->Log(DEBUG,"HttpSocket constructor"); InternalState = HTTP_LISTEN; + Timeout = NULL; } - HttpSocket(int newfd, char* ip, FileReader* ind) : InspSocket(newfd, ip), index(ind) + HttpSocket(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); + Instance->Timers->AddTimer(Timeout); + } + + FileReader* GetIndex() + { + return index; + } + + ~HttpSocket() + { + if (Instance->Time() < Timeout->GetTimer()) + { + if (Timeout) + 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); + HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index); + s = s; /* Stop GCC whining */ } return true; } @@ -72,19 +119,118 @@ class HttpSocket : public InspSocket { } - void SendHeaders(unsigned long size) + std::string Response(int response) { - struct tm *timeinfo = localtime(&TIME); - this->Write("HTTP/1.1 200 OK\r\nDate: "); + switch (response) + { + case 100: + return "CONTINUE"; + case 101: + return "SWITCHING PROTOCOLS"; + case 200: + return "OK"; + case 201: + return "CREATED"; + case 202: + return "ACCEPTED"; + case 203: + return "NON-AUTHORITATIVE INFORMATION"; + case 204: + return "NO CONTENT"; + case 205: + return "RESET CONTENT"; + case 206: + return "PARTIAL CONTENT"; + case 300: + return "MULTIPLE CHOICES"; + case 301: + return "MOVED PERMENANTLY"; + case 302: + return "FOUND"; + case 303: + return "SEE OTHER"; + case 304: + return "NOT MODIFIED"; + case 305: + return "USE PROXY"; + case 307: + return "TEMPORARY REDIRECT"; + case 400: + return "BAD REQUEST"; + case 401: + return "UNAUTHORIZED"; + case 402: + return "PAYMENT REQUIRED"; + case 403: + return "FORBIDDEN"; + case 404: + return "NOT FOUND"; + case 405: + return "METHOD NOT ALLOWED"; + case 406: + return "NOT ACCEPTABLE"; + case 407: + return "PROXY AUTHENTICATION REQUIRED"; + case 408: + return "REQUEST TIMEOUT"; + case 409: + return "CONFLICT"; + case 410: + return "GONE"; + case 411: + return "LENGTH REQUIRED"; + case 412: + return "PRECONDITION FAILED"; + case 413: + return "REQUEST ENTITY TOO LARGE"; + case 414: + return "REQUEST-URI TOO LONG"; + case 415: + return "UNSUPPORTED MEDIA TYPE"; + case 416: + return "REQUESTED RANGE NOT SATISFIABLE"; + case 417: + return "EXPECTATION FAILED"; + case 500: + return "INTERNAL SERVER ERROR"; + case 501: + return "NOT IMPLEMENTED"; + case 502: + return "BAD GATEWAY"; + case 503: + return "SERVICE UNAVAILABLE"; + case 504: + return "GATEWAY TIMEOUT"; + case 505: + return "HTTP VERSION NOT SUPPORTED"; + default: + return "WTF"; + break; + + } + } + + void SendHeaders(unsigned long size, int response, const std::string &extraheaders) + { + 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; /* Check that the data read is a valid pointer and it has some content */ if (data && *data) @@ -93,75 +239,156 @@ class HttpSocket : public InspSocket if (headers.str().find("\r\n\r\n") != std::string::npos) { - /* Headers are complete */ - InternalState = HTTP_SERVE_SEND_DATA; + if (request_type == "") + { + headers >> request_type; + headers >> uri; + headers >> http_version; - headers >> request_type; - headers >> uri; + 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 ((request_type == "GET") && (uri = "/")) + if ((InternalState == HTTP_SERVE_WAIT_REQUEST) && (request_type == "POST")) { - SendHeaders(index->ContentSize()); - this->Write(index->Contents()); + /* Do we need to fetch postdata? */ + postdata = ""; + 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) + { + /* Add postdata, once we have it all, send the event */ + postdata.append(data); + if (postdata.length() >= postsize) + ServeData(); } else { - HttpRequest httpr(request_type,uri,headers,this,this->GetIP()); - Event e(uri, HttpModule, "httpd_url"); + ServeData(); } - - return false; + return true; } return true; } else { - /* Bastard client closed the socket on us! - * Oh wait, theyre SUPPOSED to do that! - */ return false; } } + + 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")) + { + 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"); + } + } + } + Timeout = new HTTPTimeout(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()); + } }; -class ModuleHttp : public Module +HTTPTimeout::HTTPTimeout(HttpSocket* 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 HTTPTimeout::Tick(time_t TIME) +{ + SE->DelFd(s); + s->Close(); + delete s; +} +class ModuleHttp : 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; + HttpSocket* 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); + http = new HttpSocket(ServerInstance, bindip, port, true, 0, index); + httpsocks.push_back(http); } } - ModuleHttp(Server* Me) : Module::Module(Me) + ModuleHttp(InspIRCd* Me) : Module::Module(Me) { - Srv = Me; ReadConfig(); - CreateListener(); } void OnEvent(Event* event) @@ -170,6 +397,11 @@ class ModuleHttp : public Module 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()); return NULL; } @@ -180,12 +412,17 @@ class ModuleHttp : public Module virtual ~ModuleHttp() { - 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,0,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION); } }; @@ -201,10 +438,10 @@ class ModuleHttpFactory : public ModuleFactory { } - virtual Module * CreateModule(Server* Me) + virtual Module * CreateModule(InspIRCd* Me) { - ModuleHttp = new ModuleHttp(Me); - return new HttpModule; + HttpModule = new ModuleHttp(Me); + return HttpModule; } };