X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=d768a94368e5687548ea77ce8601138c38eb9162;hb=e9e75e50bc25e67af22dd88b39b12217a553d5cb;hp=c40f6055ae8d8d7be1ccd8c5406fe59c6c8bbf10;hpb=b6dbd6caab62bc2c0d11ce5a45d511611eb9c2ef;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index c40f6055a..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,8 +46,8 @@ enum HttpState */ class HttpServerSocket : public BufferedSocket { - FileReader* index; HttpState InternalState; + std::string ip; HTTPHeaders headers; std::string reqbuffer; @@ -47,23 +58,19 @@ class HttpServerSocket : public BufferedSocket std::string http_version; public: - - HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : BufferedSocket(SI, newfd, ip), index(ind), 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); } - ~HttpServerSocket() - { - } - - virtual void OnClose() + virtual void OnError(BufferedSocketError) { + ServerInstance->GlobalCulls.AddItem(this); } std::string Response(int response) @@ -164,21 +171,21 @@ 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"); + WriteData(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n"); - time_t local = this->ServerInstance->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.2"); + rheaders.CreateHeader("Server", BRANCH); rheaders.SetHeader("Content-Length", ConvToStr(size)); if (size) @@ -191,40 +198,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("m_httpd",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() @@ -282,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; @@ -310,26 +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); - 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); + HTTPRequest url((Module*)HttpModule, "httpd_url", request_type, uri, &headers, this, ip, postdata); + url.Send(); if (!claimed) { - Event e((char*)&httpr, (Module*)HttpModule, "httpd_url"); - e.Send(this->ServerInstance); - if (!claimed) - { - SendHTTPError(404); - } + SendHTTPError(404); } } } @@ -337,98 +326,53 @@ class HttpServerSocket : public BufferedSocket void Page(std::stringstream* n, int response, HTTPHeaders *hheaders) { SendHeaders(n->str().length(), response, *hheaders); - this->Write(n->str()); - } -}; - -/** Spawn HTTP sockets from a listener - */ -class HttpListener : public ListenSocketBase -{ - FileReader* index; - - public: - HttpListener(InspIRCd* Instance, FileReader *idx, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr) - { - this->index = idx; - } - - 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 + WriteData(n->str()); } }; class ModuleHttpServer : public Module { std::vector httpsocks; - std::vector httplisteners; - public: - - void ReadConfig() - { - 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); - } - } - ModuleHttpServer(InspIRCd* Me) : Module(Me) + public: + void init() { - ReadConfig(); HttpModule = this; - Implementation eventlist[] = { I_OnRequest }; - ServerInstance->Modules->Attach(eventlist, this, 1); + ServerInstance->Modules->Attach(I_OnAcceptConnection, this); } - virtual const char* OnRequest(Request* request) + void OnRequest(Request& request) { + if (strcmp(request.id, "HTTP-DOC") != 0) + return; + HTTPDocumentResponse& resp = static_cast(request); claimed = true; - HTTPDocument* doc = (HTTPDocument*)request->GetData(); - HttpServerSocket* sock = (HttpServerSocket*)doc->sock; - sock->Page(doc->GetDocument(), doc->GetResponseCode(), &doc->headers); - return NULL; + 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++) - { - delete httplisteners[i]; - } - for (size_t i = 0; i < httpsocks.size(); i++) { - ServerInstance->SE->DelFd(httpsocks[i]); - httpsocks[i]->Close(); - delete httpsocks[i]->GetIndex(); + httpsocks[i]->cull(); + delete httpsocks[i]; } - ServerInstance->BufferedSocketCull(); } virtual Version GetVersion() { - return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION); + return Version("Provides HTTP serving facilities to modules", VF_VENDOR); } };