jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up win32 server example.

Browse source
This commit is contained in:
jmsgrogan 2023-01-10 09:28:15 +00:00
parent 5362b694e0
commit 2c825adc1d
23 changed files with 337 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/network/NetworkManager.cpp
View file

@ -24,18 +24,19 @@ std::unique_ptr<NetworkManager> NetworkManager::Create()
return std::make_unique<NetworkManager>();
}
void NetworkManager::Initialize()
void NetworkManager::initialize()
{
#ifdef __linux__
mSocketInterface = UnixSocketInterface::Create();
#endif
}
void NetworkManager::RunHttpServer()
void NetworkManager::runHttpServer(AbstractWebApp* webApp)
{
#ifdef _WIN32
Win32WebServer server;
Win32WebServer server(webApp);
server.initialize();
server.run();
#else
if (!mSocketInterface)
{
@ -49,11 +50,11 @@ void NetworkManager::RunHttpServer()
#endif
}
void NetworkManager::RunHttpClient()
void NetworkManager::runHttpClient()
{
if (!mSocketInterface)
{
Initialize();
initialize();
}
if (!mSocketInterface)
@ -66,7 +67,7 @@ void NetworkManager::RunHttpClient()
mSocketInterface->Write(socket, "Hello Friend");
}
void NetworkManager::ShutDown()
void NetworkManager::shutDown()
{
}

10
src/network/NetworkManager.h
View file

@ -6,6 +6,8 @@
#include <memory>
#include <vector>
class AbstractWebApp;
class NetworkManager
{
public:
@ -16,13 +18,13 @@ public:
static std::unique_ptr<NetworkManager> Create();
void Initialize();
void initialize();
void RunHttpServer();
void runHttpServer(AbstractWebApp* webApp);
void RunHttpClient();
void runHttpClient();
void ShutDown();
void shutDown();
private:
std::vector<SocketPtr> mActiveSockets;

4
src/network/server/win32/Win32Buffer.cpp
View file

@ -21,9 +21,9 @@ Win32Buffer::~Win32Buffer()
clearBuffer();
}
PUCHAR Win32Buffer::getBufferAsUChar() const
unsigned char* Win32Buffer::getBufferAsUChar() const
{
return reinterpret_cast<PUCHAR>(mBuffer);
return reinterpret_cast<unsigned char*>(mBuffer);
}
void* Win32Buffer::getBuffer() const

2
src/network/server/win32/Win32Buffer.h
View file

@ -9,7 +9,7 @@ public:
void* getBuffer() const;
PUCHAR getBufferAsUChar() const;
unsigned char* getBufferAsUChar() const;
bool isValid() const;

49
src/network/server/win32/Win32WebRequest.cpp
View file

@ -2,6 +2,9 @@
#include "StringUtils.h"
#include "HttpRequest.h"
#include "FileLogger.h"
#include "Win32TempFile.h"
Win32WebRequest::Win32WebRequest()
: mBuffer(DEFAULT_BUFFER_SIZE)
@ -55,8 +58,10 @@ HttpRequest Win32WebRequest::getRequest() const
{
case HttpVerbGET:
verb = HttpRequest::Verb::GET;
break;
case HttpVerbPOST:
verb = HttpRequest::Verb::POST;
break;
default:
verb = HttpRequest::Verb::UNKNOWN;
break;
@ -64,4 +69,48 @@ HttpRequest Win32WebRequest::getRequest() const
HttpRequest request(verb, getUrlFromRequest());
return request;
}
bool Win32WebRequest::startReceiveEntity()
{
mEntityBuffer = std::make_unique<Win32Buffer>(ENTITY_BUFFER_SIZE);
if (!mEntityBuffer->isValid())
{
MLOG_ERROR("Failed to allocate entity buffer");
return false;
}
mTempFile = std::make_unique<Win32TempFile>();
if (!mTempFile->isValid())
{
MLOG_ERROR("Failed to create tempfile");
return false;
}
return true;
}
Win32Buffer* Win32WebRequest::getEntityBuffer() const
{
return mEntityBuffer.get();
}
unsigned Win32WebRequest::getEntityBufferSize() const
{
return ENTITY_BUFFER_SIZE;
}
Win32TempFile* Win32WebRequest::getTempFile() const
{
return mTempFile.get();
}
void Win32WebRequest::flushEntityBuffer(unsigned numBytes)
{
mEntityTotalSize += numBytes;
mTempFile->write(mEntityBuffer->getBufferAsUChar(), numBytes);
}
unsigned Win32WebRequest::getEntityTotalSize() const
{
return mEntityTotalSize;
}

22
src/network/server/win32/Win32WebRequest.h
View file

@ -14,31 +14,49 @@
#include <http.h>
#include <string>
#include <memory>
#include "Win32Buffer.h"
class HttpRequest;
class Win32TempFile;
class Win32WebRequest
{
public:
Win32WebRequest();
bool isValid() const;
HttpRequest getRequest() const;
PHTTP_REQUEST getHandle() const;
unsigned getBufferSize() const;
Win32Buffer* getEntityBuffer() const;
unsigned getEntityBufferSize() const;
unsigned getEntityTotalSize() const;
void flushEntityBuffer(unsigned numBytes);
Win32TempFile* getTempFile() const;
bool isValid() const;
void resizeBuffer(unsigned size);
void zeroBufferMemory();
HttpRequest getRequest() const;
bool startReceiveEntity();
private:
std::string getUrlFromRequest() const;
static const unsigned ENTITY_BUFFER_SIZE{ 2048 };
std::unique_ptr<Win32Buffer> mEntityBuffer;
std::unique_ptr<Win32TempFile> mTempFile;
unsigned mEntityTotalSize{ 0 };
static const unsigned DEFAULT_BUFFER_SIZE{ sizeof(HTTP_REQUEST) + 2048 };
Win32Buffer mBuffer;

50
src/network/server/win32/Win32WebResponse.cpp
View file

@ -1,34 +1,60 @@
#include "Win32WebResponse.h"
#include "HttpResponse.h"
#include "Win32WebRequest.h"
#include "FileLogger.h"
Win32WebResponse::Win32WebResponse(const HttpResponse& response)
{
RtlZeroMemory((&mResponse), sizeof(*(&mResponse)));
mResponse.StatusCode = response.getStatusCode();
std::string reason = response.getResponseReason();
mResponse.pReason = reason.c_str();
mResponse.ReasonLength = (USHORT)strlen(reason.c_str());
mResponseReason = response.getResponseReason();
mResponse.pReason = mResponseReason.c_str();
mResponse.ReasonLength = (USHORT)strlen(mResponseReason.c_str());
const std::string content_type = "text / html";
mResponse.Headers.KnownHeaders[HttpHeaderContentType].pRawValue = content_type.c_str();
mResponse.Headers.KnownHeaders[HttpHeaderContentType].RawValueLength = (USHORT)strlen(content_type.c_str());
populateHeader(response);
auto body = response.getBody();
if (!body.empty())
populateBody(response);
}
HTTP_RESPONSE& Win32WebResponse::getResponse()
{
return mResponse;
}
void Win32WebResponse::populateBody(const HttpResponse& response)
{
mBody = response.getBody();
if (!mBody.empty())
{
mContentLength = std::to_string(mBody.size());
mResponse.Headers.KnownHeaders[HttpHeaderContentLength].pRawValue = mContentLength.c_str();
mResponse.Headers.KnownHeaders[HttpHeaderContentLength].RawValueLength = (USHORT)strlen(mContentLength.c_str());
HTTP_DATA_CHUNK dataChunk;
dataChunk.DataChunkType = HttpDataChunkFromMemory;
dataChunk.FromMemory.pBuffer = body.data();
dataChunk.FromMemory.BufferLength = (ULONG)strlen(body.data());
dataChunk.FromMemory.pBuffer = mBody.data();
dataChunk.FromMemory.BufferLength = (ULONG)strlen(mBody.data());
mResponse.EntityChunkCount = 1;
mResponse.pEntityChunks = &dataChunk;
}
}
HTTP_RESPONSE& Win32WebResponse::getResponse()
void Win32WebResponse::populateHeader(const HttpResponse& response)
{
return mResponse;
mContentType = response.getHeader().getContentType();
mResponse.Headers.KnownHeaders[HttpHeaderContentType].pRawValue = mContentType.c_str();
mResponse.Headers.KnownHeaders[HttpHeaderContentType].RawValueLength = (USHORT)strlen(mContentType.c_str());
}
void Win32WebResponse::addRequestContentLength(const Win32WebRequest& request)
{
mContentLength = std::to_string(request.getEntityTotalSize());
mResponse.Headers.KnownHeaders[HttpHeaderContentLength].pRawValue = mContentLength.c_str();
mResponse.Headers.KnownHeaders[HttpHeaderContentLength].RawValueLength = (USHORT)strlen(mContentLength.c_str());
}

11
src/network/server/win32/Win32WebResponse.h
View file

@ -17,6 +17,7 @@
#include <string>
class HttpResponse;
class Win32WebRequest;
class Win32WebResponse
{
@ -25,6 +26,16 @@ public:
HTTP_RESPONSE& getResponse();
void addRequestContentLength(const Win32WebRequest& request);
private:
void populateBody(const HttpResponse& response);
void populateHeader(const HttpResponse& response);
std::string mResponseReason;
std::string mContentType;
std::string mBody;
std::string mContentLength;
HTTP_RESPONSE mResponse;
};

188
src/network/server/win32/Win32WebServer.cpp
View file

@ -12,7 +12,7 @@
#include "StringUtils.h"
Win32WebServer::Win32WebServer(AbstractWebApp* webApp)
: mListenUrl("http://localhost:80/49152"),
: mListenUrl("http://localhost:49153/"),
mWebApp(webApp)
{
@ -64,19 +64,66 @@ void Win32WebServer::initialize()
}
}
DWORD Win32WebServer::onRequest(const Win32WebRequest& request)
bool Win32WebServer::onPostRequest(Win32WebRequest& request)
{
auto app_request = request.getRequest();
auto response = mWebApp->onHttpRequest(app_request);
if (request.getHandle()->Flags & HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS)
{
if (!request.startReceiveEntity())
{
return false;
}
DWORD result;
ULONG bytes_read = 0;
do
{
bytes_read = 0;
auto result = ::HttpReceiveRequestEntityBody(mWorkingQueue, request.getHandle()->RequestId, 0, request.getEntityBuffer()->getBuffer(),
request.getEntityBufferSize(), &bytes_read, nullptr);
if (result == NO_ERROR || result == ERROR_HANDLE_EOF)
{
request.flushEntityBuffer(bytes_read);
if (result == ERROR_HANDLE_EOF)
{
return true;
}
}
else
{
MLOG_ERROR("HttpReceiveRequestEntityBody failed with: " << result);
return false;
}
} while (true);
}
return true;
}
bool Win32WebServer::onRequest(Win32WebRequest& request)
{
if (request.getHandle()->Verb == HttpVerbPOST)
{
if (!onPostRequest(request))
{
return false;
}
}
const auto app_request = request.getRequest();
const auto response = mWebApp->onHttpRequest(app_request);
if (app_request.getVerb() == HttpRequest::Verb::POST)
{
result = sendHttpPostResponse(request.getHandle());
if (!sendHttpPostResponse(request, response))
{
return false;
}
}
else
{
result = sendHttpResponse(request.getHandle(), response);
if (!sendHttpResponse(request, response))
{
return false;
}
}
/*
@ -94,123 +141,57 @@ DWORD Win32WebServer::onRequest(const Win32WebRequest& request)
break;
*/
return result;
return true;
}
DWORD Win32WebServer::sendHttpResponse(PHTTP_REQUEST pRequest, const HttpResponse& appResponse)
bool Win32WebServer::sendHttpResponse(const Win32WebRequest& request, const HttpResponse& appResponse)
{
Win32WebResponse response(appResponse);
DWORD bytesSent;
const auto result = ::HttpSendHttpResponse(mWorkingQueue, pRequest->RequestId, 0, &(response.getResponse()), NULL, &bytesSent, NULL, 0, NULL, NULL);
const auto result = ::HttpSendHttpResponse(mWorkingQueue, request.getHandle()->RequestId, 0, &(response.getResponse()), NULL, &bytesSent, NULL, 0, NULL, NULL);
if (result != NO_ERROR)
{
MLOG_ERROR("Http response failed with error: " << result);
}
return result;
return result == NO_ERROR;
}
#define MAX_ULONG_STR ((ULONG) sizeof("4294967295"))
DWORD Win32WebServer::sendHttpPostResponse(PHTTP_REQUEST pRequest)
bool Win32WebServer::sendHttpPostResponse(const Win32WebRequest& request, const HttpResponse& appResponse)
{
// Allocate space for an entity buffer. Buffer can be increased on demand.
const ULONG entity_buffer_length = 2048;
Win32Buffer entity_buffer(entity_buffer_length);
if (!entity_buffer.isValid())
{
return ERROR_NOT_ENOUGH_MEMORY;
}
HTTP_RESPONSE response;
initializeHttpResponse(response, 200, "OK");
DWORD result{ 0 };
if (pRequest->Flags & HTTP_REQUEST_FLAG_MORE_ENTITY_BODY_EXISTS)
if (request.getEntityBuffer())
{
Win32TempFile temp_file;
if (!temp_file.isValid())
{
return 0;
}
Win32WebResponse response(appResponse);
response.addRequestContentLength(request);
ULONG total_bytes_read = 0;
ULONG bytes_read = 0;
do
{
// Read the entity chunk from the request.
bytes_read = 0;
result = ::HttpReceiveRequestEntityBody(mWorkingQueue, pRequest->RequestId, 0, entity_buffer.getBuffer(), entity_buffer_length, &bytes_read, nullptr);
switch (result)
{
case NO_ERROR:
if (bytes_read != 0)
{
total_bytes_read += bytes_read;
temp_file.write(entity_buffer.getBufferAsUChar(), bytes_read);
}
break;
case ERROR_HANDLE_EOF:
// The last request entity body has been read. Send back a response.
//
// To illustrate entity sends via HttpSendResponseEntityBody, the response will
// be sent over multiple calls. To do this, pass the HTTP_SEND_RESPONSE_FLAG_MORE_DATA flag.
if (bytes_read != 0)
{
total_bytes_read += bytes_read;
temp_file.write(entity_buffer.getBufferAsUChar(), bytes_read);
}
// Because the response is sent over multiple API calls, add a content-length.
// Alternatively, the response could have been sent using chunked transfer encoding, by passimg "Transfer-Encoding: Chunked".
// NOTE: Because the TotalBytesread in a ULONG are accumulated, this will not work for entity bodies larger than 4 GB.
// For support of large entity bodies, use a ULONGLONG.
CHAR szContentLength[MAX_ULONG_STR];
sprintf_s(szContentLength, MAX_ULONG_STR, "%lu", total_bytes_read);
response.Headers.KnownHeaders[HttpHeaderContentLength].pRawValue = szContentLength;
response.Headers.KnownHeaders[HttpHeaderContentLength].RawValueLength = (USHORT)strlen(szContentLength);
DWORD bytesSent;
result = ::HttpSendHttpResponse(mWorkingQueue, pRequest->RequestId, HTTP_SEND_RESPONSE_FLAG_MORE_DATA, &response, NULL, &bytesSent, NULL, 0, NULL, NULL);
if (result != NO_ERROR)
{
MLOG_ERROR("HttpSendHttpResponse failed with: " << result);
return;
}
// Send entity body from a file handle.
HTTP_DATA_CHUNK dataChunk;
dataChunk.DataChunkType = HttpDataChunkFromFileHandle;
dataChunk.FromFileHandle.ByteRange.StartingOffset.QuadPart = 0;
dataChunk.FromFileHandle.ByteRange.Length.QuadPart = HTTP_BYTE_RANGE_TO_EOF;
dataChunk.FromFileHandle.FileHandle = temp_file.getHandle();
result = ::HttpSendResponseEntityBody(mWorkingQueue, pRequest->RequestId, 0, 1, &dataChunk, NULL, NULL, 0, NULL, NULL);
if (result != NO_ERROR)
{
MLOG_ERROR("HttpSendResponseEntityBody failed" << result);
}
break;
default:
MLOG_ERROR("HttpReceiveRequestEntityBody failed with: " << result);
break;
}
} while (true);
}
else
{
DWORD bytesSent;
result = ::HttpSendHttpResponse(mWorkingQueue, pRequest->RequestId, 0, &response, NULL, &bytesSent, NULL, 0, NULL, NULL );
result = ::HttpSendHttpResponse(mWorkingQueue, request.getHandle()->RequestId, HTTP_SEND_RESPONSE_FLAG_MORE_DATA, &(response.getResponse()), NULL, &bytesSent, NULL, 0, NULL, NULL);
if (result != NO_ERROR)
{
MLOG_ERROR("HttpSendHttpResponse failed with: " << result);
return false;
}
// Send entity body from a file handle.
HTTP_DATA_CHUNK dataChunk;
dataChunk.DataChunkType = HttpDataChunkFromFileHandle;
dataChunk.FromFileHandle.ByteRange.StartingOffset.QuadPart = 0;
dataChunk.FromFileHandle.ByteRange.Length.QuadPart = HTTP_BYTE_RANGE_TO_EOF;
dataChunk.FromFileHandle.FileHandle = request.getTempFile()->getHandle();
result = ::HttpSendResponseEntityBody(mWorkingQueue, request.getHandle()->RequestId, 0, 1, &dataChunk, NULL, NULL, 0, NULL, NULL);
if (result != NO_ERROR)
{
MLOG_ERROR("HttpSendResponseEntityBody failed" << result);
return false;
}
}
return result;
else
{
result = sendHttpResponse(request, appResponse);
}
return result == NO_ERROR;;
}
void Win32WebServer::run()
@ -232,8 +213,7 @@ void Win32WebServer::run()
auto result = ::HttpReceiveHttpRequest(mWorkingQueue, request_id, 0, request.getHandle(), request.getBufferSize(), &bytes_read, nullptr);
if (NO_ERROR == result)
{
result = onRequest(request);
if (result != NO_ERROR)
if (!onRequest(request))
{
break;
}

8
src/network/server/win32/Win32WebServer.h
View file

@ -18,7 +18,6 @@
class AbstractWebApp;
class Win32WebRequest;
class HttpResponse;
class Win32WebServer
@ -35,10 +34,11 @@ public:
void run();
private:
DWORD onRequest(const Win32WebRequest& request);
bool onRequest(Win32WebRequest& request);
bool onPostRequest(Win32WebRequest& request);
DWORD sendHttpResponse(PHTTP_REQUEST pRequest, const HttpResponse& response);
DWORD sendHttpPostResponse(PHTTP_REQUEST pRequest);
bool sendHttpResponse(const Win32WebRequest& request, const HttpResponse& response);
bool sendHttpPostResponse(const Win32WebRequest& request, const HttpResponse& response);
AbstractWebApp* mWebApp{ nullptr };

4
src/network/web/HttpMessageHandler.cpp
View file

@ -9,9 +9,9 @@ std::string HttpMessageHandler::onMessage(const std::string& message)
request.parseMessage(message);
HttpResponse response;
response.SetBody("Hello world!");
response.setBody("Hello world!");
const auto response_message = response.ToString();
const auto response_message = response.toString();
return response_message;
}