X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=88b635f6f3008e08a959fec93554e6b38500aabc;hb=e80a1296a096ff2c495b3cd2a3913d5e5f6ec450;hp=a06098a0ea8d2ed1f82e4683da9da247f8b3979c;hpb=05c95857273e6c68ca05ee786948c455ac7d3d39;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index a06098a0e..88b635f6f 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -12,8 +12,6 @@
  */
 
 #include "inspircd.h"
-#include <algorithm>
-#include "modules.h"
 #include "httpd.h"
 
 /* $ModDesc: Provides HTTP serving facilities to modules */
@@ -28,41 +26,19 @@ static bool claimed;
  */
 enum HttpState
 {
-	HTTP_LISTEN = 0,
-	HTTP_SERVE_WAIT_REQUEST = 1, /* Waiting for a full request */
-	HTTP_SERVE_RECV_POSTDATA = 2, /* Waiting to finish recieving POST data */
-	HTTP_SERVE_SEND_DATA = 3 /* Sending response */
-};
-
-class HttpServerSocket;
-
-/** This class is used to handle HTTP socket timeouts
- */
-class HttpServerTimeout : public InspTimer
-{
- private:
-	/** HttpServerSocket we are attached to
-	 */
-	HttpServerSocket* s;
-	/** Socketengine the file descriptor is in
-	 */
-	SocketEngine* SE;
- public:
-	/** Attach timeout to HttpServerSocket
-	 */
-	HttpServerTimeout(HttpServerSocket* 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 HttpServerSocket : public InspSocket
+class HttpServerSocket : public BufferedSocket
 {
 	FileReader* index;
 	HttpState InternalState;
-	
+	std::string ip;
+
 	HTTPHeaders headers;
 	std::string reqbuffer;
 	std::string postdata;
@@ -70,25 +46,13 @@ class HttpServerSocket : public InspSocket
 	std::string request_type;
 	std::string uri;
 	std::string http_version;
-	bool keepalive;
-	
-	HttpServerTimeout* Timeout;
-	bool DataSinceLastTick;
-	friend class HttpServerTimeout;
-	
- public:
 
-	HttpServerSocket(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)
-	{
-		InternalState = HTTP_LISTEN;
-		Timeout = NULL;
-	}
+ public:
 
-	HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, newfd, ip), index(ind), postsize(0), keepalive(false), DataSinceLastTick(false)
+	HttpServerSocket(int newfd, const char* IP, FileReader* ind)
+		: BufferedSocket(newfd), index(ind), ip(IP), postsize(0)
 	{
 		InternalState = HTTP_SERVE_WAIT_REQUEST;
-		Timeout = new HttpServerTimeout(this, Instance->SE);
-		Instance->Timers->AddTimer(Timeout);
 	}
 
 	FileReader* GetIndex()
@@ -98,38 +62,9 @@ class HttpServerSocket : public InspSocket
 
 	~HttpServerSocket()
 	{
-		if (Timeout)
-		{
-			if (Instance->Time() < Timeout->GetTimer())
-				Instance->Timers->DelTimer(Timeout);
-			Timeout = NULL;
-		}
-	}
-	
-	void ResetRequest()
-	{
-		headers.Clear();
-		postdata.clear();
-		postsize = 0;
-		request_type.clear();
-		uri.clear();
-		http_version.clear();
-		InternalState = HTTP_SERVE_WAIT_REQUEST;
-		
-		if (reqbuffer.size())
-			CheckRequestBuffer();
-	}
-	
-	virtual int OnIncomingConnection(int newsock, char* ip)
-	{
-		if (InternalState == HTTP_LISTEN)
-		{
-			new HttpServerSocket(this->Instance, newsock, ip, index);
-		}
-		return true;
 	}
 
-	virtual void OnClose()
+	virtual void OnError(BufferedSocketError)
 	{
 	}
 
@@ -220,152 +155,131 @@ class HttpServerSocket : public InspSocket
 			default:
 				return "WTF";
 			break;
-				
+
 		}
 	}
-	
+
 	void SendHTTPError(int response)
 	{
 		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);
-		
-		if (keepalive)
-			ResetRequest();
+		WriteData(data);
 	}
