X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=f85046fd75713dfcd32696695f0658b4d998b1f9;hb=dd501fba3fd7e5806186b79fa1d7c2b464884e69;hp=45220f6a371dc2ce953b6954c46e5b33232c6f2d;hpb=7f9c6c5118261eac40d9bae22ac2c0ede670512d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 45220f6a3..f85046fd7 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -1,93 +1,56 @@
-/*       +------------------------------------+       
+/*       +------------------------------------+
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *		       E-mail:
- *		<brain@chatspike.net>
- *	   	  <Craig@chatspike.net>
- *     
- * Written by Craig Edwards, Craig McLure, and others.
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
+ *
  * This program is free but copyrighted software; see
- *	    the file COPYING for details.
+ *            the file COPYING for details.
  *
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include <algorithm>
-#include "modules.h"
 #include "inspircd.h"
 #include "httpd.h"
 
 /* $ModDesc: Provides HTTP serving facilities to modules */
+/* $ModDep: httpd.h */
 
-class ModuleHttp;
+class ModuleHttpServer;
 
-static ModuleHttp* HttpModule;
+static ModuleHttpServer* HttpModule;
 static bool claimed;
 
 /** HTTP socket states
  */
 enum HttpState
 {
-	HTTP_LISTEN = 0,
-	HTTP_SERVE_WAIT_REQUEST = 1,
-	HTTP_SERVE_RECV_POSTDATA = 2,
-	HTTP_SERVE_SEND_DATA = 3
-};
-
-class HttpSocket;
-
-/** This class is used to handle HTTP socket timeouts
- */
-class HTTPTimeout : public InspTimer
-{
- private:
-	/** HttpSocket we are attached to
-	 */
-	HttpSocket* s;
-	/** Socketengine the file descriptor is in
-	 */
-	SocketEngine* SE;
- public:
-	/** Attach timeout to HttpSocket
-	 */
-	HTTPTimeout(HttpSocket* sock, SocketEngine* engine);
-	/** Handle timer tick
-	 */
-	void Tick(time_t TIME);
+	HTTP_SERVE_WAIT_REQUEST = 0, /* Waiting for a full request */
+	HTTP_SERVE_RECV_POSTDATA = 1, /* Waiting to finish recieving POST data */
+	HTTP_SERVE_SEND_DATA = 2 /* Sending response */
 };
 
 /** A socket used for HTTP transport
  */
-class HttpSocket : public InspSocket
+class HttpServerSocket : public BufferedSocket
 {
 	FileReader* index;
 	HttpState InternalState;
-	std::stringstream headers;
+
+	HTTPHeaders headers;
+	std::string reqbuffer;
 	std::string postdata;
+	unsigned int postsize;
 	std::string request_type;
 	std::string uri;
 	std::string http_version;
-	unsigned int postsize;
-	HTTPTimeout* Timeout;
 
  public:
 
-	HttpSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(SI, host, port, listening, maxtime), index(index_page), postsize(0)
-	{
-		SI->Log(DEBUG,"HttpSocket constructor");
-		InternalState = HTTP_LISTEN;
-		Timeout = NULL;
-	}
-
-	HttpSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, newfd, ip), index(ind), postsize(0)
+	HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : BufferedSocket(SI, newfd, ip), index(ind), postsize(0)
 	{
 		InternalState = HTTP_SERVE_WAIT_REQUEST;
-		Timeout = new HTTPTimeout(this, Instance->SE);
-		Instance->Timers->AddTimer(Timeout);
 	}
 
 	FileReader* GetIndex()
@@ -95,24 +58,8 @@ class HttpSocket : public InspSocket
 		return index;
 	}
 
-	~HttpSocket()
+	~HttpServerSocket()
 	{
-		if (Instance->Time() < Timeout->GetTimer())
-		{
-			if (Timeout)
-				Instance->Timers->DelTimer(Timeout);
-			Timeout = NULL;
-		}
-	}
-
-	virtual int OnIncomingConnection(int newsock, char* ip)
-	{
-		if (InternalState == HTTP_LISTEN)
-		{
-			HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index);
-			s = s; /* Stop GCC whining */
-		}
-		return true;
 	}
 
 	virtual void OnClose()
@@ -206,160 +153,216 @@ class HttpSocket : public InspSocket
 			default:
 				return "WTF";
 			break;
-				
+
 		}
 	}
 
