X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=64bef70d11ad3959a4323f0a1efedf5de2ab07d9;hb=8dbd80610aee01b8064ca813e1dd7ca44ab3f7b6;hp=eeb520d9001f10111b8ce192470f95d76c37948a;hpb=43847ec9c7e1a195163eb4c529f1c92fd1ace0a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index eeb520d90..64bef70d1 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -1,26 +1,37 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 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 insp::intrusive_list sockets; +static Events::ModuleEventProvider* aclevprov; +static Events::ModuleEventProvider* reqevprov; /** HTTP socket states */ @@ -33,10 +44,10 @@ enum HttpState /** A socket used for HTTP transport */ -class HttpServerSocket : public BufferedSocket +class HttpServerSocket : public BufferedSocket, public Timer, public insp::intrusive_list_node { - FileReader* index; HttpState InternalState; + std::string ip; HTTPHeaders headers; std::string reqbuffer; @@ -46,24 +57,39 @@ class HttpServerSocket : public BufferedSocket std::string uri; std::string http_version; - public: + /** True if this object is in the cull list + */ + bool waitingcull; - HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : BufferedSocket(SI, newfd, ip), index(ind), postsize(0) + bool Tick(time_t currtime) CXX11_OVERRIDE { - InternalState = HTTP_SERVE_WAIT_REQUEST; + AddToCull(); + return false; } - FileReader* GetIndex() + public: + HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server, unsigned int timeoutsec) + : BufferedSocket(newfd) + , Timer(timeoutsec) + , InternalState(HTTP_SERVE_WAIT_REQUEST) + , ip(IP) + , postsize(0) + , waitingcull(false) { - return index; + ServerInstance->Timers.AddTimer(this); + + if ((!via->iohookprovs.empty()) && (via->iohookprovs.back())) + via->iohookprovs.back()->OnAccept(this, client, server); } ~HttpServerSocket() { + sockets.erase(this); } - virtual void OnClose() + void OnError(BufferedSocketError) CXX11_OVERRIDE { + AddToCull(); } std::string Response(int response) @@ -91,7 +117,7 @@ class HttpServerSocket : public BufferedSocket case 300: return "MULTIPLE CHOICES"; case 301: - return "MOVED PERMENANTLY"; + return "MOVED PERMANENTLY"; case 302: return "FOUND"; case 303: @@ -164,21 +190,16 @@ class HttpServerSocket : public BufferedSocket "Powered by InspIRCd"; SendHeaders(data.length(), response, empty); - this->Write(data); + WriteData(data); } void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders) { - this->Write(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n"); - - time_t local = this->ServerInstance->Time(); - struct tm *timeinfo = gmtime(&local); - char *date = asctime(timeinfo); - date[strlen(date) - 1] = '\0'; - rheaders.CreateHeader("Date", date); + WriteData(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n"); - rheaders.CreateHeader("Server", "InspIRCd/m_httpd.so/1.2"); + rheaders.CreateHeader("Date", InspIRCd::TimeString(ServerInstance->Time(), "%a, %d %b %Y %H:%M:%S GMT", true)); + rheaders.CreateHeader("Server", INSPIRCD_BRANCH); rheaders.SetHeader("Content-Length", ConvToStr(size)); if (size) @@ -191,40 +212,32 @@ class HttpServerSocket : public BufferedSocket */ rheaders.SetHeader("Connection", "Close"); - this->Write(rheaders.GetFormattedHeaders()); - this->Write("\r\n"); + WriteData(rheaders.GetFormattedHeaders()); + WriteData("\r\n"); } - virtual bool OnDataReady() + void 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) { - postdata.append(data); + postdata.append(recvq); if (postdata.length() >= postsize) ServeData(); } else { - reqbuffer.append(data); + reqbuffer.append(recvq); if (reqbuffer.length() >= 8192) { - ServerInstance->Logs->Log("m_httpd",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() @@ -257,7 +270,7 @@ class HttpServerSocket : public BufferedSocket continue; } - std::string cheader = reqbuffer.substr(hbegin, hend - hbegin); + std::string cheader(reqbuffer, hbegin, hend - hbegin); std::string::size_type fieldsep = cheader.find(':'); if ((fieldsep == std::string::npos) || (fieldsep == 0) || (fieldsep == cheader.length() - 1)) @@ -282,13 +295,13 @@ class HttpServerSocket : public BufferedSocket return; } - 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); + postdata.assign(reqbuffer, 0, postsize); reqbuffer.erase(0, postsize); } else if (!reqbuffer.empty()) @@ -310,26 +323,16 @@ class HttpServerSocket : public BufferedSocket { InternalState = HTTP_SERVE_SEND_DATA; - if ((request_type == "GET") && (uri == "/")) + ModResult MOD_RESULT; + HTTPRequest acl(request_type, uri, &headers, this, ip, postdata); + FIRST_MOD_RESULT_CUSTOM(*aclevprov, HTTPACLEventListener, OnHTTPACLCheck, MOD_RESULT, (acl)); + if (MOD_RESULT != MOD_RES_DENY) { - 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 acl((char*)&httpr, (Module*)HttpModule, "httpd_acl"); - acl.Send(this->ServerInstance); - if (!claimed) + HTTPRequest url(request_type, uri, &headers, this, ip, postdata); + FIRST_MOD_RESULT_CUSTOM(*reqevprov, HTTPRequestEventListener, OnHTTPRequest, MOD_RESULT, (url)); + if (MOD_RESULT == MOD_RES_PASSTHRU) { - Event e((char*)&httpr, (Module*)HttpModule, "httpd_url"); - e.Send(this->ServerInstance); - if (!claimed) - { - SendHTTPError(404); - } + SendHTTPError(404); } } } @@ -337,98 +340,100 @@ class HttpServerSocket : public BufferedSocket void Page(std::stringstream* n, int response, HTTPHeaders *hheaders) { SendHeaders(n->str().length(), response, *hheaders); - this->Write(n->str()); + WriteData(n->str()); + } + + void AddToCull() + { + if (waitingcull) + return; + + waitingcull = true; + Close(); + ServerInstance->GlobalCulls.AddItem(this); } }; -/** Spawn HTTP sockets from a listener - */ -class HttpListener : public ListenSocketBase +class HTTPdAPIImpl : public HTTPdAPIBase { - FileReader* index; - public: - HttpListener(InspIRCd* Instance, FileReader *idx, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr) + HTTPdAPIImpl(Module* parent) + : HTTPdAPIBase(parent) { - this->index = idx; } - virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip) + void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE { - new HttpServerSocket(ServerInstance, nfd, (char *)incomingip.c_str(), index); // ugly cast courtesy of bufferedsocket + resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers); } }; class ModuleHttpServer : public Module { - std::vector httpsocks; - std::vector httplisteners; - public: + HTTPdAPIImpl APIImpl; + unsigned int timeoutsec; + Events::ModuleEventProvider acleventprov; + Events::ModuleEventProvider reqeventprov; - void ReadConfig() + public: + ModuleHttpServer() + : APIImpl(this) + , acleventprov(this, "event/http-acl") + , reqeventprov(this, "event/http-request") { - int port; - std::string host; - std::string bindip; - std::string indexfile; - FileReader* index; - HttpListener *http; - ConfigReader c(ServerInstance); - - 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(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); - } + aclevprov = &acleventprov; + reqevprov = &reqeventprov; } - ModuleHttpServer(InspIRCd* Me) : Module(Me) + void init() CXX11_OVERRIDE { - ReadConfig(); HttpModule = this; - Implementation eventlist[] = { I_OnRequest }; - ServerInstance->Modules->Attach(eventlist, this, 1); } - virtual const 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", 10, 1); } + ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE + { + if (from->bind_tag->getString("type") != "httpd") + return MOD_RES_PASSTHRU; + int port; + std::string incomingip; + irc::sockets::satoap(*client, incomingip, port); + sockets.push_front(new HttpServerSocket(nfd, incomingip, from, client, server, timeoutsec)); + return MOD_RES_ALLOW; + } - virtual ~ModuleHttpServer() + void OnUnloadModule(Module* mod) { - for (size_t i = 0; i < httplisteners.size(); i++) + for (insp::intrusive_list::const_iterator i = sockets.begin(); i != sockets.end(); ) { - delete httplisteners[i]; + HttpServerSocket* sock = *i; + ++i; + if (sock->GetModHook(mod)) + { + sock->cull(); + delete sock; + } } + } - for (size_t i = 0; i < httpsocks.size(); i++) + CullResult cull() CXX11_OVERRIDE + { + for (insp::intrusive_list::const_iterator i = sockets.begin(); i != sockets.end(); ++i) { - ServerInstance->SE->DelFd(httpsocks[i]); - httpsocks[i]->Close(); - delete httpsocks[i]->GetIndex(); + HttpServerSocket* sock = *i; + sock->AddToCull(); } - ServerInstance->BufferedSocketCull(); + return Module::cull(); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { - return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); + return Version("Provides HTTP serving facilities to modules", VF_VENDOR); } };