Merge insp20

[user/henk/code/inspircd.git] / src / modules / m_httpd.cpp

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index cbee27958b5aeb4fe85fe2e246ed6a444b26cb78..735551dffa3ba6dd184a014fa72200b99560d961 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -23,15 +23,14 @@
 
 
 #include "inspircd.h"
+#include "iohook.h"
 #include "modules/httpd.h"
 
-/* $ModDesc: Provides HTTP serving facilities to modules */
-/* $ModDep: modules/httpd.h */
-
 class ModuleHttpServer;
 
 static ModuleHttpServer* HttpModule;
 static bool claimed;
+static std::set<HttpServerSocket*> sockets;
 
 /** HTTP socket states
  */
@@ -58,16 +57,24 @@ class HttpServerSocket : public BufferedSocket
        std::string http_version;
 
  public:
+       const time_t createtime;
+
        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));
+               FOREACH_MOD(OnHookIO, (this, via));
                if (GetIOHook())
                        GetIOHook()->OnStreamSocketAccept(this, client, server);
        }
 
+       ~HttpServerSocket()
+       {
+               sockets.erase(this);
+       }
+
        void OnError(BufferedSocketError) CXX11_OVERRIDE
        {
                ServerInstance->GlobalCulls.AddItem(this);
@@ -216,7 +223,7 @@ class HttpServerSocket : public BufferedSocket
 
                        if (reqbuffer.length() >= 8192)
                        {
-                               ServerInstance->Logs->Log("m_httpd", LOG_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();
                                SetError("Buffer");
                        }
@@ -330,24 +337,42 @@ class HttpServerSocket : public BufferedSocket
        }
 };
 
+class HTTPdAPIImpl : public HTTPdAPIBase
+{
+ public:
+       HTTPdAPIImpl(Module* parent)
+               : HTTPdAPIBase(parent)
+       {
+       }
+
+       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;
+       HTTPdAPIImpl APIImpl;
+       unsigned int timeoutsec;
 
  public:
+       ModuleHttpServer()
+               : APIImpl(this)
+       {
+       }
+
        void init() CXX11_OVERRIDE
        {
                HttpModule = this;
-               ServerInstance->Modules->Attach(I_OnAcceptConnection, this);
        }
 
-       void OnRequest(Request& request) CXX11_OVERRIDE
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               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);
+               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
@@ -357,17 +382,39 @@ class ModuleHttpServer : public Module
                int port;
                std::string incomingip;
                irc::sockets::satoap(*client, incomingip, port);
-               new HttpServerSocket(nfd, incomingip, from, client, server);
+               sockets.insert(new HttpServerSocket(nfd, incomingip, from, client, server));
                return MOD_RES_ALLOW;
        }
 
-       ~ModuleHttpServer()
+       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;
+                       }
+               }
+       }
+
+       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)
                {
-                       httpsocks[i]->cull();
-                       delete httpsocks[i];
+                       HttpServerSocket* sock = *i;
+                       sock->cull();
+                       delete sock;
                }
+               return Module::cull();
        }
 
        Version GetVersion() CXX11_OVERRIDE