X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=2b079c6ff9fe19d017d8347332f38d4b0a66fe95;hb=571714e28b26cc59cbc8d27098a5ba981240ee2d;hp=f8178ed3a4d9cbf1d2332c593c2a39a856091c4a;hpb=fd6ee21f2f55875984884a8413d61012e066029f;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index f8178ed3a..2b079c6ff 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -1,78 +1,85 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * - * - * Written by Craig Edwards, Craig McLure, and others. - * This program is free but copyrighted software; see - * the file COPYING for details. + * 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 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 . */ -using namespace std; -#include -#include "users.h" -#include "channels.h" -#include "modules.h" -#include "inspsocket.h" -#include "helperfuncs.h" #include "inspircd.h" #include "httpd.h" /* $ModDesc: Provides HTTP serving facilities to modules */ +/* $ModDep: httpd.h */ -class ModuleHttp; - +class ModuleHttpServer; - -static ModuleHttp* HttpModule; -extern time_t TIME; +static ModuleHttpServer* HttpModule; static bool claimed; +static std::set sockets; +/** HTTP socket states + */ enum HttpState { - HTTP_LISTEN = 0, - HTTP_SERVE_WAIT_REQUEST = 1, - HTTP_SERVE_SEND_DATA = 2 + 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 */ }; -class HttpSocket : public InspSocket +/** A socket used for HTTP transport + */ +class HttpServerSocket : public BufferedSocket { - FileReader* index; HttpState InternalState; - std::stringstream headers; + std::string ip; - public: + HTTPHeaders headers; + std::string reqbuffer; + std::string postdata; + unsigned int postsize; + std::string request_type; + std::string uri; + std::string http_version; - HttpSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(SI, host, port, listening, maxtime), index(index_page) - { - log(DEBUG,"HttpSocket constructor"); - InternalState = HTTP_LISTEN; - } + public: + const time_t createtime; - HttpSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, newfd, ip), index(ind) + 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; + + FOREACH_MOD(I_OnHookIO, OnHookIO(this, via)); + if (GetIOHook()) + GetIOHook()->OnStreamSocketAccept(this, client, server); } - virtual int OnIncomingConnection(int newsock, char* ip) + ~HttpServerSocket() { - if (InternalState == HTTP_LISTEN) - { - HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index); - this->Instance->AddSocket(s); - } - return true; + sockets.erase(this); } - virtual void OnClose() + virtual void OnError(BufferedSocketError) { + ServerInstance->GlobalCulls.AddItem(this); } std::string Response(int response) @@ -100,7 +107,7 @@ class HttpSocket : public InspSocket case 300: return "MULTIPLE CHOICES"; case 301: - return "MOVED PERMENANTLY"; + return "MOVED PERMANENTLY"; case 302: return "FOUND"; case 303: @@ -162,186 +169,265 @@ class HttpSocket : public InspSocket default: return "WTF"; break; - + } } - void SendHeaders(unsigned long size, int response, const std::string &extraheaders) + void SendHTTPError(int response) + { + HTTPHeaders empty; + std::string data = "Server error "+ConvToStr(response)+": "+Response(response)+"
"+ + "Powered by InspIRCd"; + + SendHeaders(data.length(), response, empty); + WriteData(data); + } + + void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders) + { + + 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", BRANCH); + rheaders.SetHeader("Content-Length", ConvToStr(size)); + + if (size) + rheaders.CreateHeader("Content-Type", "text/html"); + else + rheaders.RemoveHeader("Content-Type"); + + /* 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"); + } + + void OnDataReady() { - struct tm *timeinfo = localtime(&TIME); - this->Write("HTTP/1.1 "+ConvToStr(response)+" "+Response(response)+"\r\nDate: "); - this->Write(asctime(timeinfo)); - if (extraheaders.empty()) + if (InternalState == HTTP_SERVE_RECV_POSTDATA) { - this->Write("Content-Type: text/html\r\n"); + postdata.append(recvq); + if (postdata.length() >= postsize) + ServeData(); } else { - this->Write(extraheaders); + reqbuffer.append(recvq); + + if (reqbuffer.length() >= 8192) + { + ServerInstance->Logs->Log("m_httpd",DEBUG, "m_httpd dropped connection due to an oversized request buffer"); + reqbuffer.clear(); + SetError("Buffer"); + } + + if (InternalState == HTTP_SERVE_WAIT_REQUEST) + CheckRequestBuffer(); } - this->Write("Server: InspIRCd/m_httpd.so/1.1\r\nContent-Length: "+ConvToStr(size)+ - "\r\nConnection: close\r\n\r\n"); } - virtual bool OnDataReady() + void CheckRequestBuffer() { - char* data = this->Read(); - std::string request_type; - std::string uri; - std::string http_version; + std::string::size_type reqend = reqbuffer.find("\r\n\r\n"); + if (reqend == std::string::npos) + return; - /* Check that the data read is a valid pointer and it has some content */ - if (data && *data) + // We have the headers; parse them all + std::string::size_type hbegin = 0, hend; + while ((hend = reqbuffer.find("\r\n", hbegin)) != std::string::npos) { - headers << data; + if (hbegin == hend) + break; - if (headers.str().find("\r\n\r\n") != std::string::npos) + if (request_type.empty()) { - /* Headers are complete */ - InternalState = HTTP_SERVE_SEND_DATA; + std::istringstream cheader(std::string(reqbuffer, hbegin, hend - hbegin)); + cheader >> request_type; + cheader >> uri; + cheader >> http_version; - headers >> request_type; - headers >> uri; - headers >> http_version; - - if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0")) - { - SendHeaders(0, 505, ""); - } - else + if (request_type.empty() || uri.empty() || http_version.empty()) { - if ((request_type == "GET") && (uri == "/")) - { - SendHeaders(index->ContentSize(), 200, ""); - this->Write(index->Contents()); - } - else - { - claimed = false; - HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP()); - Event e((char*)&httpr, (Module*)HttpModule, "httpd_url"); - e.Send(); - - if (!claimed) - { - SendHeaders(0, 404, ""); - log(DEBUG,"Page not claimed, 404"); - } - } + SendHTTPError(400); + return; } - return false; + hbegin = hend + 2; + continue; } - return true; - } - else - { - /* Bastard client closed the socket on us! - * Oh wait, theyre SUPPOSED to do that! - */ - return false; + + 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; } - } - void Page(std::stringstream* n, int response, std::string& extraheaders) - { - log(DEBUG,"Sending page"); - SendHeaders(n->str().length(), response, extraheaders); - this->Write(n->str()); - } -}; + reqbuffer.erase(0, reqend + 4); -class ModuleHttp : public Module -{ - int port; - std::string host; - std::string bindip; - std::string indexfile; + std::transform(request_type.begin(), request_type.end(), request_type.begin(), ::toupper); + std::transform(http_version.begin(), http_version.end(), http_version.begin(), ::toupper); - FileReader index; + if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0")) + { + SendHTTPError(505); + return; + } - HttpSocket* http; + if (headers.IsSet("Content-Length") && (postsize = ConvToInt(headers.GetHeader("Content-Length"))) > 0) + { + InternalState = HTTP_SERVE_RECV_POSTDATA; - public: + if (reqbuffer.length() >= postsize) + { + postdata = reqbuffer.substr(0, postsize); + reqbuffer.erase(0, postsize); + } + else if (!reqbuffer.empty()) + { + postdata = reqbuffer; + reqbuffer.clear(); + } - void ReadConfig() - { - ConfigReader c; - this->host = c.ReadValue("http", "host", 0); - this->bindip = c.ReadValue("http", "ip", 0); - this->port = c.ReadInteger("http", "port", 0, true); - this->indexfile = c.ReadValue("http", "index", 0); + if (postdata.length() >= postsize) + ServeData(); - index.LoadFile(this->indexfile); + return; + } + + ServeData(); } - void CreateListener() + void ServeData() { - http = new HttpSocket(ServerInstance, this->bindip, this->port, true, 0, &index); - if ((http) && (http->GetState() == I_LISTENING)) + InternalState = HTTP_SERVE_SEND_DATA; + + claimed = false; + HTTPRequest acl((Module*)HttpModule, "httpd_acl", request_type, uri, &headers, this, ip, postdata); + acl.Send(); + if (!claimed) { - ServerInstance->AddSocket(http); + HTTPRequest url((Module*)HttpModule, "httpd_url", request_type, uri, &headers, this, ip, postdata); + url.Send(); + if (!claimed) + { + SendHTTPError(404); + } } } - ModuleHttp(InspIRCd* Me) : Module::Module(Me) + void Page(std::stringstream* n, int response, HTTPHeaders *hheaders) { - - ReadConfig(); - CreateListener(); + SendHeaders(n->str().length(), response, *hheaders); + WriteData(n->str()); } +}; - void OnEvent(Event* event) +class ModuleHttpServer : public Module +{ + unsigned int timeoutsec; + + public: + + void init() { + HttpModule = this; + Implementation eventlist[] = { I_OnAcceptConnection, I_OnBackgroundTimer, I_OnRehash, I_OnUnloadModule }; + ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation)); + OnRehash(NULL); } - char* OnRequest(Request* request) + void OnRehash(User* user) { - log(DEBUG,"Got HTTPDocument object"); - claimed = true; - HTTPDocument* doc = (HTTPDocument*)request->GetData(); - HttpSocket* sock = (HttpSocket*)doc->sock; - sock->Page(doc->GetDocument(), doc->GetResponseCode(), doc->GetExtraHeaders()); - return NULL; + ConfigTag* tag = ServerInstance->Config->ConfValue("httpd"); + timeoutsec = tag->getInt("timeout"); } - void Implements(char* List) + void OnRequest(Request& request) { - List[I_OnEvent] = List[I_OnRequest] = 1; + 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); } - virtual ~ModuleHttp() + ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) { - ServerInstance->DelSocket(http); + 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; } - virtual Version GetVersion() + void OnBackgroundTimer(time_t curtime) { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER); - } -}; + 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; + } + } + } -class ModuleHttpFactory : public ModuleFactory -{ - public: - ModuleHttpFactory() + void OnUnloadModule(Module* mod) { + for (std::set::const_iterator i = sockets.begin(); i != sockets.end(); ) + { + HttpServerSocket* sock = *i; + ++i; + if (sock->GetIOHook() == mod) + { + sock->cull(); + delete sock; + } + } } - - ~ModuleHttpFactory() + + CullResult cull() { + std::set local; + local.swap(sockets); + for (std::set::const_iterator i = local.begin(); i != local.end(); ++i) + { + HttpServerSocket* sock = *i; + sock->cull(); + delete sock; + } + return Module::cull(); } - - virtual Module * CreateModule(InspIRCd* Me) + + virtual Version GetVersion() { - HttpModule = new ModuleHttp(Me); - return HttpModule; + return Version("Provides HTTP serving facilities to modules", VF_VENDOR); } }; - -extern "C" void * init_module( void ) -{ - return new ModuleHttpFactory; -} +MODULE_INIT(ModuleHttpServer)