From 99925e3224341b95bd195d728a220d41ba3d924a Mon Sep 17 00:00:00 2001 From: Sadanand Shenoy Date: Thu, 1 Aug 2024 20:58:12 +0530 Subject: [PATCH] RATIS-2133. Ignore http proxy for ratis grpc client & server (#1128) --- .../org/apache/ratis/grpc/client/GrpcClientProtocolClient.java | 2 ++ .../org/apache/ratis/grpc/server/GrpcServerProtocolClient.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java index 08bacdb73b..a1f01a5129 100644 --- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java +++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java @@ -128,6 +128,8 @@ private ManagedChannel buildChannel(String address, GrpcTlsConfig tlsConf, SizeInBytes flowControlWindow, SizeInBytes maxMessageSize) { NettyChannelBuilder channelBuilder = NettyChannelBuilder.forTarget(address); + // ignore any http proxy for grpc + channelBuilder.proxyDetector(uri -> null); if (tlsConf != null) { SslContextBuilder sslContextBuilder = GrpcSslContexts.forClient(); diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcServerProtocolClient.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcServerProtocolClient.java index 970134d02a..4a280ab335 100644 --- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcServerProtocolClient.java +++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcServerProtocolClient.java @@ -78,6 +78,8 @@ private ManagedChannel buildChannel(RaftPeer target, int flowControlWindow, GrpcTlsConfig tlsConfig) { NettyChannelBuilder channelBuilder = NettyChannelBuilder.forTarget(target.getAddress()); + // ignore any http proxy for grpc + channelBuilder.proxyDetector(uri -> null); if (tlsConfig!= null) { SslContextBuilder sslContextBuilder = GrpcSslContexts.forClient();