-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * Copyright (C) 2009 Daniel De Graaf <danieldg@inspircd.org>
+ * Copyright (C) 2007-2008 Robin Burchell <robin+git@viroteck.net>
+ * Copyright (C) 2008 Pippijn van Steenhoven <pip88nl@gmail.com>
+ * Copyright (C) 2006-2008 Craig Edwards <craigedwards@brainbox.cc>
+ * Copyright (C) 2007 John Brooks <john.brooks@dereferenced.net>
+ * Copyright (C) 2007 Dennis Friis <peavey@inspircd.org>
*
- * 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 <http://www.gnu.org/licenses/>.
*/
-#include "inspircd.h"
-#include <algorithm>
-#include "modules.h"
-#include "httpd.h"
-/* $ModDesc: Provides HTTP serving facilities to modules */
+#include "inspircd.h"
+#include "iohook.h"
+#include "modules/httpd.h"
class ModuleHttpServer;
static ModuleHttpServer* HttpModule;
static bool claimed;
+static std::set<HttpServerSocket*> sockets;
/** HTTP socket states
*/
enum HttpState
{
- HTTP_LISTEN = 0,
- HTTP_SERVE_WAIT_REQUEST = 1,
- HTTP_SERVE_RECV_POSTDATA = 2,
- HTTP_SERVE_SEND_DATA = 3
-};
-
-class HttpServerSocket;
-
-/** This class is used to handle HTTP socket timeouts
- */
-class HttpServerTimeout : public InspTimer
-{
- private:
- /** HttpServerSocket we are attached to
- */
- HttpServerSocket* s;
- /** Socketengine the file descriptor is in
- */
- SocketEngine* SE;
- public:
- /** Attach timeout to HttpServerSocket
- */
- HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine);
- /** Handle timer tick
- */
- void Tick(time_t TIME);
+ 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 */
};
/** A socket used for HTTP transport
*/
-class HttpServerSocket : public InspSocket
+class HttpServerSocket : public BufferedSocket
{
- FileReader* index;
HttpState InternalState;
- std::stringstream headers;
+ std::string ip;
+
+ HTTPHeaders headers;
+ std::string reqbuffer;
std::string postdata;
+ unsigned int postsize;
std::string request_type;
std::string uri;
std::string http_version;
- unsigned int postsize;
- HttpServerTimeout* Timeout;
- friend class HttpServerTimeout;
-
- public:
- HttpServerSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(SI, host, port, listening, maxtime), index(index_page), postsize(0)
- {
- InternalState = HTTP_LISTEN;
- Timeout = NULL;
- }
+ public:
+ const time_t createtime;
- HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(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)
+ , createtime(ServerInstance->Time())
{
InternalState = HTTP_SERVE_WAIT_REQUEST;
- Timeout = new HttpServerTimeout(this, Instance->SE);
- Instance->Timers->AddTimer(Timeout);
- }
- FileReader* GetIndex()
- {
- return index;
+ FOREACH_MOD(OnHookIO, (this, via));
+ if (GetIOHook())
+ GetIOHook()->OnStreamSocketAccept(this, client, server);
}
~HttpServerSocket()
{
- if (Timeout)
- {
- if (Instance->Time() < Timeout->GetTimer())
- Instance->Timers->DelTimer(Timeout);
- Timeout = NULL;
- }
+ sockets.erase(this);
}
- virtual int OnIncomingConnection(int newsock, char* ip)
- {
- if (InternalState == HTTP_LISTEN)
- {
- new HttpServerSocket(this->Instance, newsock, ip, index);
- }
- return true;
- }
-
- virtual void OnClose()
+ void OnError(BufferedSocketError) CXX11_OVERRIDE
{
+ ServerInstance->GlobalCulls.AddItem(this);
}
std::string Response(int response)
default:
return "WTF";
break;
-
+
}
}
- void SendHeaders(unsigned long size, int response, const std::string &extraheaders)
+ void SendHTTPError(int response)
+ {
+ HTTPHeaders empty;
+ std::string data = "<html><head></head><body>Server error "+ConvToStr(response)+": "+Response(response)+"<br>"+
+ "<small>Powered by <a href='http://www.inspircd.org'>InspIRCd</a></small></body></html>";
+
+ SendHeaders(data.length(), response, empty);
+ WriteData(data);
+ }
+
+ void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders)
{
- time_t local = this->Instance->Time();
+
+ WriteData(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n");
+
+ time_t local = ServerInstance->Time();
struct tm *timeinfo = gmtime(&local);
- this->Write("HTTP/1.1 "+ConvToStr(response)+" "+Response(response)+"\r\nDate: ");
- this->Write(asctime(timeinfo));
- if (extraheaders.empty())
- this->Write("Content-Type: text/html\r\n");
+ 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
- this->Write(extraheaders);
- this->Write("Server: InspIRCd/m_httpd.so/1.1\r\nContent-Length: "+ConvToStr(size)+
- "\r\nConnection: close\r\n\r\n");
- if (response != 200)
- this->Write("<html><head></head><body>Server error "+ConvToStr(response)+": "+Response(response)+"<br>"+
- "<small>Powered by <a href='http://www.inspircd.org'>InspIRCd</a></small></body></html>\r\n");
+ 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");
}
- virtual bool OnDataReady()
+ void OnDataReady()
{
- char* data = this->Read();
-
- /* Check that the data read is a valid pointer and it has some content */
- if (data && *data)
+ if (InternalState == HTTP_SERVE_RECV_POSTDATA)
{
- headers << data;
+ postdata.append(recvq);
+ if (postdata.length() >= postsize)
+ ServeData();
+ }
+ else
+ {
+ reqbuffer.append(recvq);
- if (headers.str().find("\r\n\r\n") != std::string::npos)
+ if (reqbuffer.length() >= 8192)
{
- if (request_type.empty())
- {
- headers >> request_type;
- headers >> uri;
- headers >> http_version;
+ ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "m_httpd dropped connection due to an oversized request buffer");
+ reqbuffer.clear();
+ SetError("Buffer");
+ }
- std::transform(request_type.begin(), request_type.end(), request_type.begin(), ::toupper);
- std::transform(http_version.begin(), http_version.end(), http_version.begin(), ::toupper);
- }
+ if (InternalState == HTTP_SERVE_WAIT_REQUEST)
+ CheckRequestBuffer();
+ }
+ }
- if ((InternalState == HTTP_SERVE_WAIT_REQUEST) && (request_type == "POST"))
- {
- /* Do we need to fetch postdata? */
- postdata.clear();
- InternalState = HTTP_SERVE_RECV_POSTDATA;
- std::string header_item;
- while (headers >> header_item)
- {
- if (header_item == "Content-Length:")
- {
- headers >> header_item;
- postsize = atoi(header_item.c_str());
- }
- }
- if (!postsize)
- {
- InternalState = HTTP_SERVE_SEND_DATA;
- SendHeaders(0, 400, "");
- Timeout = new HttpServerTimeout(this, Instance->SE);
- Instance->Timers->AddTimer(Timeout);
- }
- else
- {
- std::string::size_type x = headers.str().find("\r\n\r\n");
- postdata = headers.str().substr(x+4, headers.str().length());
- /* Get content length and store */
- if (postdata.length() >= postsize)
- ServeData();
- }
- }
- else if (InternalState == HTTP_SERVE_RECV_POSTDATA)
- {
- /* Add postdata, once we have it all, send the event */
- postdata.append(data);
- if (postdata.length() >= postsize)
- ServeData();
- }
- else
+ void CheckRequestBuffer()
+ {
+ std::string::size_type reqend = reqbuffer.find("\r\n\r\n");
+ if (reqend == std::string::npos)
+ return;
+
+ // We have the headers; parse them all
+ std::string::size_type hbegin = 0, hend;
+ while ((hend = reqbuffer.find("\r\n", hbegin)) != std::string::npos)
+ {
+ if (hbegin == hend)
+ break;
+
+ if (request_type.empty())
+ {
+ std::istringstream cheader(std::string(reqbuffer, hbegin, hend - hbegin));
+ cheader >> request_type;
+ cheader >> uri;
+ cheader >> http_version;
+
+ if (request_type.empty() || uri.empty() || http_version.empty())
{
- ServeData();
+ SendHTTPError(400);
+ return;
}
- return true;
+
+ hbegin = hend + 2;
+ continue;
}
- return true;
+
+ 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;
}
- else
+
+ reqbuffer.erase(0, reqend + 4);
+
+ std::transform(request_type.begin(), request_type.end(), request_type.begin(), ::toupper);
+ std::transform(http_version.begin(), http_version.end(), http_version.begin(), ::toupper);
+
+ if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
{
- return false;
+ SendHTTPError(505);
+ return;
}
+
+ 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);
+ reqbuffer.erase(0, postsize);
+ }
+ else if (!reqbuffer.empty())
+ {
+ postdata = reqbuffer;
+ reqbuffer.clear();
+ }
+
+ if (postdata.length() >= postsize)
+ ServeData();
+
+ return;
+ }
+
+ ServeData();
}
void ServeData()
{
- /* Headers are complete */
InternalState = HTTP_SERVE_SEND_DATA;
- Instance->Timers->DelTimer(Timeout);
- Timeout = NULL;
-
- if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
- {
- SendHeaders(0, 505, "");
- }
- else
+ claimed = false;
+ HTTPRequest acl((Module*)HttpModule, "httpd_acl", request_type, uri, &headers, this, ip, postdata);
+ acl.Send();
+ if (!claimed)
{
- if ((request_type == "GET") && (uri == "/"))
+ HTTPRequest url((Module*)HttpModule, "httpd_url", request_type, uri, &headers, this, ip, postdata);
+ url.Send();
+ if (!claimed)
{
- SendHeaders(index->ContentSize(), 200, "");
- this->Write(index->Contents());
- }
- else
- {
- claimed = false;
- HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP(),postdata);
- Event e((char*)&httpr, (Module*)HttpModule, "httpd_url");
- e.Send(this->Instance);
- if (!claimed)
- {
- SendHeaders(0, 404, "");
- }
+ SendHTTPError(404);
}
}
- Timeout = new HttpServerTimeout(this, Instance->SE);
- Instance->Timers->AddTimer(Timeout);
}
- void Page(std::stringstream* n, int response, std::string& extraheaders)
+ void Page(std::stringstream* n, int response, HTTPHeaders *hheaders)
{
- SendHeaders(n->str().length(), response, extraheaders);
- this->Write(n->str());
+ SendHeaders(n->str().length(), response, *hheaders);
+ WriteData(n->str());
}
};
-HttpServerTimeout::HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine) : InspTimer(60, time(NULL)), s(sock), SE(engine)
+class HTTPdAPIImpl : public HTTPdAPIBase
{
-}
+ public:
+ HTTPdAPIImpl(Module* parent)
+ : HTTPdAPIBase(parent)
+ {
+ }
-void HttpServerTimeout::Tick(time_t TIME)
-{
- SE->DelFd(s);
- s->Close();
- s->Timeout = NULL;
-}
+ void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE
+ {
+ claimed = true;
+ resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
+ }
+};
class ModuleHttpServer : public Module
{
- std::vector<HttpServerSocket*> httpsocks;
- public:
+ std::vector<HttpServerSocket *> httpsocks;
+ HTTPdAPIImpl APIImpl;
+ unsigned int timeoutsec;
- void ReadConfig()
+ public:
+ ModuleHttpServer()
+ : APIImpl(this)
{
- int port;
- std::string host;
- std::string bindip;
- std::string indexfile;
- FileReader* index;
- HttpServerSocket* http;
- ConfigReader c(ServerInstance);
-
- httpsocks.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 HttpServerSocket(ServerInstance, bindip, port, true, 0, index);
- httpsocks.push_back(http);
- }
}
- ModuleHttpServer(InspIRCd* Me) : Module(Me)
+ void init() CXX11_OVERRIDE
{
- ReadConfig();
HttpModule = this;
}
- void OnEvent(Event* event)
+ void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
{
+ ConfigTag* tag = ServerInstance->Config->ConfValue("httpd");
+ timeoutsec = tag->getInt("timeout");
}
- char* OnRequest(Request* request)
+ ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
{
- claimed = true;
- HTTPDocument* doc = (HTTPDocument*)request->GetData();
- HttpServerSocket* sock = (HttpServerSocket*)doc->sock;
- sock->Page(doc->GetDocument(), doc->GetResponseCode(), doc->GetExtraHeaders());
- return NULL;
+ 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;
}
- void Implements(char* List)
+ void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE
{
- List[I_OnEvent] = List[I_OnRequest] = 1;
+ if (!timeoutsec)
+ return;
+
+ time_t oldest_allowed = curtime - timeoutsec;
+ for (std::set<HttpServerSocket*>::const_iterator i = sockets.begin(); i != sockets.end(); )
+ {
+ HttpServerSocket* sock = *i;
+ ++i;
+ if (sock->createtime < oldest_allowed)
+ {
+ sock->cull();
+ delete sock;
+ }
+ }
}
- virtual ~ModuleHttpServer()
+ CullResult cull() CXX11_OVERRIDE
{
- for (size_t i = 0; i < httpsocks.size(); i++)
+ std::set<HttpServerSocket*> local;
+ local.swap(sockets);
+ for (std::set<HttpServerSocket*>::const_iterator i = local.begin(); i != local.end(); ++i)
{
- ServerInstance->SE->DelFd(httpsocks[i]);
- httpsocks[i]->Close();
- delete httpsocks[i]->GetIndex();
+ HttpServerSocket* sock = *i;
+ sock->cull();
+ delete sock;
}
- ServerInstance->InspSocketCull();
+ return Module::cull();
}
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+ return Version("Provides HTTP serving facilities to modules", VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff