flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity
8bba2b02a1
cuberite-2a/source/HTTPServer/HTTPServer.cpp

259 lines
5.2 KiB
C++
Raw Normal View History

Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
// HTTPServer.cpp
// Implements the cHTTPServer class representing a HTTP webserver that uses cListenThread and cSocketThreads for processing
#include "Globals.h"
#include "HTTPServer.h"
#include "HTTPMessage.h"
Split cHTTPConnection implementation into a separate file.
2013-09-27 13:34:46 -04:00
#include "HTTPConnection.h"
Created basic cHTTPFormParser. It can parse forms in the application/x-www-form-urlencoded encoding, used for forms without file uploads.
2013-09-28 13:30:25 -04:00
#include "HTTPFormParser.h"
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
// Disable MSVC warnings:
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable:4355) // 'this' : used in base member initializer list
#endif
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
class cDebugCallbacks :
HTTP Server can now parse multipart/form-data forms; better architecture.
2013-10-04 07:07:57 -04:00
public cHTTPServer::cCallbacks,
protected cHTTPFormParser::cCallbacks
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
{
virtual void OnRequestBegun(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) override
{
Created basic cHTTPFormParser. It can parse forms in the application/x-www-form-urlencoded encoding, used for forms without file uploads.
2013-09-28 13:30:25 -04:00
if (cHTTPFormParser::HasFormData(a_Request))
{
HTTP Server can now parse multipart/form-data forms; better architecture.
2013-10-04 07:07:57 -04:00
a_Request.SetUserData(new cHTTPFormParser(a_Request, *this));
Created basic cHTTPFormParser. It can parse forms in the application/x-www-form-urlencoded encoding, used for forms without file uploads.
2013-09-28 13:30:25 -04:00
}
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
}
virtual void OnRequestBody(cHTTPConnection & a_Connection, cHTTPRequest & a_Request, const char * a_Data, int a_Size) override
{
Created basic cHTTPFormParser. It can parse forms in the application/x-www-form-urlencoded encoding, used for forms without file uploads.
2013-09-28 13:30:25 -04:00
cHTTPFormParser * FormParser = (cHTTPFormParser *)(a_Request.GetUserData());
if (FormParser != NULL)
{
FormParser->Parse(a_Data, a_Size);
}
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
}
virtual void OnRequestFinished(cHTTPConnection & a_Connection, cHTTPRequest & a_Request) override
{
Created basic cHTTPFormParser. It can parse forms in the application/x-www-form-urlencoded encoding, used for forms without file uploads.
2013-09-28 13:30:25 -04:00
cHTTPFormParser * FormParser = (cHTTPFormParser *)(a_Request.GetUserData());
if (FormParser != NULL)
{
if (FormParser->Finish())
{
cHTTPResponse Resp;
Resp.SetContentType("text/html");
a_Connection.Send(Resp);
a_Connection.Send("<html><body><table border=1 cellspacing=0><tr><th>Name</th><th>Value</th></tr>\r\n");
for (cHTTPFormParser::iterator itr = FormParser->begin(), end = FormParser->end(); itr != end; ++itr)
{
a_Connection.Send(Printf("<tr><td valign=\"top\"><pre>%s</pre></td><td valign=\"top\"><pre>%s</pre></td></tr>\r\n", itr->first.c_str(), itr->second.c_str()));
} // for itr - FormParser[]
a_Connection.Send("</table></body></html>");
return;
}
// Parsing failed:
cHTTPResponse Resp;
Resp.SetContentType("text/plain");
a_Connection.Send(Resp);
a_Connection.Send("Form parsing failed");
Fixed recognition of multipart-form-data forms.
2013-09-28 14:06:35 -04:00
return;
Created basic cHTTPFormParser. It can parse forms in the application/x-www-form-urlencoded encoding, used for forms without file uploads.
2013-09-28 13:30:25 -04:00
}
Added Basic auth support to cHTTPRequest.
2013-10-04 14:28:30 -04:00
// Test the auth failure and success:
if (a_Request.GetURL() == "/auth")
{
if (!a_Request.HasAuth() || (a_Request.GetAuthUsername() != "a") || (a_Request.GetAuthPassword() != "b"))
{
a_Connection.SendNeedAuth("MCServer WebAdmin");
return;
}
}
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
cHTTPResponse Resp;
Resp.SetContentType("text/plain");
a_Connection.Send(Resp);
a_Connection.Send("Hello, world");
}
HTTP Server can now parse multipart/form-data forms; better architecture.
2013-10-04 07:07:57 -04:00
virtual void OnFileStart(cHTTPFormParser & a_Parser, const AString & a_FileName) override
{
// TODO
}
virtual void OnFileData(cHTTPFormParser & a_Parser, const char * a_Data, int a_Size) override
{
// TODO
}
virtual void OnFileEnd(cHTTPFormParser & a_Parser) override
{
// TODO
}
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
} g_DebugCallbacks;
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cHTTPServer:
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
cHTTPServer::cHTTPServer(void) :
m_ListenThreadIPv4(*this, cSocket::IPv4, "WebServer IPv4"),
m_ListenThreadIPv6(*this, cSocket::IPv6, "WebServer IPv6"),
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
m_Callbacks(NULL)
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
{
}
Added proper shutdown to HTTPServer.
2013-10-06 09:44:40 -04:00
cHTTPServer::~cHTTPServer()
{
Stop();
}
WebAdmin uses the new HTTP functionality. This is a partial implementation of #183.
2013-10-05 17:08:16 -04:00
bool cHTTPServer::Initialize(const AString & a_PortsIPv4, const AString & a_PortsIPv6)
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
{
bool HasAnyPort;
WebAdmin uses the new HTTP functionality. This is a partial implementation of #183.
2013-10-05 17:08:16 -04:00
HasAnyPort = m_ListenThreadIPv4.Initialize(a_PortsIPv4);
HasAnyPort = m_ListenThreadIPv6.Initialize(a_PortsIPv6) || HasAnyPort;
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
if (!HasAnyPort)
{
return false;
}
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
return true;
}
bool cHTTPServer::Start(cCallbacks & a_Callbacks)
{
m_Callbacks = &a_Callbacks;
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
if (!m_ListenThreadIPv4.Start())
{
return false;
}
if (!m_ListenThreadIPv6.Start())
{
m_ListenThreadIPv4.Stop();
return false;
}
return true;
}
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
void cHTTPServer::Stop(void)
{
m_ListenThreadIPv4.Stop();
m_ListenThreadIPv6.Stop();
// Drop all current connections:
cCSLock Lock(m_CSConnections);
Fixed memory leaks in the HTTP framework
2013-10-06 10:40:28 -04:00
while (!m_Connections.empty())
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
{
Fixed memory leaks in the HTTP framework
2013-10-06 10:40:28 -04:00
m_Connections.front()->Terminate();
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
} // for itr - m_Connections[]
}
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
void cHTTPServer::OnConnectionAccepted(cSocket & a_Socket)
{
cHTTPConnection * Connection = new cHTTPConnection(*this);
m_SocketThreads.AddClient(a_Socket, Connection);
cCSLock Lock(m_CSConnections);
m_Connections.push_back(Connection);
}
void cHTTPServer::CloseConnection(cHTTPConnection & a_Connection)
{
m_SocketThreads.RemoveClient(&a_Connection);
cCSLock Lock(m_CSConnections);
for (cHTTPConnections::iterator itr = m_Connections.begin(), end = m_Connections.end(); itr != end; ++itr)
{
if (*itr == &a_Connection)
{
m_Connections.erase(itr);
break;
}
}
Fixed memory leaks in the HTTP framework
2013-10-06 10:40:28 -04:00
delete &a_Connection;
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
}
Fixed parsing and implemented write nofitication. The web connection finally works with a browser.
2013-09-27 14:33:18 -04:00
void cHTTPServer::NotifyConnectionWrite(cHTTPConnection & a_Connection)
{
m_SocketThreads.NotifyWrite(&a_Connection);
}
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
void cHTTPServer::NewRequest(cHTTPConnection & a_Connection, cHTTPRequest & a_Request)
{
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
m_Callbacks->OnRequestBegun(a_Connection, a_Request);
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
}
Fixed parsing and implemented write nofitication. The web connection finally works with a browser.
2013-09-27 14:33:18 -04:00
void cHTTPServer::RequestBody(cHTTPConnection & a_Connection, cHTTPRequest & a_Request, const char * a_Data, int a_Size)
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
{
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
m_Callbacks->OnRequestBody(a_Connection, a_Request, a_Data, a_Size);
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
}
void cHTTPServer::RequestFinished(cHTTPConnection & a_Connection, cHTTPRequest & a_Request)
{
Added cHTTPServer callbacks; fixed keep-alives. The HTTP server now calls callbacks specified in its start function (debugified atm.) and it processes multiple requests on a single connection.
2013-09-27 15:28:41 -04:00
m_Callbacks->OnRequestFinished(a_Connection, a_Request);
a_Connection.AwaitNextRequest();
Rewritten HTTPServer to split into cHTTPConnection, cHTTPRequest and cHTTPResponse classes.
2013-09-27 12:14:26 -04:00
}
Copy Permalink