-	void SendHeaders(unsigned long size, int response, const std::string &extraheaders)
+	void SendHTTPError(int response)
 	{
-		time_t local = this->Instance->Time();
+		HTTPHeaders empty;
+		std::string data = "<html><head></head><body>Server error "+ConvToStr(response)+": "+Response(response)+"<br>"+
+		                   "<small>Powered by <a href='http://www.inspircd.org'>InspIRCd</a></small></body></html>";
+
+		SendHeaders(data.length(), response, empty);
+		this->Write(data);
+	}
+
+	void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders)
+	{
+
+		this->Write(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n");
+
+		time_t local = this->ServerInstance->Time();
 		struct tm *timeinfo = gmtime(&local);
-		this->Write("HTTP/1.1 "+ConvToStr(response)+" "+Response(response)+"\r\nDate: ");
-		this->Write(asctime(timeinfo));
-		if (extraheaders.empty())
+		char *date = asctime(timeinfo);
+		date[strlen(date) - 1] = '\0';
+		rheaders.CreateHeader("Date", date);
+
+		rheaders.CreateHeader("Server", "InspIRCd/m_httpd.so/1.2");
+		rheaders.SetHeader("Content-Length", ConvToStr(size));
+
+		if (size)
+			rheaders.CreateHeader("Content-Type", "text/html");
+		else
+			rheaders.RemoveHeader("Content-Type");
+
+		/* Supporting Connection: keep-alive causes a whole world of hurt syncronizing timeouts,
+		 * so remove it, its not essential for what we need.
+		 */
+		rheaders.SetHeader("Connection", "Close");
+
+		this->Write(rheaders.GetFormattedHeaders());
+		this->Write("\r\n");
+	}
+
+	virtual bool OnDataReady()
+	{
+		const char* data = this->Read();
+
+		/* Check that the data read is a valid pointer and it has some content */
+		if (!data || !*data)
+			return false;
+
+		if (InternalState == HTTP_SERVE_RECV_POSTDATA)
 		{
-			this->Write("Content-Type: text/html\r\n");
+			postdata.append(data);
+			if (postdata.length() >= postsize)
+				ServeData();
 		}
 		else
 		{
-			this->Write(extraheaders);
+			reqbuffer.append(data);
+
+			if (reqbuffer.length() >= 8192)
+			{
+				ServerInstance->Logs->Log("m_httpd",DEBUG, "m_httpd dropped connection due to an oversized request buffer");
+				reqbuffer.clear();
+				return false;
+			}
+
+			if (InternalState == HTTP_SERVE_WAIT_REQUEST)
+				CheckRequestBuffer();
 		}
-		this->Write("Server: InspIRCd/m_httpd.so/1.1\r\nContent-Length: "+ConvToStr(size)+
-				"\r\nConnection: close\r\n\r\n");
+
+		return true;
 	}
 
-	virtual bool OnDataReady()
+	void CheckRequestBuffer()
 	{
-		char* data = this->Read();
+		std::string::size_type reqend = reqbuffer.find("\r\n\r\n");
+		if (reqend == std::string::npos)
+			return;
 
-		/* Check that the data read is a valid pointer and it has some content */
-		if (data && *data)
+		// We have the headers; parse them all
+		std::string::size_type hbegin = 0, hend;
+		while ((hend = reqbuffer.find("\r\n", hbegin)) != std::string::npos)
 		{
-			headers << data;
+			if (hbegin == hend)
+				break;
 
-			if (headers.str().find("\r\n\r\n") != std::string::npos)
+			if (request_type.empty())
 			{
-				if (request_type == "")
-				{
-					headers >> request_type;
-					headers >> uri;
-					headers >> http_version;
+				std::istringstream cheader(std::string(reqbuffer, hbegin, hend - hbegin));
+				cheader >> request_type;
+				cheader >> uri;
+				cheader >> http_version;
 
-					std::transform(request_type.begin(), request_type.end(), request_type.begin(), ::toupper);
-					std::transform(http_version.begin(), http_version.end(), http_version.begin(), ::toupper);
-				}
-
-				if ((InternalState == HTTP_SERVE_WAIT_REQUEST) && (request_type == "POST"))
-				{
-					/* Do we need to fetch postdata? */
-					postdata = "";
-					InternalState = HTTP_SERVE_RECV_POSTDATA;
-					std::string header_item;
-					while (headers >> header_item)
-					{
-						if (header_item == "Content-Length:")
-						{
-							headers >> header_item;
-							postsize = atoi(header_item.c_str());
-						}
-					}
-					if (!postsize)
-					{
-						InternalState = HTTP_SERVE_SEND_DATA;
-						SendHeaders(0, 400, "");
-						Timeout = new HTTPTimeout(this, Instance->SE);
-						Instance->Timers->AddTimer(Timeout);
-					}
-					else
-					{
-						Instance->Log(DEBUG,"%d bytes to read for POST",postsize);
-						std::string::size_type x = headers.str().find("\r\n\r\n");
-						postdata = headers.str().substr(x+4, headers.str().length());
-						/* Get content length and store */
-						Instance->Log(DEBUG,"Initial postdata: '%s'", postdata.c_str());
-						if (postdata.length() >= postsize)
-							ServeData();
-					}
-				}
-				else if (InternalState == HTTP_SERVE_RECV_POSTDATA)
+				if (request_type.empty() || uri.empty() || http_version.empty())
 				{
-					/* Add postdata, once we have it all, send the event */
-					postdata.append(data);
-					if (postdata.length() >= postsize)
-						ServeData();
+					SendHTTPError(400);
+					return;
 				}
-				else
-				{
-					ServeData();
-				}
-				return true;
+
+				hbegin = hend + 2;
+				continue;
 			}
-			return true;
+
+			std::string cheader = reqbuffer.substr(hbegin, hend - hbegin);
+
+			std::string::size_type fieldsep = cheader.find(':');
+			if ((fieldsep == std::string::npos) || (fieldsep == 0) || (fieldsep == cheader.length() - 1))
+			{
+				SendHTTPError(400);
+				return;
+			}
+
+			headers.SetHeader(cheader.substr(0, fieldsep), cheader.substr(fieldsep + 2));
+
+			hbegin = hend + 2;
 		}
-		else
+
+		reqbuffer.erase(0, reqend + 4);
+
+		std::transform(request_type.begin(), request_type.end(), request_type.begin(), ::toupper);
+		std::transform(http_version.begin(), http_version.end(), http_version.begin(), ::toupper);
+
+		if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
 		{
-			return false;
+			SendHTTPError(505);
+			return;
 		}
+
+		if (headers.IsSet("Content-Length") && (postsize = atoi(headers.GetHeader("Content-Length").c_str())) != 0)
+		{
+			InternalState = HTTP_SERVE_RECV_POSTDATA;
+
+			if (reqbuffer.length() >= postsize)
+			{
+				postdata = reqbuffer.substr(0, postsize);
+				reqbuffer.erase(0, postsize);
+			}
+			else if (!reqbuffer.empty())
+			{
+				postdata = reqbuffer;
+				reqbuffer.clear();
+			}
+
+			if (postdata.length() >= postsize)
+				ServeData();
+
+			return;
+		}
+
+		ServeData();
 	}
 
 	void ServeData()
 	{
-		/* Headers are complete */
 		InternalState = HTTP_SERVE_SEND_DATA;
 
-		Instance->Timers->DelTimer(Timeout);
-		Timeout = NULL;
-	
-		if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
+		if ((request_type == "GET") && (uri == "/"))
 		{
-			SendHeaders(0, 505, "");
+			HTTPHeaders empty;
+			SendHeaders(index->ContentSize(), 200, empty);
+			this->Write(index->Contents());
 		}
 		else
 		{
-			if ((request_type == "GET") && (uri == "/"))
-			{
-				SendHeaders(index->ContentSize(), 200, "");
-				this->Write(index->Contents());
-			}
-			else
+			claimed = false;
+			HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP(),postdata);
+			Event acl((char*)&httpr, (Module*)HttpModule, "httpd_acl");
+			acl.Send(this->ServerInstance);
+			if (!claimed)
 			{
-				claimed = false;
-				HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP(),postdata);
 				Event e((char*)&httpr, (Module*)HttpModule, "httpd_url");
-				e.Send(this->Instance);
+				e.Send(this->ServerInstance);
 				if (!claimed)
 				{
-					SendHeaders(0, 404, "");
-					Instance->Log(DEBUG,"Page not claimed, 404");
+					SendHTTPError(404);
 				}
 			}
 		}
