walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

src: Rewrite xff handling

This commit is contained in:
Tatsuhiro Tsujikawa 2016-03-12 18:46:58 +09:00
parent 67569486d1
commit c1571a3209
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/allocator.h
View File

@ -104,12 +104,26 @@ StringRef make_string_ref(BlockAllocator &alloc, const StringRef &src) {
template <typename BlockAllocator> template <typename BlockAllocator>
StringRef concat_string_ref(BlockAllocator &alloc, const StringRef &a, StringRef concat_string_ref(BlockAllocator &alloc, const StringRef &a,
const StringRef &b) { const StringRef &b) {
auto dst = static_cast<uint8_t *>(alloc.alloc(a.size() + b.size() + 1)); auto len = a.size() + b.size();
auto dst = static_cast<uint8_t *>(alloc.alloc(len + 1));
auto p = dst; auto p = dst;
p = std::copy(std::begin(a), std::end(a), p); p = std::copy(std::begin(a), std::end(a), p);
p = std::copy(std::begin(b), std::end(b), p); p = std::copy(std::begin(b), std::end(b), p);
*p = '\0'; *p = '\0';
return StringRef{dst, a.size() + b.size()}; return StringRef{dst, len};
}
template <typename BlockAllocator>
StringRef concat_string_ref(BlockAllocator &alloc, const StringRef &a,
const StringRef &b, const StringRef &c) {
auto len = a.size() + b.size() + c.size();
auto dst = static_cast<uint8_t *>(alloc.alloc(len + 1));
auto p = dst;
p = std::copy(std::begin(a), std::end(a), p);
p = std::copy(std::begin(b), std::end(b), p);
p = std::copy(std::begin(c), std::end(c), p);
*p = '\0';
return StringRef{dst, len};
} }
struct ByteRef { struct ByteRef {

15
src/shrpx_http2_downstream_connection.cc
View File

@ -387,17 +387,18 @@ int Http2DownstreamConnection::push_request_headers() {
auto xff = xffconf.strip_incoming ? nullptr auto xff = xffconf.strip_incoming ? nullptr
: req.fs.header(http2::HD_X_FORWARDED_FOR); : req.fs.header(http2::HD_X_FORWARDED_FOR);
std::string xff_value;
if (xffconf.add) { if (xffconf.add) {
StringRef xff_value;
auto addr = StringRef{upstream->get_client_handler()->get_ipaddr()};
if (xff) { if (xff) {
xff_value = (*xff).value.str(); xff_value = concat_string_ref(balloc, xff->value,
xff_value += ", "; StringRef::from_lit(", "), addr);
} else {
xff_value = addr;
} }
xff_value += upstream->get_client_handler()->get_ipaddr(); nva.push_back(http2::make_nv_ls_nocopy("x-forwarded-for", xff_value));
nva.push_back(http2::make_nv_ls("x-forwarded-for", xff_value));
} else if (xff) { } else if (xff) {
nva.push_back(http2::make_nv_ls_nocopy("x-forwarded-for", (*xff).value)); nva.push_back(http2::make_nv_ls_nocopy("x-forwarded-for", xff->value));
} }
if (!get_config()->http2_proxy && req.method != HTTP_CONNECT) { if (!get_config()->http2_proxy && req.method != HTTP_CONNECT) {