test: Keep the existing WebSocket proxy credential tests unchanged

Restore WebSocketCredentialsStayWithTheirHop() and the two tests that use
it to their original form, and give the setter tests their own helper,
WebSocketSetterCredentialsStayWithTheirHop(), which sets the origin
credentials through set_basic_auth()/set_bearer_token_auth() instead of
a constructor header.

Author: Hyukya

test/test.cc

@@ -32172,19 +32172,45 @@ class ScopedWebSocketOrigin {
   no_proxy_test::ScopedServer server_;
 };
 
-// Connects through a proxy that requires `proxy_authz` and checks that it and
-// `origin_authz` each reach only their own hop. `set_credentials` sets the
-// proxy credentials, and the origin ones unless they come in `headers`.
+// Connects through a proxy that requires `proxy_authz`, with `origin_authz`
+// passed as a constructor header, and checks that each reaches only its hop.
 void WebSocketCredentialsStayWithTheirHop(
+    const std::function<void(ws::WebSocketClient &)> &set_proxy_credentials,
+    const std::string &proxy_authz, const std::string &origin_authz) {
+  ScopedWebSocketOrigin origin;
+  ScopedConnectProxy proxy(
+      origin.port(), require_proxy_auth(proxy_authz, "Basic realm=\"proxy\""));
+  ASSERT_NE(0, proxy.port());
+
+  ws::WebSocketClient client(origin.url(), {{"Authorization", origin_authz}});
+  client.set_proxy("127.0.0.1", proxy.port());
+  set_proxy_credentials(client);
+  auto res = client.connect();
+  ASSERT_TRUE(res) << "Error: " << to_string(res.error());
+
+  std::string msg;
+  ASSERT_TRUE(client.read(msg));
+  EXPECT_EQ("authorization:" + origin_authz + "|proxy-authorization:", msg);
+  client.close();
+
+  EXPECT_EQ(1, proxy.connect_hits());
+  EXPECT_EQ(std::string::npos,
+            proxy.connect_request().find("\r\nAuthorization: "))
+      << "origin credentials must not be sent to the proxy";
+}
+
+// Like WebSocketCredentialsStayWithTheirHop(), but with no constructor
+// headers: `set_credentials` sets both the proxy and the origin credentials
+// through the setters, and `origin_authz` is what the origin should receive.
+void WebSocketSetterCredentialsStayWithTheirHop(
     const std::function<void(ws::WebSocketClient &)> &set_credentials,
-    const std::string &proxy_authz, const std::string &origin_authz,
-    const Headers &headers = {}) {
+    const std::string &proxy_authz, const std::string &origin_authz) {
   ScopedWebSocketOrigin origin;
   ScopedConnectProxy proxy(
       origin.port(), require_proxy_auth(proxy_authz, "Basic realm=\"proxy\""));
   ASSERT_NE(0, proxy.port());
 
-  ws::WebSocketClient client(origin.url(), headers);
+  ws::WebSocketClient client(origin.url());
   client.set_proxy("127.0.0.1", proxy.port());
   set_credentials(client);
   auto res = client.connect();
@@ -32301,27 +32327,24 @@ TEST(WebSocketProxyTest, TunnelsThroughConnect) {
 }
 
 TEST(WebSocketProxyTest, BasicCredentialsStayWithTheirHop) {
-  auto origin_authz =
-      "Basic " + detail::base64_encode("origin-user:origin-pass");
   proxy_tunnel_test::WebSocketCredentialsStayWithTheirHop(
       [](ws::WebSocketClient &cli) {
         cli.set_proxy_basic_auth("proxy-user", "proxy-pass");
       },
-      "Basic " + detail::base64_encode("proxy-user:proxy-pass"), origin_authz,
-      {{"Authorization", origin_authz}});
+      "Basic " + detail::base64_encode("proxy-user:proxy-pass"),
+      "Basic " + detail::base64_encode("origin-user:origin-pass"));
 }
 
 TEST(WebSocketProxyTest, BearerCredentialsStayWithTheirHop) {
   proxy_tunnel_test::WebSocketCredentialsStayWithTheirHop(
       [](ws::WebSocketClient &cli) {
         cli.set_proxy_bearer_token_auth("proxy-token");
       },
-      "Bearer proxy-token", "Bearer origin-token",
-      {{"Authorization", "Bearer origin-token"}});
+      "Bearer proxy-token", "Bearer origin-token");
 }
 
 TEST(WebSocketProxyTest, BasicAuthSetterStaysWithItsHop) {
-  proxy_tunnel_test::WebSocketCredentialsStayWithTheirHop(
+  proxy_tunnel_test::WebSocketSetterCredentialsStayWithTheirHop(
       [](ws::WebSocketClient &cli) {
         cli.set_proxy_basic_auth("proxy-user", "proxy-pass");
         cli.set_basic_auth("origin-user", "origin-pass");
@@ -32331,7 +32354,7 @@ TEST(WebSocketProxyTest, BasicAuthSetterStaysWithItsHop) {
 }
 
 TEST(WebSocketProxyTest, BearerTokenAuthSetterStaysWithItsHop) {
-  proxy_tunnel_test::WebSocketCredentialsStayWithTheirHop(
+  proxy_tunnel_test::WebSocketSetterCredentialsStayWithTheirHop(
       [](ws::WebSocketClient &cli) {
         cli.set_proxy_bearer_token_auth("proxy-token");
         cli.set_bearer_token_auth("origin-token");