-		Timeout = new HTTPTimeout(this, Instance->SE);
-		Instance->Timers->AddTimer(Timeout);
 	}
 
-	void Page(std::stringstream* n, int response, std::string& extraheaders)
+	void Page(std::stringstream* n, int response, HTTPHeaders *hheaders)
 	{
-		Instance->Log(DEBUG,"Sending page");
-		SendHeaders(n->str().length(), response, extraheaders);
+		SendHeaders(n->str().length(), response, *hheaders);
 		this->Write(n->str());
 	}
 };
 
-HTTPTimeout::HTTPTimeout(HttpSocket* sock, SocketEngine* engine) : InspTimer(60, time(NULL)), s(sock), SE(engine)
+/** Spawn HTTP sockets from a listener
+ */
+class HttpListener : public ListenSocketBase
 {
-}
+	FileReader* index;
 
-void HTTPTimeout::Tick(time_t TIME)
-{
-	SE->DelFd(s);
-	s->Close();
-	delete s;
-}
+ public:
+	HttpListener(InspIRCd* Instance, FileReader *idx, int port, const std::string &addr) : ListenSocketBase(Instance, port, addr)
+	{
+		this->index = idx;
+	}
+
+	virtual void OnAcceptReady(const std::string &ipconnectedto, int nfd, const std::string &incomingip)
+	{
+		new HttpServerSocket(ServerInstance, nfd, (char *)incomingip.c_str(), index); // ugly cast courtesy of bufferedsocket
+	}
+};
 
