h11 proxy parsing bug: check for name, not type

sergiitk · sergiitk · commit dc66629f72b0 · 2026-01-26T12:29:45.000-08:00
diff --git a/xds/src/main/java/io/grpc/xds/XdsClusterResource.java b/xds/src/main/java/io/grpc/xds/XdsClusterResource.java
@@ -83,11 +83,20 @@ class XdsClusterResource extends XdsResourceType<CdsUpdate> {
       "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext";
   private static final String TYPE_URL_UPSTREAM_TLS_CONTEXT_V2 =
       "type.googleapis.com/envoy.api.v2.auth.UpstreamTlsContext";
-  static final String TRANSPORT_SOCKET_NAME_HTTP11_PROXY =
-      "type.googleapis.com/envoy.extensions.transport_sockets.http_11_proxy.v3"
-          + ".Http11ProxyUpstreamTransport";
-  static final String TRANSPORT_SOCKET_NAME_RAW_BUFFER =
-      "type.googleapis.com/envoy.extensions.transport_sockets.raw_buffer.v3.RawBuffer";
+
+  // TODO(sergiitk): should this be in XdsResourceType next to TRANSPORT_SOCKET_NAME_TLS?
+  @VisibleForTesting
+  static final String TRANSPORT_SOCKET_NAME_HTTP11_PROXY = "envoy.transport_sockets.http_11_proxy";
+  @VisibleForTesting
+  static final String TRANSPORT_SOCKET_NAME_RAW_BUFFER = "envoy.transport_sockets.raw_buffer";
+
+  // TODO(sergiitk): tell Eric about the bug.
+  // static final String TRANSPORT_SOCKET_NAME_HTTP11_PROXY =
+  //     "type.googleapis.com/envoy.extensions.transport_sockets.http_11_proxy.v3"
+  //         + ".Http11ProxyUpstreamTransport";
+  // static final String TRANSPORT_SOCKET_NAME_RAW_BUFFER =
+  //     "type.googleapis.com/envoy.extensions.transport_sockets.raw_buffer.v3.RawBuffer";
+
   private final LoadBalancerRegistry loadBalancerRegistry
       = LoadBalancerRegistry.getDefaultRegistry();
   private static final XdsLogger logger = XdsLogger.withLogId(
@@ -282,19 +291,29 @@ private static StructOrError<CdsUpdate.Builder> parseNonAggregateCluster(
           + ", socketIsH1Proxy=" + socketIsH1Proxy
           + ", isEnabledXdsHttpConnect=" + isEnabledXdsHttpConnect
           + ", socketIsH1ProxyAndSupported=" + socketIsH1ProxyAndSupported + ".";
-      logger.log(XdsLogLevel.ERROR, extraErrorMsg);
+      logger.log(XdsLogLevel.FORCE_WARNING, extraErrorMsg);
 
       return StructOrError.fromError(errMsg + ".");
     }
 
     if (hasTransportSocket && socketIsH1ProxyAndSupported) {
+      logger.log(XdsLogLevel.FORCE_INFO, "Enabling HTTP11 Proxy, trying to parse");
       isHttp11ProxyAvailable = true;
+
       try {
         Http11ProxyUpstreamTransport wrappedTransportSocket = transportSocket
-            .getTypedConfig().unpack(io.envoyproxy.envoy.extensions.transport_sockets
-                .http_11_proxy.v3.Http11ProxyUpstreamTransport.class);
+            .getTypedConfig().unpack(Http11ProxyUpstreamTransport.class);
+
         hasTransportSocket = wrappedTransportSocket.hasTransportSocket();
         transportSocket = wrappedTransportSocket.getTransportSocket();
+        transportSocketName = hasTransportSocket ? transportSocket.getName() : "<wrapped-invalid>";
+
+        logger.log(XdsLogLevel.FORCE_INFO,
+            "Enabled HTTP11 Proxy, wrapped socket: " + transportSocketName
+        );
+
+        // TODO(sergiitk): tell Eric this is missing the wrapped socket check.
+
       } catch (InvalidProtocolBufferException e) {
         return StructOrError.fromError(
             "Cluster " + clusterName + ": malformed Http11ProxyUpstreamTransport: " + e);
diff --git a/xds/src/test/java/io/grpc/xds/ClusterResolverLoadBalancerTest.java b/xds/src/test/java/io/grpc/xds/ClusterResolverLoadBalancerTest.java
@@ -416,8 +416,7 @@ public void endpointAddressRewritten_whenProxyMetadataIsInEndpointMetadata() {
     XdsClusterResource.isEnabledXdsHttpConnect = true;
     Cluster cluster = EDS_CLUSTER.toBuilder()
         .setTransportSocket(TransportSocket.newBuilder()
-            .setName(
-                "type.googleapis.com/" + Http11ProxyUpstreamTransport.getDescriptor().getFullName())
+            .setName("envoy.transport_sockets.http_11_proxy")
             .setTypedConfig(Any.pack(Http11ProxyUpstreamTransport.getDefaultInstance())))
         .build();
     // Proxy address in endpointMetadata, and no proxy in locality metadata
@@ -466,8 +465,7 @@ public void endpointAddressRewritten_whenProxyMetadataIsInLocalityMetadata() {
     XdsClusterResource.isEnabledXdsHttpConnect = true;
     Cluster cluster = EDS_CLUSTER.toBuilder()
         .setTransportSocket(TransportSocket.newBuilder()
-            .setName(
-                "type.googleapis.com/" + Http11ProxyUpstreamTransport.getDescriptor().getFullName())
+            .setName("envoy.transport_sockets.http_11_proxy")
             .setTypedConfig(Any.pack(Http11ProxyUpstreamTransport.getDefaultInstance())))
         .build();
     // No proxy address in endpointMetadata, and proxy in locality metadata
