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

nghttpx: Get TLS info only when it is necessary when writing accesslog

This commit is contained in:
Tatsuhiro Tsujikawa 2017-10-29 21:22:33 +09:00
parent 1a1a216d5a
commit c4f8afcfde
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/shrpx_log.cc
View File

@ -407,8 +407,6 @@ void upstream_accesslog(const std::vector<LogFragment> &lfv,
? StringRef::from_lit("*") ? StringRef::from_lit("*")
: StringRef::from_lit("-") : StringRef::from_lit("-")
: req.path; : req.path;
nghttp2::tls::TLSSessionInfo tls_info;
nghttp2::tls::get_tls_session_info(&tls_info, lgsp.ssl);
auto p = std::begin(buf); auto p = std::begin(buf);
auto last = std::end(buf) - 2; auto last = std::end(buf) - 2;
@ -495,29 +493,38 @@ void upstream_accesslog(const std::vector<LogFragment> &lfv,
std::tie(p, last) = copy('-', p, last); std::tie(p, last) = copy('-', p, last);
break; break;
} }
std::tie(p, last) = copy(tls_info.cipher, p, last); std::tie(p, last) = copy(SSL_get_cipher_name(lgsp.ssl), p, last);
break; break;
case SHRPX_LOGF_TLS_PROTOCOL: case SHRPX_LOGF_TLS_PROTOCOL:
if (!lgsp.ssl) { if (!lgsp.ssl) {
std::tie(p, last) = copy('-', p, last); std::tie(p, last) = copy('-', p, last);
break; break;
} }
std::tie(p, last) = copy(tls_info.protocol, p, last); std::tie(p, last) =
copy(nghttp2::tls::get_tls_protocol(lgsp.ssl), p, last);
break; break;
case SHRPX_LOGF_TLS_SESSION_ID: case SHRPX_LOGF_TLS_SESSION_ID: {
if (!lgsp.ssl || tls_info.session_id_length == 0) { auto session = SSL_get_session(lgsp.ssl);
if (!session) {
std::tie(p, last) = copy('-', p, last); std::tie(p, last) = copy('-', p, last);
break; break;
} }
std::tie(p, last) = copy_hex_low(tls_info.session_id, unsigned int session_id_length = 0;
tls_info.session_id_length, p, last); auto session_id = SSL_SESSION_get_id(session, &session_id_length);
if (session_id_length == 0) {
std::tie(p, last) = copy('-', p, last);
break;
}
std::tie(p, last) = copy_hex_low(session_id, session_id_length, p, last);
break; break;
}
case SHRPX_LOGF_TLS_SESSION_REUSED: case SHRPX_LOGF_TLS_SESSION_REUSED:
if (!lgsp.ssl) { if (!lgsp.ssl) {
std::tie(p, last) = copy('-', p, last); std::tie(p, last) = copy('-', p, last);
break; break;
} }
std::tie(p, last) = copy(tls_info.session_reused ? 'r' : '.', p, last); std::tie(p, last) =
copy(SSL_session_reused(lgsp.ssl) ? 'r' : '.', p, last);
break; break;
case SHRPX_LOGF_TLS_SNI: case SHRPX_LOGF_TLS_SNI:
if (lgsp.sni.empty()) { if (lgsp.sni.empty()) {