-	
+
 	void SendHeaders(unsigned long size, int response, HTTPHeaders &rheaders)
 	{
 
-		this->Write(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n");
+		WriteData(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n");
 
-		time_t local = this->Instance->Time();
+		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", "InspIRCd/m_httpd.so/1.1");
+
+		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");
-		
-		if (rheaders.GetHeader("Connection") == "Close")
-			keepalive = false;
-		else if (rheaders.GetHeader("Connection") == "Keep-Alive" && !headers.IsSet("Connection"))
-			keepalive = true;
-		else if (!rheaders.IsSet("Connection") && !keepalive)
-			rheaders.SetHeader("Connection", "Close");
-		
-		this->Write(rheaders.GetFormattedHeaders());
-		this->Write("\r\n");
-		
-		if (!size && keepalive)
-			ResetRequest();
+
+		/* 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");
+
+		WriteData(rheaders.GetFormattedHeaders());
+		WriteData("\r\n");
 	}
 
-	virtual bool OnDataReady()
+	void OnDataReady()
 	{
-		char* data = this->Read();
-
-		/* Check that the data read is a valid pointer and it has some content */
-		if (!data || !*data)
-			return false;
-		
-		DataSinceLastTick = true;
-		
 		if (InternalState == HTTP_SERVE_RECV_POSTDATA)
 		{
-			postdata.append(data);
+			postdata.append(recvq);
 			if (postdata.length() >= postsize)
 				ServeData();
 		}
 		else
 		{
-			reqbuffer.append(data);
-			
+			reqbuffer.append(recvq);
+
 			if (reqbuffer.length() >= 8192)
 			{
-				Instance->Log(DEBUG, "m_httpd dropped connection due to an oversized request buffer");
+				ServerInstance->Logs->Log("m_httpd",DEBUG, "m_httpd dropped connection due to an oversized request buffer");
 				reqbuffer.clear();
-				return false;
+				SetError("Buffer");
 			}
-			
+
 			if (InternalState == HTTP_SERVE_WAIT_REQUEST)
 				CheckRequestBuffer();
 		}
-		
-		return true;
 	}
-	
+
 	void CheckRequestBuffer()
 	{
 		std::string::size_type reqend = reqbuffer.find("\r\n\r\n");
 		if (reqend == std::string::npos)
 			return;
-		
+
 		// We have the headers; parse them all
 		std::string::size_type hbegin = 0, hend;
 		while ((hend = reqbuffer.find("\r\n", hbegin)) != std::string::npos)
 		{
 			if (hbegin == hend)
 				break;
-			
+
 			if (request_type.empty())
 			{
 				std::istringstream cheader(std::string(reqbuffer, hbegin, hend - hbegin));
 				cheader >> request_type;
 				cheader >> uri;
 				cheader >> http_version;
-				
+
 				if (request_type.empty() || uri.empty() || http_version.empty())
 				{
 					SendHTTPError(400);
 					return;
 				}
-				
+
 				hbegin = hend + 2;
 				continue;
 			}
-			
+
 			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;
 		}
-		
+
 		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"))
 		{
 			SendHTTPError(505);
 			return;
 		}
-		
-		if (strcasecmp(headers.GetHeader("Connection").c_str(), "keep-alive") == 0)
-			keepalive = true;
-		
+
 		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);
@@ -376,13 +290,13 @@ class HttpServerSocket : public InspSocket
 				postdata = reqbuffer;
 				reqbuffer.clear();
 			}
-			
+
 			if (postdata.length() >= postsize)
 				ServeData();
-			
+
 			return;
 		}
-		
+
 		ServeData();
 	}
 
@@ -394,56 +308,58 @@ class HttpServerSocket : public InspSocket
 		{
 			HTTPHeaders empty;
 			SendHeaders(index->ContentSize(), 200, empty);
-			this->Write(index->Contents());
+			WriteData(index->Contents());
 		}
 		else
 		{
 			claimed = false;
-			HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP(),postdata);
-			Event e((char*)&httpr, (Module*)HttpModule, "httpd_url");
-			e.Send(this->Instance);
+			HTTPRequest acl((Module*)HttpModule, "httpd_acl", request_type, uri, &headers, this, ip, postdata);
+			acl.Send();
 			if (!claimed)
 			{
-				SendHTTPError(404);
+				HTTPRequest url((Module*)HttpModule, "httpd_url", request_type, uri, &headers, this, ip, postdata);
+				url.Send();
+				if (!claimed)
+				{
+					SendHTTPError(404);
+				}
 			}
 		}
 	}
 
