(ratis) branch master updated: RATIS-2133. Ignore http proxy for ratis grpc client & server (#1128)

[szetszwo]

This is an automated email from the ASF dual-hosted git repository.

szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git


The following commit(s) were added to refs/heads/master by this push:
     new 99925e322 RATIS-2133. Ignore http proxy for ratis grpc client & server 
(#1128)
99925e322 is described below

commit 99925e3224341b95bd195d728a220d41ba3d924a
Author: Sadanand Shenoy <sadanand.shenoy4...@gmail.com>
AuthorDate: Thu Aug 1 20:58:12 2024 +0530

    RATIS-2133. Ignore http proxy for ratis grpc client & server (#1128)
---
 .../java/org/apache/ratis/grpc/client/GrpcClientProtocolClient.java     | 2 ++
 .../java/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 08bacdb73..a1f01a512 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 @@ public class GrpcClientProtocolClient implements Closeable {
       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 970134d02..4a280ab33 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 @@ public class GrpcServerProtocolClient implements Closeable {
       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();