]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/modules/m_httpd.cpp
Merge insp20
[user/henk/code/inspircd.git] / src / modules / m_httpd.cpp
index ee45443715baaa172c42b8cf2668d7a8b2cfb28f..735551dffa3ba6dd184a014fa72200b99560d961 100644 (file)
@@ -1,44 +1,53 @@
-/*       +------------------------------------+
- *       | Inspire Internet Relay Chat Daemon |
- *       +------------------------------------+
+/*
+ * InspIRCd -- Internet Relay Chat Daemon
  *
- *  InspIRCd: (C) 2002-2008 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"
 
-/* $ModDesc: Provides HTTP serving facilities to modules */
-/* $ModDep: httpd.h */
+#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, /* Waiting for a full request */
-       HTTP_SERVE_RECV_POSTDATA = 2, /* Waiting to finish recieving POST data */
-       HTTP_SERVE_SEND_DATA = 3 /* Sending response */
+       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 BufferedSocket
 {
-       FileReader* index;
        HttpState InternalState;
-       
+       std::string ip;
+
        HTTPHeaders headers;
        std::string reqbuffer;
        std::string postdata;
@@ -46,39 +55,29 @@ class HttpServerSocket : public BufferedSocket
        std::string request_type;
        std::string uri;
        std::string http_version;
-       
- public:
 
-       HttpServerSocket(InspIRCd* SI, std::string shost, int iport, bool listening, unsigned long maxtime, FileReader* index_page) : BufferedSocket(SI, shost, iport, listening, maxtime), index(index_page), postsize(0)
-       {
-               InternalState = HTTP_LISTEN;
-       }
+ 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(OnHookIO, (this, via));
+               if (GetIOHook())
+                       GetIOHook()->OnStreamSocketAccept(this, client, server);
        }
 
        ~HttpServerSocket()
        {
-       }
-       
-       virtual int OnIncomingConnection(int newsock, char* ip)
-       {
-               if (InternalState == HTTP_LISTEN)
-               {
-                       new HttpServerSocket(this->Instance, newsock, ip, index);
-               }
-               return true;
+               sockets.erase(this);
        }
 
-       virtual void OnClose()
+       void OnError(BufferedSocketError) CXX11_OVERRIDE
        {
+               ServerInstance->GlobalCulls.AddItem(this);
        }
 
        std::string Response(int response)
@@ -168,142 +167,131 @@ class HttpServerSocket : public BufferedSocket
                        default:
                                return "WTF";
                        break;
-                               
+
                }
        }
-       
+
        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);
-               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->Instance->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.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");
-               
-               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)
                        {
-                               Instance->Logs->Log("m_httpd",DEBUG, "m_httpd dropped connection due to an oversized request buffer");
+                               ServerInstance->Logs->Log(MODNAME, 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()
        {
                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())
                                {
                                        SendHTTPError(400);
-                                       Instance->SE->WantWrite(this);
                                        return;
                                }
-                               
+
                                hbegin = hend + 2;
                                continue;
                        }
-                       
+
                        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);
-                               Instance->SE->WantWrite(this);
                                return;
                        }
-                       
+
                        headers.SetHeader(cheader.substr(0, fieldsep), cheader.substr(fieldsep + 2));
-                       
+
                        hbegin = hend + 2;
                }
-               
+
                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"))
                {
                        SendHTTPError(505);
-                       Instance->SE->WantWrite(this);
                        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;
-                       
+
                        if (reqbuffer.length() >= postsize)
                        {
                                postdata = reqbuffer.substr(0, postsize);
@@ -314,13 +302,13 @@ class HttpServerSocket : public BufferedSocket
                                postdata = reqbuffer;
                                reqbuffer.clear();
                        }
-                       
+
                        if (postdata.length() >= postsize)
                                ServeData();
-                       
+
                        return;
                }
-               
+
                ServeData();
        }
 
@@ -328,109 +316,110 @@ class HttpServerSocket : public BufferedSocket
        {
                InternalState = HTTP_SERVE_SEND_DATA;
 
-               if ((request_type == "GET") && (uri == "/"))
-               {
-                       HTTPHeaders empty;
-                       SendHeaders(index->ContentSize(), 200, empty);
-                       this->Write(index->Contents());
-                       Instance->SE->WantWrite(this);
-               }
-               else
+               claimed = false;
+               HTTPRequest acl((Module*)HttpModule, "httpd_acl", request_type, uri, &headers, this, ip, postdata);
+               acl.Send();
+               if (!claimed)
                {
-                       claimed = false;
-                       HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP(),postdata);
-                       Event acl((char*)&httpr, (Module*)HttpModule, "httpd_acl");
-                       acl.Send(this->Instance);
+                       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->Instance);
-                               if (!claimed)
-                               {
-                                       SendHTTPError(404);
-                                       Instance->SE->WantWrite(this);
-                               }
+                               SendHTTPError(404);
                        }
                }
        }
 
-
-       bool OnWriteReady()
-       {
-               return false;
-       }
-
        void Page(std::stringstream* n, int response, HTTPHeaders *hheaders)
        {
                SendHeaders(n->str().length(), response, *hheaders);
-               this->Write(n->str());
-               Instance->SE->WantWrite(this);
+               WriteData(n->str());
        }
 };
 
-class ModuleHttpServer : public Module
+class HTTPdAPIImpl : public HTTPdAPIBase
 {
-       std::vector<HttpServerSocket*> httpsocks;
  public:
+       HTTPdAPIImpl(Module* parent)
+               : HTTPdAPIBase(parent)
+       {
+       }
 
-       void ReadConfig()
+       void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE
        {
-               int port;
-               std::string host;
-               std::string bindip;
-               std::string indexfile;
-               FileReader* index;
-               HttpServerSocket* http;
-               ConfigReader c(ServerInstance);
+               claimed = true;
+               resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
+       }
+};
 
-               httpsocks.clear();
+class ModuleHttpServer : public Module
+{
+       std::vector<HttpServerSocket *> httpsocks;
+       HTTPdAPIImpl APIImpl;
+       unsigned int timeoutsec;
 
-               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);
-               }
+ public:
+       ModuleHttpServer()
+               : APIImpl(this)
+       {
        }
 
-       ModuleHttpServer(InspIRCd* Me) : Module(Me)
+       void init() CXX11_OVERRIDE
        {
-               ReadConfig();
                HttpModule = this;
-               Implementation eventlist[] = { I_OnRequest };
-               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
-       virtual const char* OnRequest(Request* request)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               claimed = true;
-               HTTPDocument* doc = (HTTPDocument*)request->GetData();
-               HttpServerSocket* sock = (HttpServerSocket*)doc->sock;
-               sock->Page(doc->GetDocument(), doc->GetResponseCode(), &doc->headers);
-               return NULL;
+               ConfigTag* tag = ServerInstance->Config->ConfValue("httpd");
+               timeoutsec = tag->getInt("timeout");
        }
 
+       ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
+       {
+               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 OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE
+       {
+               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->BufferedSocketCull();
+               return Module::cull();
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
-               return Version(1,2,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+               return Version("Provides HTTP serving facilities to modules", VF_VENDOR);
        }
 };