X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=fb9ea954c68d8ce5cf912daadc7ac19eb792f581;hb=f9636a2eff46f6829bf9e01c711ab1ba45a7d50a;hp=b618e01f9ed2e0e1fd9bf4ae776fcfad1427f700;hpb=3f80008ba387b1e1e9e360f047fd6d1684c85d4c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index b618e01f9..fb9ea954c 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -22,15 +22,19 @@ using namespace std; #include "modules.h" #include "inspsocket.h" #include "helperfuncs.h" +#include "inspircd.h" #include "httpd.h" /* $ModDesc: Provides HTTP serving facilities to modules */ class ModuleHttp; +extern InspIRCd* ServerInstance; + static Server *Srv; static ModuleHttp* HttpModule; extern time_t TIME; +static bool claimed; enum HttpState { @@ -47,13 +51,13 @@ class HttpSocket : public InspSocket public: - HttpSocket(std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(host, port, listening, maxtime), index(index_page) + 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) { log(DEBUG,"HttpSocket constructor"); InternalState = HTTP_LISTEN; } - HttpSocket(int newfd, char* ip, FileReader* ind) : InspSocket(newfd, ip), index(ind) + HttpSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, newfd, ip), index(ind) { InternalState = HTTP_SERVE_WAIT_REQUEST; } @@ -62,7 +66,7 @@ class HttpSocket : public InspSocket { if (InternalState == HTTP_LISTEN) { - HttpSocket* s = new HttpSocket(newsock, ip, index); + HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index); Srv->AddSocket(s); } return true; @@ -72,19 +76,120 @@ class HttpSocket : public InspSocket { } - void SendHeaders(unsigned long size) + std::string Response(int response) + { + switch (response) + { + case 100: + return "CONTINUE"; + case 101: + return "SWITCHING PROTOCOLS"; + case 200: + return "OK"; + case 201: + return "CREATED"; + case 202: + return "ACCEPTED"; + case 203: + return "NON-AUTHORITATIVE INFORMATION"; + case 204: + return "NO CONTENT"; + case 205: + return "RESET CONTENT"; + case 206: + return "PARTIAL CONTENT"; + case 300: + return "MULTIPLE CHOICES"; + case 301: + return "MOVED PERMENANTLY"; + case 302: + return "FOUND"; + case 303: + return "SEE OTHER"; + case 304: + return "NOT MODIFIED"; + case 305: + return "USE PROXY"; + case 307: + return "TEMPORARY REDIRECT"; + case 400: + return "BAD REQUEST"; + case 401: + return "UNAUTHORIZED"; + case 402: + return "PAYMENT REQUIRED"; + case 403: + return "FORBIDDEN"; + case 404: + return "NOT FOUND"; + case 405: + return "METHOD NOT ALLOWED"; + case 406: + return "NOT ACCEPTABLE"; + case 407: + return "PROXY AUTHENTICATION REQUIRED"; + case 408: + return "REQUEST TIMEOUT"; + case 409: + return "CONFLICT"; + case 410: + return "GONE"; + case 411: + return "LENGTH REQUIRED"; + case 412: + return "PRECONDITION FAILED"; + case 413: + return "REQUEST ENTITY TOO LARGE"; + case 414: + return "REQUEST-URI TOO LONG"; + case 415: + return "UNSUPPORTED MEDIA TYPE"; + case 416: + return "REQUESTED RANGE NOT SATISFIABLE"; + case 417: + return "EXPECTATION FAILED"; + case 500: + return "INTERNAL SERVER ERROR"; + case 501: + return "NOT IMPLEMENTED"; + case 502: + return "BAD GATEWAY"; + case 503: + return "SERVICE UNAVAILABLE"; + case 504: + return "GATEWAY TIMEOUT"; + case 505: + return "HTTP VERSION NOT SUPPORTED"; + default: + return "WTF"; + break; + + } + } + + void SendHeaders(unsigned long size, int response, const std::string &extraheaders) { struct tm *timeinfo = localtime(&TIME); - this->Write("HTTP/1.1 200 OK\r\nDate: "); + this->Write("HTTP/1.1 "+ConvToStr(response)+" "+Response(response)+"\r\nDate: "); this->Write(asctime(timeinfo)); + if (extraheaders.empty()) + { + this->Write("Content-Type: text/html\r\n"); + } + else + { + this->Write(extraheaders); + } this->Write("Server: InspIRCd/m_httpd.so/1.1\r\nContent-Length: "+ConvToStr(size)+ - "\r\nConnection: close\r\nContent-Type: text/html\r\n\r\n"); + "\r\nConnection: close\r\n\r\n"); } virtual bool OnDataReady() { char* data = this->Read(); std::string request_type; + std::string uri; + std::string http_version; /* Check that the data read is a valid pointer and it has some content */ if (data && *data) @@ -98,16 +203,32 @@ class HttpSocket : public InspSocket headers >> request_type; headers >> uri; + headers >> http_version; - if ((request_type == "GET") && (uri = "/")) + if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0")) { - SendHeaders(index->ContentSize()); - this->Write(index->Contents()); + SendHeaders(0, 505, ""); } else { - HttpRequest httpr(request_type,uri,headers,this,this->GetIP()); - Event e(uri, HttpModule, "httpd_url"); + 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()); + Event e((char*)&httpr, (Module*)HttpModule, "httpd_url"); + e.Send(); + + if (!claimed) + { + SendHeaders(0, 404, ""); + log(DEBUG,"Page not claimed, 404"); + } + } } return false; @@ -122,6 +243,13 @@ class HttpSocket : public InspSocket return false; } } + + void Page(std::stringstream* n, int response, std::string& extraheaders) + { + log(DEBUG,"Sending page"); + SendHeaders(n->str().length(), response, extraheaders); + this->Write(n->str()); + } }; class ModuleHttp : public Module @@ -150,7 +278,7 @@ class ModuleHttp : public Module void CreateListener() { - http = new HttpSocket(this->bindip, this->port, true, 0, &index); + http = new HttpSocket(ServerInstance, this->bindip, this->port, true, 0, &index); if ((http) && (http->GetState() == I_LISTENING)) { Srv->AddSocket(http); @@ -170,6 +298,11 @@ class ModuleHttp : public Module char* OnRequest(Request* request) { + 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()); return NULL; } @@ -185,7 +318,7 @@ class ModuleHttp : public Module virtual Version GetVersion() { - return Version(1,0,0,0,VF_STATIC|VF_VENDOR); + return Version(1,0,0,0,VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER); } }; @@ -203,8 +336,8 @@ class ModuleHttpFactory : public ModuleFactory virtual Module * CreateModule(Server* Me) { - ModuleHttp = new ModuleHttp(Me); - return new HttpModule; + HttpModule = new ModuleHttp(Me); + return HttpModule; } };