-/* +------------------------------------+
- * | Inspire Internet Relay Chat Daemon |
- * +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
*
- * InspIRCd: (C) 2002-2009 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 "httpd.h"
static ModuleHttpServer* HttpModule;
static bool claimed;
+static std::set<HttpServerSocket*> sockets;
/** HTTP socket states
*/
*/
class HttpServerSocket : public BufferedSocket
{
- FileReader* index;
HttpState InternalState;
+ std::string ip;
HTTPHeaders headers;
std::string reqbuffer;
std::string http_version;
public:
+ const time_t createtime;
- 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)
+ , createtime(ServerInstance->Time())
{
InternalState = HTTP_SERVE_WAIT_REQUEST;
- }
- FileReader* GetIndex()
- {
- return index;
+ FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
+ if (GetIOHook())
+ GetIOHook()->OnStreamSocketAccept(this, client, server);
}
~HttpServerSocket()
{
+ sockets.erase(this);
}
- virtual void OnClose()
+ virtual void OnError(BufferedSocketError)
{
+ ServerInstance->GlobalCulls.AddItem(this);
}
std::string Response(int response)
case 300:
return "MULTIPLE CHOICES";
case 301:
- return "MOVED PERMENANTLY";
+ return "MOVED PERMANENTLY";
case 302:
return "FOUND";
case 303:
"<small>Powered by <a href='http://www.inspircd.org'>InspIRCd</a></small></body></html>";
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)
*/
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");
reqbuffer.clear();
- return false;
+ SetError("Buffer");
}
if (InternalState == HTTP_SERVE_WAIT_REQUEST)
CheckRequestBuffer();
}
-
- return true;
}
void CheckRequestBuffer()
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;
{
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);
}
}
}
void Page(std::stringstream* n, int response, HTTPHeaders *hheaders)
{
SendHeaders(n->str().length(), response, *hheaders);
- this->Write(n->str());
+ WriteData(n->str());
}
};
-/** Spawn HTTP sockets from a listener
- */
-class HttpListener : public ListenSocketBase
+class ModuleHttpServer : public Module
{
- FileReader* index;
+ unsigned int timeoutsec;
public:
- HttpListener(InspIRCd* Instance, FileReader *idx, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr)
+
+ void init()
{
- this->index = idx;
+ HttpModule = this;
+ Implementation eventlist[] = { I_OnAcceptConnection, I_OnBackgroundTimer, I_OnRehash, I_OnUnloadModule };
+ ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+ OnRehash(NULL);
}
- virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
+ void OnRehash(User* user)
{
- new HttpServerSocket(ServerInstance, nfd, (char *)incomingip.c_str(), index); // ugly cast courtesy of bufferedsocket
+ ConfigTag* tag = ServerInstance->Config->ConfValue("httpd");
+ timeoutsec = tag->getInt("timeout");
}
-};
-
-class ModuleHttpServer : public Module
-{
- std::vector<HttpServerSocket *> httpsocks;
- std::vector<HttpListener *> httplisteners;
- public:
- void ReadConfig()
+ void OnRequest(Request& request)
{
- 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);
- }
+ if (strcmp(request.id, "HTTP-DOC") != 0)
+ return;
+ HTTPDocumentResponse& resp = static_cast<HTTPDocumentResponse&>(request);
+ claimed = true;
+ resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
}
- ModuleHttpServer(InspIRCd* Me) : Module(Me)
+ ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
{
- ReadConfig();
- HttpModule = this;
- Implementation eventlist[] = { I_OnRequest };
- ServerInstance->Modules->Attach(eventlist, this, 1);
+ 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 const char* OnRequest(Request* request)
+ void OnBackgroundTimer(time_t curtime)
{
- claimed = true;
- HTTPDocument* doc = (HTTPDocument*)request->GetData();
- HttpServerSocket* sock = (HttpServerSocket*)doc->sock;
- sock->Page(doc->GetDocument(), doc->GetResponseCode(), &doc->headers);
- return NULL;
- }
+ 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()
+ void OnUnloadModule(Module* mod)
{
- for (size_t i = 0; i < httplisteners.size(); i++)
+ for (std::set<HttpServerSocket*>::const_iterator i = sockets.begin(); i != sockets.end(); )
{
- delete httplisteners[i];
+ HttpServerSocket* sock = *i;
+ ++i;
+ if (sock->GetIOHook() == mod)
+ {
+ sock->cull();
+ delete sock;
+ }
}
+ }
- for (size_t i = 0; i < httpsocks.size(); i++)
+ CullResult cull()
+ {
+ 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->BufferedSocketCull();
+ return Module::cull();
}
virtual Version GetVersion()
{
- return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+ return Version("Provides HTTP serving facilities to modules", VF_VENDOR);
}
};
projects / user / henk / code / inspircd.git / blobdiff