talksik/uWebSockets
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add WITH_PROXY flag

Browse Source
This commit is contained in:
Alex Hultman
2020-06-06 12:59:40 +02:00
parent e70bbb4fb6
commit 2538cd18e9
6 changed files with 128 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/HttpParser.h
+30 -25
View File
@@ -1,5 +1,5 @@
/*
* Authored by Alex Hultman, 2018-2019.
* Authored by Alex Hultman, 2018-2020.
* Intellectual property of third-party.
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,8 +28,13 @@
#include "f2/function2.hpp"
#include "BloomFilter.h"
// if using proxy parser, depend on the layout of HttpResponesData
#include "ProxyParser.h"
namespace uWS {
/* We require at least this much post padding */
@@ -178,8 +183,28 @@ private:
// the only caller of getHeaders
template <int CONSUME_MINIMALLY>
std::pair<int, void *> fenceAndConsumePostPadded(char *data, int length, void *user, HttpRequest *req, fu2::unique_function<void *(void *, HttpRequest *)> &requestHandler, fu2::unique_function<void *(void *, std::string_view, bool)> &dataHandler) {
std::pair<int, void *> fenceAndConsumePostPadded(char *data, int length, void *user, void *reserved, HttpRequest *req, fu2::unique_function<void *(void *, HttpRequest *)> &requestHandler, fu2::unique_function<void *(void *, std::string_view, bool)> &dataHandler) {
/* How much data we CONSUMED (to throw away) */
int consumedTotal = 0;
#ifdef WITH_PROXY
/* ProxyParser is passed as reserved parameter */
ProxyParser *pp = (ProxyParser *) reserved;
/* Parse PROXY protocol */
auto [done, offset] = pp->parse({data, length});
if (!done) {
return {0, user};
} else {
/* We have consumed this data so skip it */
data += offset;
length -= offset;
consumedTotal += offset;
}
#endif
/* Fence one byte past end of our buffer (buffer has post padded margins) */
data[length] = '\r';
for (int consumed; length && (consumed = getHeaders(data, data + length, req->headers, &req->bf)); ) {
@@ -236,13 +261,7 @@ private:
}
public:
/* We do this to prolong the validity of parsed headers by keeping only the fallback buffer alive */
/*std::string &&salvageFallbackBuffer() {
return std::move(fallback);
}*/
void *consumePostPadded(char *data, int length, void *user, fu2::unique_function<void *(void *, HttpRequest *)> &&requestHandler, fu2::unique_function<void *(void *, std::string_view, bool)> &&dataHandler, fu2::unique_function<void *(void *)> &&errorHandler) {
void *consumePostPadded(char *data, int length, void *user, void *reserved, fu2::unique_function<void *(void *, HttpRequest *)> &&requestHandler, fu2::unique_function<void *(void *, std::string_view, bool)> &&dataHandler, fu2::unique_function<void *(void *)> &&errorHandler) {
HttpRequest req;
@@ -276,11 +295,8 @@ public:
fallback.reserve(fallback.length() + maxCopyDistance + std::max<int>(MINIMUM_HTTP_POST_PADDING, sizeof(std::string)));
fallback.append(data, maxCopyDistance);
// parse proxy here
// break here on break
std::pair<int, void *> consumed = fenceAndConsumePostPadded<true>(fallback.data(), (int) fallback.length(), user, &req, requestHandler, dataHandler);
std::pair<int, void *> consumed = fenceAndConsumePostPadded<true>(fallback.data(), (int) fallback.length(), user, reserved, &req, requestHandler, dataHandler);
if (consumed.second != user) {
return consumed.second;
}
@@ -322,18 +338,7 @@ public:
}
}
// parse proxy here
/* Parse proxy header */
ProxyParser pp;
auto [done, offset] = pp.parse({data, length});
if (!done) {
} else {
printf("Proxy parser is done\n");
}
std::pair<int, void *> consumed = fenceAndConsumePostPadded<false>(data, length, user, &req, requestHandler, dataHandler);
std::pair<int, void *> consumed = fenceAndConsumePostPadded<false>(data, length, user, reserved, &req, requestHandler, dataHandler);
if (consumed.second != user) {
return consumed.second;
}