X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=a4452c9c09a1679adce6eff2a9ff0d798fdba373;hb=9d72ec55ae98960bf996dd3d92c29598a5e3c825;hp=76e89666ad88c99fe69262c9f08182d6f3157631;hpb=f3e45bfb0e74d431fcb4a2fcd0c024f73f73e7c2;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 76e89666a..a4452c9c0 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -1,26 +1,36 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/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; /** HTTP socket states */ @@ -33,9 +43,8 @@ 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; @@ -47,21 +56,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(int newfd, const char* IP, FileReader* ind) - : BufferedSocket(newfd), index(ind), ip(IP), 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->iohookprov) + via->iohookprov->OnAccept(this, client, server); } - virtual void OnError(BufferedSocketError) + ~HttpServerSocket() { + sockets.erase(this); + } + + void OnError(BufferedSocketError) CXX11_OVERRIDE + { + AddToCull(); } std::string Response(int response) @@ -89,7 +116,7 @@ class HttpServerSocket : public BufferedSocket case 300: return "MULTIPLE CHOICES"; case 301: - return "MOVED PERMENANTLY"; + return "MOVED PERMANENTLY"; case 302: return "FOUND"; case 303: @@ -170,13 +197,8 @@ class HttpServerSocket : public BufferedSocket 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.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) @@ -207,7 +229,7 @@ class HttpServerSocket : public BufferedSocket 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(); SetError("Buffer"); } @@ -272,7 +294,7 @@ 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; @@ -300,25 +322,16 @@ class HttpServerSocket : public BufferedSocket { InternalState = HTTP_SERVE_SEND_DATA; - if ((request_type == "GET") && (uri == "/")) - { - 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) { - claimed = false; - HTTPRequest acl((Module*)HttpModule, "httpd_acl", request_type, uri, &headers, this, ip, postdata); - acl.Send(); + HTTPRequest url((Module*)HttpModule, "httpd_url", request_type, uri, &headers, this, ip, postdata); + url.Send(); if (!claimed) { - HTTPRequest url((Module*)HttpModule, "httpd_url", request_type, uri, &headers, this, ip, postdata); - url.Send(); - if (!claimed) - { - SendHTTPError(404); - } + SendHTTPError(404); } } } @@ -328,102 +341,77 @@ class HttpServerSocket : public BufferedSocket SendHeaders(n->str().length(), response, *hheaders); WriteData(n->str()); } -}; - -/** Spawn HTTP sockets from a listener - */ -class HttpListener : public ListenSocketBase -{ - FileReader* index; - public: - HttpListener(FileReader *idx, int port, const std::string &addr) - : ListenSocketBase(port, addr, "httpd", "plaintext") + void AddToCull() { - this->index = idx; + if (waitingcull) + return; + + waitingcull = true; + Close(); + ServerInstance->GlobalCulls.AddItem(this); } +}; - ~HttpListener() +class HTTPdAPIImpl : public HTTPdAPIBase +{ + public: + HTTPdAPIImpl(Module* parent) + : HTTPdAPIBase(parent) { - delete index; } - virtual void OnAcceptReady(int nfd) + void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE { - int port; - std::string incomingip; - irc::sockets::satoap(&client, incomingip, port); - new HttpServerSocket(nfd, incomingip.c_str(), index); + claimed = true; + 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; - void ReadConfig() + public: + ModuleHttpServer() + : APIImpl(this) { - 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()) - { - delete index; - throw ModuleException("Can't read index file: "+indexfile); - } - http = new HttpListener(index, port, bindip); - httplisteners.push_back(http); - } } - ModuleHttpServer() { - ReadConfig(); + void init() CXX11_OVERRIDE + { HttpModule = this; } - void OnRequest(Request& request) + void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE { - 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); + ConfigTag* tag = ServerInstance->Config->ConfValue("httpd"); + timeoutsec = tag->getInt("timeout", 10, 1); } - - virtual ~ModuleHttpServer() + ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE { - for (size_t i = 0; i < httplisteners.size(); i++) - { - httplisteners[i]->cull(); - delete httplisteners[i]; - } + 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; + } - 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) { - httpsocks[i]->cull(); - delete httpsocks[i]; + HttpServerSocket* sock = *i; + sock->AddToCull(); } + return Module::cull(); } - virtual Version GetVersion() + Version GetVersion() CXX11_OVERRIDE { return Version("Provides HTTP serving facilities to modules", VF_VENDOR); }