-class ModuleHttp : public Module
+class ModuleHttpServer : public Module
 {
-	std::vector<HttpSocket*> httpsocks;
+	std::vector<HttpServerSocket *> httpsocks;
+	std::vector<HttpListener *> httplisteners;
  public:
 
 	void ReadConfig()
@@ -369,10 +372,11 @@ class ModuleHttp : public Module
 		std::string bindip;
 		std::string indexfile;
 		FileReader* index;
-		HttpSocket* http;
+		HttpListener *http;
 		ConfigReader c(ServerInstance);
 
-		httpsocks.clear();
+		httpsocks.clear(); // XXX this will BREAK if this module is made rehashable
+		httplisteners.clear();
 
 		for (int i = 0; i < c.Enumerate("http"); i++)
 		{
@@ -381,72 +385,51 @@ class ModuleHttp : public Module
 			port = c.ReadInteger("http", "port", i, true);
 			indexfile = c.ReadValue("http", "index", i);
 			index = new FileReader(ServerInstance, indexfile);
-			http = new HttpSocket(ServerInstance, bindip, port, true, 0, index);
-			httpsocks.push_back(http);
+			if (!index->Exists())
+				throw ModuleException("Can't read index file: "+indexfile);
+			http = new HttpListener(ServerInstance, index, port, (char *)bindip.c_str()); // XXX this cast SUCKS.
+			httplisteners.push_back(http);
 		}
 	}
 
-	ModuleHttp(InspIRCd* Me) : Module::Module(Me)
+	ModuleHttpServer(InspIRCd* Me) : Module(Me)
 	{
 		ReadConfig();
+		HttpModule = this;
+		Implementation eventlist[] = { I_OnRequest };
+		ServerInstance->Modules->Attach(eventlist, this, 1);
 	}
 
-	void OnEvent(Event* event)
+	virtual const char* OnRequest(Request* request)
 	{
-	}
-
-	char* OnRequest(Request* request)
-	{
-		ServerInstance->Log(DEBUG,"Got HTTPDocument object");
 		claimed = true;
 		HTTPDocument* doc = (HTTPDocument*)request->GetData();
-		HttpSocket* sock = (HttpSocket*)doc->sock;
-		sock->Page(doc->GetDocument(), doc->GetResponseCode(), doc->GetExtraHeaders());
+		HttpServerSocket* sock = (HttpServerSocket*)doc->sock;
+		sock->Page(doc->GetDocument(), doc->GetResponseCode(), &doc->headers);
 		return NULL;
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnEvent] = List[I_OnRequest] = 1;
-	}
 
-	virtual ~ModuleHttp()
+	virtual ~ModuleHttpServer()
 	{
+		for (size_t i = 0; i < httplisteners.size(); i++)
+		{
+			delete httplisteners[i];
+		}
+
 		for (size_t i = 0; i < httpsocks.size(); i++)
 		{
 			ServerInstance->SE->DelFd(httpsocks[i]);
+			httpsocks[i]->Close();
 			delete httpsocks[i]->GetIndex();
-			delete httpsocks[i];
 		}
+		ServerInstance->BufferedSocketCull();
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
-	}
-};
-
-
-class ModuleHttpFactory : public ModuleFactory
-{
- public:
-	ModuleHttpFactory()
-	{
-	}
-	
-	~ModuleHttpFactory()
-	{
-	}
-	
-	virtual Module * CreateModule(InspIRCd* Me)
-	{
-		HttpModule = new ModuleHttp(Me);
-		return HttpModule;
+		return Version("$Id$", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
 	}
 };
 
-
-extern "C" void * init_module( void )
-{
-	return new ModuleHttpFactory;
-}
+MODULE_INIT(ModuleHttpServer)