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

Merge branch 'nghttpx-dont-log-authorization'

This commit is contained in:
Tatsuhiro Tsujikawa 2019-04-16 00:26:12 +09:00
parent ce962c3fdf be96654d56
commit dce91ad37c
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/shrpx_http.cc
View File

@ -146,13 +146,22 @@ std::string colorizeHeaders(const char *hdrs) {
nhdrs += TTY_HTTP_HD; nhdrs += TTY_HTTP_HD;
nhdrs.append(p, np); nhdrs.append(p, np);
nhdrs += TTY_RST; nhdrs += TTY_RST;
auto redact = util::strieq_l("authorization", StringRef{p, np});
p = np; p = np;
np = strchr(p, '\n'); np = strchr(p, '\n');
if (!np) { if (!np) {
if (redact) {
nhdrs.append(": <redacted>");
} else {
nhdrs.append(p); nhdrs.append(p);
}
break; break;
} }
if (redact) {
nhdrs.append(": <redacted>\n");
} else {
nhdrs.append(p, np + 1); nhdrs.append(p, np + 1);
}
p = np + 1; p = np + 1;
} }
return nhdrs; return nhdrs;

5
src/shrpx_http2_downstream_connection.cc
View File

@ -463,6 +463,11 @@ int Http2DownstreamConnection::push_request_headers() {
if (LOG_ENABLED(INFO)) { if (LOG_ENABLED(INFO)) {
std::stringstream ss; std::stringstream ss;
for (auto &nv : nva) { for (auto &nv : nva) {
if (util::streq_l("authorization", nv.name, nv.namelen)) {
ss << TTY_HTTP_HD << StringRef{nv.name, nv.namelen} << TTY_RST
<< ": <redacted>\n";
continue;
}
ss << TTY_HTTP_HD << StringRef{nv.name, nv.namelen} << TTY_RST << ": " ss << TTY_HTTP_HD << StringRef{nv.name, nv.namelen} << TTY_RST << ": "
<< StringRef{nv.value, nv.valuelen} << "\n"; << StringRef{nv.value, nv.valuelen} << "\n";
} }

4
src/shrpx_http2_upstream.cc
View File

@ -321,6 +321,10 @@ int Http2Upstream::on_request_headers(Downstream *downstream,
if (LOG_ENABLED(INFO)) { if (LOG_ENABLED(INFO)) {
std::stringstream ss; std::stringstream ss;
for (auto &nv : nva) { for (auto &nv : nva) {
if (nv.name == "authorization") {
ss << TTY_HTTP_HD << nv.name << TTY_RST << ": <redacted>\n";
continue;
}
ss << TTY_HTTP_HD << nv.name << TTY_RST << ": " << nv.value << "\n"; ss << TTY_HTTP_HD << nv.name << TTY_RST << ": " << nv.value << "\n";
} }
ULOG(INFO, this) << "HTTP request headers. stream_id=" ULOG(INFO, this) << "HTTP request headers. stream_id="

4
src/shrpx_https_upstream.cc
View File

@ -318,6 +318,10 @@ int htp_hdrs_completecb(http_parser *htp) {
<< "HTTP/" << req.http_major << "." << req.http_minor << "\n"; << "HTTP/" << req.http_major << "." << req.http_minor << "\n";
for (const auto &kv : req.fs.headers()) { for (const auto &kv : req.fs.headers()) {
if (kv.name == "authorization") {
ss << TTY_HTTP_HD << kv.name << TTY_RST << ": <redacted>\n";
continue;
}
ss << TTY_HTTP_HD << kv.name << TTY_RST << ": " << kv.value << "\n"; ss << TTY_HTTP_HD << kv.name << TTY_RST << ": " << kv.value << "\n";
} }