Fix a regression in m_cloaking

[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 e6ed693806a7b67575e8fc0f2252c19545e822c8..a4452c9c09a1679adce6eff2a9ff0d798fdba373 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 insp::intrusive_list<HttpServerSocket> sockets;
 
 /** HTTP socket states
  */
@@ -44,7 +43,7 @@ enum HttpState
 
 /** A socket used for HTTP transport
  */
-class HttpServerSocket : public BufferedSocket
+class HttpServerSocket : public BufferedSocket, public Timer, public insp::intrusive_list_node<HttpServerSocket>
 {
        HttpState InternalState;
        std::string ip;
@@ -57,20 +56,39 @@ class HttpServerSocket : public BufferedSocket
        std::string uri;
        std::string http_version;
 
+       /** True if this object is in the cull list
+        */
+       bool waitingcull;
+
+       bool Tick(time_t currtime) CXX11_OVERRIDE
+       {
+               AddToCull();
+               return false;
+       }
+
  public:
-       HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
-               : BufferedSocket(newfd), ip(IP), postsize(0)
+       HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server, unsigned int timeoutsec)
+               : BufferedSocket(newfd)
+               , Timer(timeoutsec)
+               , InternalState(HTTP_SERVE_WAIT_REQUEST)
+               , ip(IP)
+               , postsize(0)
+               , waitingcull(false)
        {
-               InternalState = HTTP_SERVE_WAIT_REQUEST;
+               ServerInstance->Timers.AddTimer(this);
 
-               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
        {
-               ServerInstance->GlobalCulls.AddItem(this);
+               AddToCull();
        }
 
        std::string Response(int response)
@@ -98,7 +116,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 +197,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)
@@ -328,6 +341,16 @@ class HttpServerSocket : public BufferedSocket
                SendHeaders(n->str().length(), response, *hheaders);
                WriteData(n->str());
        }
+
+       void AddToCull()
+       {
+               if (waitingcull)
+                       return;
+
+               waitingcull = true;
+               Close();
+               ServerInstance->GlobalCulls.AddItem(this);
+       }
 };
 
 class HTTPdAPIImpl : public HTTPdAPIBase
@@ -347,8 +370,8 @@ class HTTPdAPIImpl : public HTTPdAPIBase
 
 class ModuleHttpServer : public Module
 {
-       std::vector<HttpServerSocket *> httpsocks;
        HTTPdAPIImpl APIImpl;
+       unsigned int timeoutsec;
 
  public:
        ModuleHttpServer()
@@ -359,7 +382,12 @@ class ModuleHttpServer : public Module
        void init() CXX11_OVERRIDE
        {
                HttpModule = this;
-               ServerInstance->Modules->AddService(APIImpl);
+       }
+
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
+       {
+               ConfigTag* tag = ServerInstance->Config->ConfValue("httpd");
+               timeoutsec = tag->getInt("timeout", 10, 1);
        }
 
        ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
@@ -369,17 +397,18 @@ class ModuleHttpServer : public Module
                int port;
                std::string incomingip;
                irc::sockets::satoap(*client, incomingip, port);
-               new HttpServerSocket(nfd, incomingip, from, client, server);
+               sockets.push_front(new HttpServerSocket(nfd, incomingip, from, client, server, timeoutsec));
                return MOD_RES_ALLOW;
        }
 
-       ~ModuleHttpServer()
+       CullResult cull() CXX11_OVERRIDE
        {
-               for (size_t i = 0; i < httpsocks.size(); i++)
+               for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); ++i)
                {
-                       httpsocks[i]->cull();
-                       delete httpsocks[i];
+                       HttpServerSocket* sock = *i;
+                       sock->AddToCull();
                }
+               return Module::cull();
        }
 
        Version GetVersion() CXX11_OVERRIDE