nghttpx: Fix bug that IPv6 address in Forwarded "for" is not quoted-string

src/shrpx_client_handler.cc

@@ -377,7 +377,7 @@ int ClientHandler::upstream_http1_connhd_read() {
 }
 
 ClientHandler::ClientHandler(Worker *worker, int fd, SSL *ssl,
-                             const char *ipaddr, const char *port,
+                             const char *ipaddr, const char *port, int family,
                              const FrontendAddr *faddr)
     : conn_(worker->get_loop(), fd, ssl, worker->get_mcpool(),
             get_config()->conn.upstream.timeout.write,
@@ -418,11 +418,19 @@ ClientHandler::ClientHandler(Worker *worker, int fd, SSL *ssl,
 
   auto &fwdconf = get_config()->http.forwarded;
 
-  if ((fwdconf.params & FORWARDED_FOR) &&
+  if (fwdconf.params & FORWARDED_FOR) {
-      fwdconf.for_node_type == FORWARDED_NODE_OBFUSCATED) {
+    if (fwdconf.for_node_type == FORWARDED_NODE_OBFUSCATED) {
-    forwarded_for_obfuscated_ = "_";
+      forwarded_for_ = "_";
-    forwarded_for_obfuscated_ += util::random_alpha_digit(
+      forwarded_for_ += util::random_alpha_digit(worker_->get_randgen(),
-        worker_->get_randgen(), SHRPX_OBFUSCATED_NODE_LENGTH);
+                                                 SHRPX_OBFUSCATED_NODE_LENGTH);
+    } else if (family == AF_INET6) {
+      forwarded_for_ = "[";
+      forwarded_for_ += ipaddr_;
+      forwarded_for_ += ']';
+    } else {
+      // family == AF_INET or family == AF_UNIX
+      forwarded_for_ = ipaddr_;
+    }
   }
 }
 
@@ -1129,11 +1137,7 @@ StringRef ClientHandler::get_forwarded_by() {
 }
 
 const std::string &ClientHandler::get_forwarded_for() const {
-  if (get_config()->http.forwarded.for_node_type == FORWARDED_NODE_OBFUSCATED) {
+  return forwarded_for_;
-    return forwarded_for_obfuscated_;
-  }
-
-  return ipaddr_;
 }
 
 } // namespace shrpx

src/shrpx_client_handler.h

@@ -53,7 +53,7 @@ struct WorkerStat;
 class ClientHandler {
 public:
   ClientHandler(Worker *worker, int fd, SSL *ssl, const char *ipaddr,
-                const char *port, const FrontendAddr *faddr);
+                const char *port, int family, const FrontendAddr *faddr);
   ~ClientHandler();
 
   int noop();
@@ -152,9 +152,9 @@ private:
   std::string port_;
   // The ALPN identifier negotiated for this connection.
   std::string alpn_;
-  // The obfuscated version of client address used in "for" parameter
+  // The client address used in "for" parameter of Forwarded header
-  // of Forwarded header field.
+  // field.
-  std::string forwarded_for_obfuscated_;
+  std::string forwarded_for_;
   std::function<int(ClientHandler &)> read_, write_;
   std::function<int(ClientHandler &)> on_read_, on_write_;
   // Address of frontend listening socket

src/shrpx_ssl.cc

@@ -783,7 +783,8 @@ ClientHandler *accept_connection(Worker *worker, int fd, sockaddr *addr,
     }
   }
 
-  return new ClientHandler(worker, fd, ssl, host, service, faddr);
+  return new ClientHandler(worker, fd, ssl, host, service, addr->sa_family,
+                           faddr);
 }
 
 bool tls_hostname_match(const char *pattern, size_t plen, const char *hostname,