misc/mirall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whitelist for storing request headers

Browse Source
This commit is contained in:
Ian Gulliver
2019-04-30 02:07:48 +00:00
parent 205b8253b2
commit 87bc2c1611
6 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@@ -3,13 +3,13 @@ all: example_simple example_clock
objects = sse.o sse_stream.o fastcgi.o fastcgi_conn.o fastcgi_request.o fastcgi_parse.o stream_buffer.o buffer.o
example_simple: example_simple.o $(objects) Makefile
clang++ -std=gnu++2a -o example_simple example_simple.o $(objects) -lgflags -lglog -lpthread
clang++ -O3 -std=gnu++2a -o example_simple example_simple.o $(objects) -lgflags -lglog -lpthread
example_clock: example_clock.o $(objects) Makefile
clang++ -std=gnu++2a -o example_clock example_clock.o $(objects) -lgflags -lglog -lpthread
clang++ -O3 -std=gnu++2a -o example_clock example_clock.o $(objects) -lgflags -lglog -lpthread
%.o: %.cc *.h Makefile
clang++ -std=gnu++2a -Wall -Werror -c -o $@ $<
clang++ -O3 -std=gnu++2a -Wall -Werror -c -o $@ $<
clean:
rm --force exmaple_simple example_clock *.o

7
fastcgi.cc
View File

@@ -7,8 +7,9 @@
#include "fastcgi.h"
#include "fastcgi_conn.h"
FastCGIServer::FastCGIServer(int port, const std::function<void(std::unique_ptr<FastCGIRequest>)>& callback)
: callback_(callback) {
FastCGIServer::FastCGIServer(int port, const std::function<void(std::unique_ptr<FastCGIRequest>)>& callback, const std::unordered_set<std::string_view>& headers)
: callback_(callback),
headers_(headers) {
LOG(INFO) << "listening on [::1]:" << port;
signal(SIGPIPE, SIG_IGN);
@@ -42,7 +43,7 @@ void FastCGIServer::Serve() {
PCHECK(client_sock >= 0) << "accept()";
CHECK_EQ(client_addr.sin6_family, AF_INET6);
auto *conn = new FastCGIConn(client_sock, client_addr, callback_);
auto *conn = new FastCGIConn(client_sock, client_addr, callback_, headers_);
std::thread thread([conn]() { conn->Serve(); });
thread.detach();
}

6
fastcgi.h
View File

@@ -2,15 +2,17 @@
#include <functional>
#include <memory>
#include <unordered_set>
#include "fastcgi_request.h"
class FastCGIServer {
public:
FastCGIServer(int port, const std::function<void(std::unique_ptr<FastCGIRequest>)>& callback);
FastCGIServer(int port, const std::function<void(std::unique_ptr<FastCGIRequest>)>& callback, const std::unordered_set<std::string_view>& headers={});
void Serve();
private:
int listen_sock_;
std::function<void(std::unique_ptr<FastCGIRequest>)> callback_;
const std::function<void(std::unique_ptr<FastCGIRequest>)> callback_;
const std::unordered_set<std::string_view> headers_;
};

5
fastcgi_conn.cc
View File

@@ -7,9 +7,10 @@
#include "fastcgi_parse.h"
#include "fastcgi_request.h"
FastCGIConn::FastCGIConn(int sock, const sockaddr_in6& client_addr, const std::function<void(std::unique_ptr<FastCGIRequest>)>& callback)
FastCGIConn::FastCGIConn(int sock, const sockaddr_in6& client_addr, const std::function<void(std::unique_ptr<FastCGIRequest>)>& callback, const std::unordered_set<std::string_view>& headers)
: sock_(sock),
callback_(callback),
headers_(headers),
buf_(sock, fastcgi_max_record_len) {
char client_addr_str[INET6_ADDRSTRLEN];
PCHECK(inet_ntop(AF_INET6, &client_addr.sin6_addr, client_addr_str, sizeof(client_addr_str)));
@@ -61,9 +62,11 @@ void FastCGIConn::Serve() {
const auto *param_header = param_buf.ReadObj<FastCGIParamHeader>();
std::string_view key(param_buf.Read(param_header->key_length), param_header->key_length);
std::string_view value(param_buf.Read(param_header->value_length), param_header->value_length);
if (headers_.find(key) != headers_.end()) {
request_->AddParam(key, value);
}
}
}
break;
case 5:

6
fastcgi_conn.h
View File

@@ -2,6 +2,7 @@
#include <functional>
#include <unordered_map>
#include <unordered_set>
#include "stream_buffer.h"
@@ -10,7 +11,7 @@ class FastCGIRequest;
class FastCGIConn {
public:
FastCGIConn(int sock, const sockaddr_in6& client_addr, const std::function<void(std::unique_ptr<FastCGIRequest>)>& callback);
FastCGIConn(int sock, const sockaddr_in6& client_addr, const std::function<void(std::unique_ptr<FastCGIRequest>)>& callback, const std::unordered_set<std::string_view>& headers);
~FastCGIConn();
void Serve();
@@ -19,7 +20,8 @@ class FastCGIConn {
private:
const int sock_;
std::function<void(std::unique_ptr<FastCGIRequest>)> callback_;
const std::function<void(std::unique_ptr<FastCGIRequest>)>& callback_;
const std::unordered_set<std::string_view>& headers_;
uint64_t requests_ = 0;

4
sse.cc
View File

@@ -2,7 +2,9 @@
SSEServer::SSEServer(int port, const std::function<void(std::unique_ptr<SSEStream>)>& callback)
: callback_(callback),
fastcgi_server_(port, [this](std::unique_ptr<FastCGIRequest> request) { OnRequest(std::move(request)); }) {}
fastcgi_server_(port,
[this](std::unique_ptr<FastCGIRequest> request) { OnRequest(std::move(request)); },
{"HTTP_ACCEPT"}) {}
void SSEServer::Serve() {
fastcgi_server_.Serve();