-/* +------------------------------------+
- * | 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 <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"
+#include "iohook.h"
+#include "modules/httpd.h"
-/* $ModDesc: Provides HTTP serving facilities to modules */
-/* $ModDep: httpd.h */
+/* $ModDep: modules/httpd.h */
class ModuleHttpServer;
*/
class HttpServerSocket : public BufferedSocket
{
- FileReader* index;
HttpState InternalState;
std::string ip;
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);
}
- ~HttpServerSocket()
- {
- }
-
- virtual void OnError(BufferedSocketError)
+ void OnError(BufferedSocketError) CXX11_OVERRIDE
{
+ ServerInstance->GlobalCulls.AddItem(this);
}
std::string Response(int response)
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)
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");
}
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);
- WriteData(index->Contents());
- }
- else
- {
- claimed = false;
- HTTPRequest httpr(request_type,uri,&headers,this,ip,postdata);
- Event acl((char*)&httpr, (Module*)HttpModule, "httpd_acl");
- acl.Send();
+ 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();
- if (!claimed)
- {
- SendHTTPError(404);
- }
+ SendHTTPError(404);
}
}
}
}
};
-/** Spawn HTTP sockets from a listener
- */
-class HttpListener : public ListenSocketBase
+class HTTPdAPIImpl : public HTTPdAPIBase
{
- FileReader* index;
-
public:
- HttpListener(FileReader *idx, int port, const std::string &addr) : ListenSocketBase(port, addr)
+ HTTPdAPIImpl(Module* parent)
+ : HTTPdAPIBase(parent)
{
- this->index = idx;
}
- virtual void OnAcceptReady(int nfd)
+ void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE
{
- int port;
- std::string incomingip;
- irc::sockets::satoap(&client, incomingip, port);
- new HttpServerSocket(nfd, incomingip.c_str(), index);
+ claimed = true;
+ resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
}
};
class ModuleHttpServer : public Module
{
std::vector<HttpServerSocket *> httpsocks;
- std::vector<HttpListener *> httplisteners;
- public:
+ HTTPdAPIImpl APIImpl;
- void ReadConfig()
+ public:
+ ModuleHttpServer()
+ : APIImpl(this)
{
- 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())
- throw ModuleException("Can't read index file: "+indexfile);
- http = new HttpListener(index, port, (char *)bindip.c_str()); // XXX this cast SUCKS.
- httplisteners.push_back(http);
- }
}
- ModuleHttpServer() {
- ReadConfig();
+ void init() CXX11_OVERRIDE
+ {
HttpModule = this;
- Implementation eventlist[] = { I_OnRequest };
- ServerInstance->Modules->Attach(eventlist, this, 1);
+ ServerInstance->Modules->AddService(APIImpl);
+ ServerInstance->Modules->Attach(I_OnAcceptConnection, this);
}
- virtual const 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->headers);
- return NULL;
+ 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()
+ ~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];
}
}
- virtual Version GetVersion()
+ Version GetVersion() CXX11_OVERRIDE
{
- return Version("Provides HTTP serving facilities to modules", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
+ return Version("Provides HTTP serving facilities to modules", VF_VENDOR);
}
};