X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=d768a94368e5687548ea77ce8601138c38eb9162;hb=551d687ec6d7ce44be35fae0dd7345fe73c4f63a;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..d768a9436 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -1,21 +1,32 @@ -/* +------------------------------------+ - * | 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" +#include "modules/httpd.h" /* $ModDesc: Provides HTTP serving facilities to modules */ -/* $ModDep: httpd.h */ +/* $ModDep: modules/httpd.h */ class ModuleHttpServer; @@ -35,7 +46,6 @@ enum HttpState */ class HttpServerSocket : public BufferedSocket { - FileReader* index; HttpState InternalState; std::string ip; @@ -48,20 +58,19 @@ class HttpServerSocket : public BufferedSocket std::string http_version; public: - - HttpServerSocket(int newfd, const char* IP, FileReader* ind) - : BufferedSocket(newfd), index(ind), ip(IP), postsize(0) + HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) + : BufferedSocket(newfd), ip(IP), postsize(0) { InternalState = HTTP_SERVE_WAIT_REQUEST; - } - FileReader* GetIndex() - { - return index; + FOREACH_MOD(I_OnHookIO, OnHookIO(this, via)); + if (GetIOHook()) + GetIOHook()->OnStreamSocketAccept(this, client, server); } virtual void OnError(BufferedSocketError) { + ServerInstance->GlobalCulls.AddItem(this); } std::string Response(int response) @@ -176,7 +185,7 @@ class HttpServerSocket : public BufferedSocket date[strlen(date) - 1] = '\0'; rheaders.CreateHeader("Date", date); - rheaders.CreateHeader("Server", "InspIRCd/m_httpd.so/1.2"); + rheaders.CreateHeader("Server", BRANCH); rheaders.SetHeader("Content-Length", ConvToStr(size)); if (size) @@ -207,7 +216,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("m_httpd",LOG_DEBUG, "m_httpd dropped connection due to an oversized request buffer"); reqbuffer.clear(); SetError("Buffer"); } @@ -272,7 +281,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 +309,16 @@ 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); - WriteData(index->Contents()); - } - else - { - 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); } } } @@ -330,72 +330,15 @@ class HttpServerSocket : public BufferedSocket } }; -/** 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") - { - this->index = idx; - } - - ~HttpListener() - { - delete index; - } - - virtual void OnAcceptReady(int nfd) - { - int port; - std::string incomingip; - irc::sockets::satoap(&client, incomingip, port); - new HttpServerSocket(nfd, incomingip.c_str(), index); - } -}; - class ModuleHttpServer : public Module { std::vector httpsocks; - std::vector httplisteners; - public: - void ReadConfig() + public: + void init() { - 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(); HttpModule = this; + ServerInstance->Modules->Attach(I_OnAcceptConnection, this); } void OnRequest(Request& request) @@ -407,15 +350,19 @@ class ModuleHttpServer : public Module resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers); } + ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) + { + if (from->bind_tag->getString("type") != "httpd") + return MOD_RES_PASSTHRU; + int port; + std::string incomingip; + irc::sockets::satoap(*client, incomingip, port); + new HttpServerSocket(nfd, incomingip, from, client, server); + return MOD_RES_ALLOW; + } virtual ~ModuleHttpServer() { - for (size_t i = 0; i < httplisteners.size(); i++) - { - httplisteners[i]->cull(); - delete httplisteners[i]; - } - for (size_t i = 0; i < httpsocks.size(); i++) { httpsocks[i]->cull();