X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=35ae9abe5cecd8b7ba010e86a5e53e9e27919917;hb=97b5e92c3d1195c4e3b3dc8dea3183c06399414e;hp=a4452c9c09a1679adce6eff2a9ff0d798fdba373;hpb=8f13eddcd3f23a2c47e88e176f2e5032f8227450;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index a4452c9c0..35ae9abe5 100644
--- 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 insp::intrusive_list<HttpServerSocket> sockets;
+static Events::ModuleEventProvider* aclevprov;
+static Events::ModuleEventProvider* reqevprov;
 
 /** HTTP socket states
  */
@@ -75,10 +76,18 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 		, postsize(0)
 		, waitingcull(false)
 	{
-		ServerInstance->Timers.AddTimer(this);
+		if ((!via->iohookprovs.empty()) && (via->iohookprovs.back()))
+		{
+			via->iohookprovs.back()->OnAccept(this, client, server);
+			// IOHook may have errored
+			if (!getError().empty())
+			{
+				AddToCull();
+				return;
+			}
+		}
 
-		if (via->iohookprov)
-			via->iohookprov->OnAccept(this, client, server);
+		ServerInstance->Timers.AddTimer(this);
 	}
 
 	~HttpServerSocket()
@@ -215,7 +224,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 		WriteData("\r\n");
 	}
 
-	void OnDataReady()
+	void OnDataReady() CXX11_OVERRIDE
 	{
 		if (InternalState == HTTP_SERVE_RECV_POSTDATA)
 		{
@@ -269,7 +278,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 				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))
@@ -300,7 +309,7 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 
 			if (reqbuffer.length() >= postsize)
 			{
-				postdata = reqbuffer.substr(0, postsize);
+				postdata.assign(reqbuffer, 0, postsize);
 				reqbuffer.erase(0, postsize);
 			}
 			else if (!reqbuffer.empty())
@@ -322,14 +331,14 @@ class HttpServerSocket : public BufferedSocket, public Timer, public insp::intru
 	{
 		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);
 			}
@@ -363,7 +372,6 @@ class HTTPdAPIImpl : public HTTPdAPIBase
 
 	void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE
 	{
-		claimed = true;
 		resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
 	}
 };
@@ -372,11 +380,17 @@ class ModuleHttpServer : public Module
 {
 	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
@@ -401,6 +415,20 @@ class ModuleHttpServer : public Module
 		return MOD_RES_ALLOW;
 	}
 
+	void OnUnloadModule(Module* mod) CXX11_OVERRIDE
+	{
+		for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); )
+		{
+			HttpServerSocket* sock = *i;
+			++i;
+			if (sock->GetModHook(mod))
+			{
+				sock->cull();
+				delete sock;
+			}
+		}
+	}
+
 	CullResult cull() CXX11_OVERRIDE
 	{
 		for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); ++i)