plumb down HandshakeLogging all the way to logging callbacks, save Ha…

…ndshakeLogging into TransportInfo

Summary: ^^

Reviewed By: mingtaoy

Differential Revision: D66326959

fbshipit-source-id: 864488627c741731e59b4679f8aee24dd72b1eaa

wangle/acceptor/FizzAcceptorHandshakeHelper.cpp

@@ -256,6 +256,7 @@ void FizzAcceptorHandshakeHelper::handshakeSuc(
   tinfo_.acceptTime = acceptTime_;
   tinfo_.sslSetupTime = std::chrono::duration_cast<std::chrono::milliseconds>(
       std::chrono::steady_clock::now() - acceptTime_);
+  tinfo_.handshakeLogging = std::move(fallback_.handshakeLogging);
   wangle::SSLAcceptorHandshakeHelper::fillSSLTransportInfoFields(sock, tinfo_);
 
   if (loggingCallback_) {
@@ -274,7 +275,8 @@ void FizzAcceptorHandshakeHelper::handshakeErr(
     folly::AsyncSSLSocket* sock,
     const folly::AsyncSocketException& ex) noexcept {
   if (loggingCallback_) {
-    loggingCallback_->logFallbackHandshakeError(*sock, ex);
+    loggingCallback_->logFallbackHandshakeError(
+        *sock, ex, fallback_.handshakeLogging.get());
   }
 
   auto elapsedTime = std::chrono::duration_cast<std::chrono::milliseconds>(

wangle/acceptor/FizzAcceptorHandshakeHelper.h

@@ -116,12 +116,12 @@ class FizzLoggingCallback {
    *
    * @param server   A valid, non-owning reference to the Fizz server side
    *                 connection object that handled the connection.
-   * @param ew       The exception object containing details on the cause of
+   * @param ex       The exception object containing details on the cause of
    *                 the handshake failure.
    */
   virtual void logFizzHandshakeError(
       const fizz::server::AsyncFizzServer& /*server*/,
-      const folly::exception_wrapper& /*ew*/) noexcept {}
+      const folly::exception_wrapper& /*ex*/) noexcept {}
 
   /**
    * logFallbackHandshakeError is invoked when the fallback OpenSSL
@@ -134,12 +134,14 @@ class FizzLoggingCallback {
    *
    * @param server   A valid, non-owning reference to AsyncSSLSocket
    *                 connection object that handled the connection.
-   * @param ew       The exception object containing details on the cause of
+   * @param ex       The exception object containing details on the cause of
    *                 the handshake failure.
+   * @param logging  If set, contains parsed ClientHello fields.
    */
   virtual void logFallbackHandshakeError(
       const folly::AsyncSSLSocket& /*server*/,
-      const folly::AsyncSocketException& /*ex*/) noexcept {}
+      const folly::AsyncSocketException& /*ex*/,
+      const fizz::server::HandshakeLogging* /*logging*/) noexcept {}
 };
 
 class FizzAcceptorHandshakeHelper;

wangle/acceptor/TransportInfo.h

@@ -26,6 +26,12 @@
 #include <folly/SocketAddress.h>
 #include <folly/portability/Sockets.h>
 
+namespace fizz {
+namespace server {
+struct HandshakeLogging;
+} // namespace server
+} // namespace fizz
+
 namespace folly {
 
 class AsyncSocket;
@@ -317,6 +323,13 @@ struct TransportInfo {
    */
   std::shared_ptr<std::string> tcpFingerprint{nullptr};
 
+  /*
+   * Additional handshake logging information parsed from the ClientHello by
+   * Fizz. This data is only used for logging and is not guaranteed to be
+   * present.
+   */
+  std::shared_ptr<fizz::server::HandshakeLogging> handshakeLogging;
+
   /*
    * Whether or not TCP fast open succeded on this connection. Failure can occur
    * due to several reasons, including cookies not matching or TFO not being

wangle/acceptor/test/AcceptorTest.cpp

@@ -235,7 +235,9 @@ class MockFizzLoggingCallback : public FizzLoggingCallback {
   MOCK_METHOD(
       void,
       logFallbackHandshakeError,
-      (const folly::AsyncSSLSocket&, const folly::AsyncSocketException&),
+      (const folly::AsyncSSLSocket&,
+       const folly::AsyncSocketException&,
+       const fizz::server::HandshakeLogging*),
       (noexcept));
 };