Merge branch 'master+writev'

[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 98dfcc3870b9a73cf212d5c236e709e8516d87e7..e09ca3fa2c03c604f644736e7c839065ff08be00 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -29,8 +29,9 @@
 class ModuleHttpServer;
 
 static ModuleHttpServer* HttpModule;
-static bool claimed;
-static std::set<HttpServerSocket*> sockets;
+static insp::intrusive_list<HttpServerSocket> sockets;
+static Events::ModuleEventProvider* aclevprov;
+static Events::ModuleEventProvider* reqevprov;
 
 /** HTTP socket states
  */
@@ -43,7 +44,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;
@@ -56,14 +57,26 @@ class HttpServerSocket : public BufferedSocket
        std::string uri;
        std::string http_version;
 
- public:
-       const time_t createtime;
+       /** True if this object is in the cull list
+        */
+       bool waitingcull;
 
-       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())
+       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, 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);
 
                if (via->iohookprov)
                        via->iohookprov->OnAccept(this, client, server);
@@ -76,7 +89,7 @@ class HttpServerSocket : public BufferedSocket
 
        void OnError(BufferedSocketError) CXX11_OVERRIDE
        {
-               ServerInstance->GlobalCulls.AddItem(this);
+               AddToCull();
        }
 
        std::string Response(int response)
@@ -257,7 +270,7 @@ class HttpServerSocket : public BufferedSocket
                                continue;
                        }
 
-                       std::string cheader = reqbuffer.substr(hbegin, hend - hbegin);
+                       std::string cheader(reqbuffer, hbegin, hend - hbegin);
 
                        std::string::size_type fieldsep = cheader.find(':');
                        if ((fieldsep == std::string::npos) || (fieldsep == 0) || (fieldsep == cheader.length() - 1))
@@ -288,7 +301,7 @@ class HttpServerSocket : public BufferedSocket
 
                        if (reqbuffer.length() >= postsize)
                        {
-                               postdata = reqbuffer.substr(0, postsize);
+                               postdata.assign(reqbuffer, 0, postsize);
                                reqbuffer.erase(0, postsize);
                        }
                        else if (!reqbuffer.empty())
@@ -310,14 +323,14 @@ class HttpServerSocket : public BufferedSocket
        {
                InternalState = HTTP_SERVE_SEND_DATA;
 
-               claimed = false;
-               HTTPRequest acl((Module*)HttpModule, "httpd_acl", request_type, uri, &headers, this, ip, postdata);
-               acl.Send();
-               if (!claimed)
+               ModResult MOD_RESULT;
+               HTTPRequest acl(request_type, uri, &headers, this, ip, postdata);
+               FIRST_MOD_RESULT_CUSTOM(*aclevprov, HTTPACLEventListener, OnHTTPACLCheck, MOD_RESULT, (acl));
+               if (MOD_RESULT != MOD_RES_DENY)
                {
-                       HTTPRequest url((Module*)HttpModule, "httpd_url", request_type, uri, &headers, this, ip, postdata);
-                       url.Send();
-                       if (!claimed)
+                       HTTPRequest url(request_type, uri, &headers, this, ip, postdata);
+                       FIRST_MOD_RESULT_CUSTOM(*reqevprov, HTTPRequestEventListener, OnHTTPRequest, MOD_RESULT, (url));
+                       if (MOD_RESULT == MOD_RES_PASSTHRU)
                        {
                                SendHTTPError(404);
                        }
@@ -329,6 +342,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
@@ -341,21 +364,25 @@ class HTTPdAPIImpl : public HTTPdAPIBase
 
        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;
+       Events::ModuleEventProvider acleventprov;
+       Events::ModuleEventProvider reqeventprov;
 
  public:
        ModuleHttpServer()
                : APIImpl(this)
+               , acleventprov(this, "event/http-acl")
+               , reqeventprov(this, "event/http-request")
        {
+               aclevprov = &acleventprov;
+               reqevprov = &reqeventprov;
        }
 
        void init() CXX11_OVERRIDE
@@ -376,34 +403,16 @@ class ModuleHttpServer : public Module
                int port;
                std::string incomingip;
                irc::sockets::satoap(*client, incomingip, port);
-               sockets.insert(new HttpServerSocket(nfd, incomingip, from, client, server));
+               sockets.push_front(new HttpServerSocket(nfd, incomingip, from, client, server, timeoutsec));
                return MOD_RES_ALLOW;
        }
 
-       void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE
-       {
-               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
        {
-               std::set<HttpServerSocket*> local;
-               local.swap(sockets);
-               for (std::set<HttpServerSocket*>::const_iterator i = local.begin(); i != local.end(); ++i)
+               for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); ++i)
                {
                        HttpServerSocket* sock = *i;
-                       sock->cull();
-                       delete sock;
+                       sock->AddToCull();
                }
                return Module::cull();
        }