-	void Page(std::stringstream* n, int response, HTTPHeaders *headers)
+	void Page(std::stringstream* n, int response, HTTPHeaders *hheaders)
 	{
-		SendHeaders(n->str().length(), response, *headers);
-		this->Write(n->str());
-		
-		if (!keepalive)
-		{
-			Instance->SE->DelFd(this);
-			this->Close();
-		}
-		else
-			this->ResetRequest();
+		SendHeaders(n->str().length(), response, *hheaders);
+		WriteData(n->str());
 	}
 };
 
-HttpServerTimeout::HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine) : InspTimer(15, time(NULL), true), s(sock), SE(engine)
+/** Spawn HTTP sockets from a listener
+ */
+class HttpListener : public ListenSocketBase
 {
-}
+	FileReader* index;
 
-void HttpServerTimeout::Tick(time_t TIME)
-{
-	if (!s->DataSinceLastTick)
+ public:
+	HttpListener(FileReader *idx, int port, const std::string &addr)
+		: ListenSocketBase(port, addr, "httpd", "plaintext")
 	{
-		SE->DelFd(s);
-		s->Close();
-		s->Timeout = NULL;
-		this->CancelRepeat();
+		this->index = idx;
 	}
-	else
-		s->DataSinceLastTick = false;
-}
+
+	virtual void OnAcceptReady(int nfd)
+	{
+		int port;
+		std::string incomingip;
+		irc::sockets::satoap(&client, incomingip, port);
+		new HttpServerSocket(nfd, incomingip.c_str(), index);
+	}
+};
 
 class ModuleHttpServer : public Module
 {
-	std::vector<HttpServerSocket*> httpsocks;
+	std::vector<HttpServerSocket *> httpsocks;
+	std::vector<HttpListener *> httplisteners;
  public:
 
 	void ReadConfig()
@@ -453,10 +369,11 @@ class ModuleHttpServer : public Module
 		std::string bindip;
 		std::string indexfile;
 		FileReader* index;
-		HttpServerSocket* http;
-		ConfigReader c(ServerInstance);
+		HttpListener *http;
+		ConfigReader c;
 
-		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++)
 		{
@@ -464,48 +381,47 @@ class ModuleHttpServer : public Module
 			bindip = c.ReadValue("http", "ip", i);
 			port = c.ReadInteger("http", "port", i, true);
 			indexfile = c.ReadValue("http", "index", i);
-			index = new FileReader(ServerInstance, indexfile);
+			index = new FileReader(indexfile);
 			if (!index->Exists())
 				throw ModuleException("Can't read index file: "+indexfile);
-			http = new HttpServerSocket(ServerInstance, bindip, port, true, 0, index);
-			httpsocks.push_back(http);
+			http = new HttpListener(index, port, bindip);
+			httplisteners.push_back(http);
 		}
 	}
 
-	ModuleHttpServer(InspIRCd* Me) : Module(Me)
-	{
+	ModuleHttpServer() 	{
 		ReadConfig();
 		HttpModule = this;
 	}
 
-	char* OnRequest(Request* request)
+	void OnRequest(Request& request)
 	{
+		if (strcmp(request.id, "HTTP-DOC") != 0)
+			return;
+		HTTPDocumentResponse& resp = static_cast<HTTPDocumentResponse&>(request);
 		claimed = true;
-		HTTPDocument* doc = (HTTPDocument*)request->GetData();
-		HttpServerSocket* sock = (HttpServerSocket*)doc->sock;
-		sock->Page(doc->GetDocument(), doc->GetResponseCode(), &doc->headers);
-		return NULL;
+		resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
 	}
 
-	void Implements(char* List)
-	{
-		List[I_OnRequest] = 1;
-	}
 
 	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();
 		}
-		ServerInstance->InspSocketCull();
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,1,0,0,VF_VENDOR|VF_SERVICEPROVIDER,API_VERSION);
+		return Version("Provides HTTP serving facilities to modules", VF_VENDOR | VF_SERVICEPROVIDER, API_VERSION);
 	}
 };