X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=f85046fd75713dfcd32696695f0658b4d998b1f9;hb=dd501fba3fd7e5806186b79fa1d7c2b464884e69;hp=bb6c6d7865d716368cc7f6819731f0d2a1bddc60;hpb=2b68243097f98ace4a53b21520718874b0ed7db5;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index bb6c6d786..f85046fd7 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -2,7 +2,7 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see @@ -26,32 +26,9 @@ static bool claimed; */ enum HttpState { - HTTP_LISTEN = 0, - HTTP_SERVE_WAIT_REQUEST = 1, /* Waiting for a full request */ - HTTP_SERVE_RECV_POSTDATA = 2, /* Waiting to finish recieving POST data */ - HTTP_SERVE_SEND_DATA = 3 /* Sending response */ -}; - -class HttpServerSocket; - -/** This class is used to handle HTTP socket timeouts - */ -class HttpServerTimeout : public Timer -{ - 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); + 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 @@ -60,7 +37,7 @@ class HttpServerSocket : public BufferedSocket { FileReader* index; HttpState InternalState; - + HTTPHeaders headers; std::string reqbuffer; std::string postdata; @@ -68,25 +45,12 @@ class HttpServerSocket : public BufferedSocket std::string request_type; std::string uri; std::string http_version; - bool keepalive; - - HttpServerTimeout* Timeout; - bool DataSinceLastTick; - friend class HttpServerTimeout; - - public: - HttpServerSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : BufferedSocket(SI, host, port, listening, maxtime), index(index_page), postsize(0) - { - InternalState = HTTP_LISTEN; - Timeout = NULL; - } + public: - HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : BufferedSocket(SI, newfd, ip), index(ind), postsize(0), keepalive(false), DataSinceLastTick(false) + HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : BufferedSocket(SI, newfd, ip), index(ind), postsize(0) { InternalState = HTTP_SERVE_WAIT_REQUEST; - Timeout = new HttpServerTimeout(this, Instance->SE); - Instance->Timers->AddTimer(Timeout); } FileReader* GetIndex() @@ -96,35 +60,6 @@ class HttpServerSocket : public BufferedSocket ~HttpServerSocket() { - if (Timeout) - { - if (Instance->Time() < Timeout->GetTimer()) - Instance->Timers->DelTimer(Timeout); - Timeout = NULL; - } - } - - void ResetRequest() - { - headers.Clear(); - postdata.clear(); - postsize = 0; - request_type.clear(); - uri.clear(); - http_version.clear(); - InternalState = HTTP_SERVE_WAIT_REQUEST; - - if (reqbuffer.size()) - CheckRequestBuffer(); - } - - virtual int OnIncomingConnection(int newsock, char* ip) - { - if (InternalState == HTTP_LISTEN) - { - new HttpServerSocket(this->Instance, newsock, ip, index); - } - return true; } virtual void OnClose() @@ -218,66 +153,56 @@ class HttpServerSocket : public BufferedSocket default: return "WTF"; break; - + } } - + 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); - - if (keepalive) - ResetRequest(); } - + 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(); + 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.1"); + + 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"); - - if (rheaders.GetHeader("Connection") == "Close") - keepalive = false; - else if (rheaders.GetHeader("Connection") == "Keep-Alive" && !headers.IsSet("Connection")) - keepalive = true; - else if (!rheaders.IsSet("Connection") && !keepalive) - rheaders.SetHeader("Connection", "Close"); - + + /* 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"); - - if (!size && keepalive) - ResetRequest(); } virtual bool OnDataReady() { - char* data = this->Read(); + const char* data = this->Read(); /* Check that the data read is a valid pointer and it has some content */ if (!data || !*data) return false; - - DataSinceLastTick = true; - + if (InternalState == HTTP_SERVE_RECV_POSTDATA) { postdata.append(data); @@ -287,83 +212,80 @@ class HttpServerSocket : public BufferedSocket else { reqbuffer.append(data); - + if (reqbuffer.length() >= 8192) { - Instance->Log(DEBUG, "m_httpd dropped connection due to an oversized request buffer"); + ServerInstance->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(); } - + 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()) { SendHTTPError(400); return; } - + 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; } - + 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 (strcasecmp(headers.GetHeader("Connection").c_str(), "keep-alive") == 0) - keepalive = true; - + 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); @@ -374,13 +296,13 @@ class HttpServerSocket : public BufferedSocket postdata = reqbuffer; reqbuffer.clear(); } - + if (postdata.length() >= postsize) ServeData(); - + return; } - + ServeData(); } @@ -398,50 +320,49 @@ class HttpServerSocket : public BufferedSocket { claimed = false; HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP(),postdata); - Event e((char*)&httpr, (Module*)HttpModule, "httpd_url"); - e.Send(this->Instance); + Event acl((char*)&httpr, (Module*)HttpModule, "httpd_acl"); + acl.Send(this->ServerInstance); if (!claimed) { - SendHTTPError(404); + Event e((char*)&httpr, (Module*)HttpModule, "httpd_url"); + e.Send(this->ServerInstance); + if (!claimed) + { + SendHTTPError(404); + } } } } - void Page(std::stringstream* n, int response, HTTPHeaders *headers) + void Page(std::stringstream* n, int response, HTTPHeaders *hheaders) { - SendHeaders(n->str().length(), response, *headers); + SendHeaders(n->str().length(), response, *hheaders); this->Write(n->str()); - - if (!keepalive) - { - Instance->SE->DelFd(this); - this->Close(); - } - else - this->ResetRequest(); } }; -HttpServerTimeout::HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine) : Timer(15, time(NULL), true), s(sock), SE(engine) +/** Spawn HTTP sockets from a listener + */ +class HttpListener : public ListenSocketBase { -} + FileReader* index; -void HttpServerTimeout::Tick(time_t TIME) -{ - if (!s->DataSinceLastTick) + public: + HttpListener(InspIRCd* Instance, FileReader *idx, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr) { - SE->DelFd(s); - s->Close(); - s->Timeout = NULL; - this->CancelRepeat(); + this->index = idx; } - else - s->DataSinceLastTick = false; -} + + 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 httpsocks; + std::vector httplisteners; public: void ReadConfig() @@ -451,10 +372,11 @@ class ModuleHttpServer : public Module std::string bindip; std::string indexfile; FileReader* index; - HttpServerSocket* http; + HttpListener *http; ConfigReader c(ServerInstance); - httpsocks.clear(); + httpsocks.clear(); // XXX this will BREAK if this module is made rehashable + httplisteners.clear(); for (int i = 0; i < c.Enumerate("http"); i++) { @@ -465,8 +387,8 @@ class ModuleHttpServer : public Module 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); + http = new HttpListener(ServerInstance, index, port, (char *)bindip.c_str()); // XXX this cast SUCKS. + httplisteners.push_back(http); } } @@ -474,9 +396,11 @@ class ModuleHttpServer : public Module { ReadConfig(); HttpModule = this; + Implementation eventlist[] = { I_OnRequest }; + ServerInstance->Modules->Attach(eventlist, this, 1); } - char* OnRequest(Request* request) + virtual const char* OnRequest(Request* request) { claimed = true; HTTPDocument* doc = (HTTPDocument*)request->GetData(); @@ -485,13 +409,14 @@ class ModuleHttpServer : public Module return NULL; } - void Implements(char* List) - { - List[I_OnRequest] = 1; - } 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]); @@ -503,7 +428,7 @@ class ModuleHttpServer : public Module virtual Version GetVersion() { - return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION); + return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); } };