X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=735551dffa3ba6dd184a014fa72200b99560d961;hb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;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..735551dff 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -1,66 +1,53 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2008 Pippijn van Steenhoven + * Copyright (C) 2006-2008 Craig Edwards + * Copyright (C) 2007 John Brooks + * Copyright (C) 2007 Dennis Friis * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -#include "inspircd.h" -#include "httpd.h" -/* $ModDesc: Provides HTTP serving facilities to modules */ -/* $ModDep: httpd.h */ +#include "inspircd.h" +#include "iohook.h" +#include "modules/httpd.h" class ModuleHttpServer; static ModuleHttpServer* HttpModule; static bool claimed; +static std::set sockets; /** HTTP socket states */ 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 */ class HttpServerSocket : public BufferedSocket { - FileReader* index; HttpState InternalState; - + std::string ip; + HTTPHeaders headers; std::string reqbuffer; std::string postdata; @@ -68,67 +55,29 @@ 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: + const time_t createtime; - HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : BufferedSocket(SI, newfd, ip), index(ind), postsize(0), keepalive(false), DataSinceLastTick(false) + HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) + : BufferedSocket(newfd), ip(IP), postsize(0) + , createtime(ServerInstance->Time()) { InternalState = HTTP_SERVE_WAIT_REQUEST; - Timeout = new HttpServerTimeout(this, Instance->SE); - Instance->Timers->AddTimer(Timeout); - } - FileReader* GetIndex() - { - return index; + FOREACH_MOD(OnHookIO, (this, via)); + if (GetIOHook()) + GetIOHook()->OnStreamSocketAccept(this, client, server); } ~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; + sockets.erase(this); } - virtual void OnClose() + void OnError(BufferedSocketError) CXX11_OVERRIDE { + ServerInstance->GlobalCulls.AddItem(this); } std::string Response(int response) @@ -218,152 +167,131 @@ 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(); + WriteData(data); } - + void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders) { - this->Write(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n"); + WriteData(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n"); - time_t local = this->Instance->Time(); + 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.1"); + + rheaders.CreateHeader("Server", BRANCH); 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"); - - this->Write(rheaders.GetFormattedHeaders()); - this->Write("\r\n"); - - if (!size && keepalive) - ResetRequest(); + + /* 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"); } - virtual bool OnDataReady() + void OnDataReady() { - 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); + postdata.append(recvq); if (postdata.length() >= postsize) ServeData(); } else { - reqbuffer.append(data); - + reqbuffer.append(recvq); + if (reqbuffer.length() >= 8192) { - Instance->Log(DEBUG, "m_httpd dropped connection due to an oversized request buffer"); + ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "m_httpd dropped connection due to an oversized request buffer"); reqbuffer.clear(); - return false; + SetError("Buffer"); } - + 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) + + if (headers.IsSet("Content-Length") && (postsize = ConvToInt(headers.GetHeader("Content-Length"))) > 0) { InternalState = HTTP_SERVE_RECV_POSTDATA; - + if (reqbuffer.length() >= postsize) { postdata = reqbuffer.substr(0, postsize); @@ -374,13 +302,13 @@ class HttpServerSocket : public BufferedSocket postdata = reqbuffer; reqbuffer.clear(); } - + if (postdata.length() >= postsize) ServeData(); - + return; } - + ServeData(); } @@ -388,18 +316,13 @@ class HttpServerSocket : public BufferedSocket { InternalState = HTTP_SERVE_SEND_DATA; - if ((request_type == "GET") && (uri == "/")) + claimed = false; + HTTPRequest acl((Module*)HttpModule, "httpd_acl", request_type, uri, &headers, this, ip, postdata); + acl.Send(); + if (!claimed) { - HTTPHeaders empty; - SendHeaders(index->ContentSize(), 200, empty); - 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); + HTTPRequest url((Module*)HttpModule, "httpd_url", request_type, uri, &headers, this, ip, postdata); + url.Send(); if (!claimed) { SendHTTPError(404); @@ -407,103 +330,96 @@ class HttpServerSocket : public BufferedSocket } } - void Page(std::stringstream* n, int response, HTTPHeaders *headers) + void Page(std::stringstream* n, int response, HTTPHeaders *hheaders) { - SendHeaders(n->str().length(), response, *headers); - this->Write(n->str()); - - if (!keepalive) - { - Instance->SE->DelFd(this); - this->Close(); - } - else - this->ResetRequest(); + SendHeaders(n->str().length(), response, *hheaders); + WriteData(n->str()); } }; -HttpServerTimeout::HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine) : Timer(15, time(NULL), true), s(sock), SE(engine) +class HTTPdAPIImpl : public HTTPdAPIBase { -} + public: + HTTPdAPIImpl(Module* parent) + : HTTPdAPIBase(parent) + { + } -void HttpServerTimeout::Tick(time_t TIME) -{ - if (!s->DataSinceLastTick) + void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE { - SE->DelFd(s); - s->Close(); - s->Timeout = NULL; - this->CancelRepeat(); + claimed = true; + resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers); } - else - s->DataSinceLastTick = false; -} +}; class ModuleHttpServer : public Module { - std::vector httpsocks; - public: + std::vector httpsocks; + HTTPdAPIImpl APIImpl; + unsigned int timeoutsec; - void ReadConfig() + public: + ModuleHttpServer() + : APIImpl(this) { - int port; - std::string host; - std::string bindip; - std::string indexfile; - FileReader* index; - HttpServerSocket* http; - ConfigReader c(ServerInstance); - - httpsocks.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(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); - } } - ModuleHttpServer(InspIRCd* Me) : Module(Me) + void init() CXX11_OVERRIDE { - ReadConfig(); HttpModule = this; } - char* OnRequest(Request* request) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - claimed = true; - HTTPDocument* doc = (HTTPDocument*)request->GetData(); - HttpServerSocket* sock = (HttpServerSocket*)doc->sock; - sock->Page(doc->GetDocument(), doc->GetResponseCode(), &doc->headers); - return NULL; + ConfigTag* tag = ServerInstance->Config->ConfValue("httpd"); + timeoutsec = tag->getInt("timeout"); } - void Implements(char* List) + ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE { - List[I_OnRequest] = 1; + if (from->bind_tag->getString("type") != "httpd") + return MOD_RES_PASSTHRU; + int port; + std::string incomingip; + irc::sockets::satoap(*client, incomingip, port); + sockets.insert(new HttpServerSocket(nfd, incomingip, from, client, server)); + return MOD_RES_ALLOW; + } + + void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE + { + if (!timeoutsec) + return; + + time_t oldest_allowed = curtime - timeoutsec; + for (std::set::const_iterator i = sockets.begin(); i != sockets.end(); ) + { + HttpServerSocket* sock = *i; + ++i; + if (sock->createtime < oldest_allowed) + { + sock->cull(); + delete sock; + } + } } - virtual ~ModuleHttpServer() + CullResult cull() CXX11_OVERRIDE { - for (size_t i = 0; i < httpsocks.size(); i++) + std::set local; + local.swap(sockets); + for (std::set::const_iterator i = local.begin(); i != local.end(); ++i) { - ServerInstance->SE->DelFd(httpsocks[i]); - httpsocks[i]->Close(); - delete httpsocks[i]->GetIndex(); + HttpServerSocket* sock = *i; + sock->cull(); + delete sock; } - ServerInstance->BufferedSocketCull(); + return Module::cull(); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION); + return Version("Provides HTTP serving facilities to modules", VF_VENDOR); } };