m_spanningtree Replace manual string building of outgoing commands with CmdBuilder...

[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 bb5d5c0b0867111c8d69db22a27f0034e5773a77..bf372f34f69368c709a4284c20bce56bfccc61cb 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -26,12 +26,11 @@
 #include "iohook.h"
 #include "modules/httpd.h"
 
-/* $ModDep: modules/httpd.h */
-
 class ModuleHttpServer;
 
 static ModuleHttpServer* HttpModule;
 static bool claimed;
+static std::set<HttpServerSocket*> sockets;
 
 /** HTTP socket states
  */
@@ -58,14 +57,21 @@ 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(OnHookIO, (this, via));
-               if (GetIOHook())
-                       GetIOHook()->OnStreamSocketAccept(this, client, server);
+               if (via->iohookprov)
+                       via->iohookprov->OnAccept(this, client, server);
+       }
+
+       ~HttpServerSocket()
+       {
+               sockets.erase(this);
        }
 
        void OnError(BufferedSocketError) CXX11_OVERRIDE
@@ -98,7 +104,7 @@ class HttpServerSocket : public BufferedSocket
                        case 300:
                                return "MULTIPLE CHOICES";
                        case 301:
-                               return "MOVED PERMENANTLY";
+                               return "MOVED PERMANENTLY";
                        case 302:
                                return "FOUND";
                        case 303:
@@ -179,13 +185,8 @@ class HttpServerSocket : public BufferedSocket
 
                WriteData(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n");
 
-               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", BRANCH);
+               rheaders.CreateHeader("Date", InspIRCd::TimeString(ServerInstance->Time(), "%a, %d %b %Y %H:%M:%S GMT", true));
+               rheaders.CreateHeader("Server", INSPIRCD_BRANCH);
                rheaders.SetHeader("Content-Length", ConvToStr(size));
 
                if (size)
@@ -349,6 +350,7 @@ class ModuleHttpServer : public Module
 {
        std::vector<HttpServerSocket *> httpsocks;
        HTTPdAPIImpl APIImpl;
+       unsigned int timeoutsec;
 
  public:
        ModuleHttpServer()
@@ -359,8 +361,12 @@ class ModuleHttpServer : public Module
        void init() CXX11_OVERRIDE
        {
                HttpModule = this;
-               ServerInstance->Modules->AddService(APIImpl);
-               ServerInstance->Modules->Attach(I_OnAcceptConnection, this);
+       }
+
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               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
@@ -370,17 +376,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