Skip to content

GH-577: Use JVM proxy settings in Netty client #1027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ennuite wants to merge 2 commits into
base: main
Choose a base branch
from
+45 −1
Open

GH-577: Use JVM proxy settings in Netty client #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b88ba7
Intermediate commit
ennuite Feb 23, 2026
1e44df0
Test using ProxySelector spy
ennuite May 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/NettyClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ public NettyChannelBuilder build() {
case LocationSchemes.GRPC_INSECURE:
case LocationSchemes.GRPC_TLS:
{
builder = NettyChannelBuilder.forAddress(location.toSocketAddress());
builder =
NettyChannelBuilder.forAddress(
location.getUri().getHost(), location.getUri().getPort());
break;
}
case LocationSchemes.GRPC_DOMAIN_SOCKET:
Expand Down
42 changes: 42 additions & 0 deletions flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,22 @@
import static org.junit.jupiter.api.Assertions.fail;

import com.google.protobuf.Message;
import java.io.IOException;
import java.net.Proxy;
import java.net.ProxySelector;
import java.net.SocketAddress;
import java.net.URI;
import java.net.URISyntaxException;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Consumer;
import org.apache.arrow.driver.jdbc.authentication.UserPasswordAuthentication;
import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler;
Expand Down Expand Up @@ -768,4 +775,39 @@ public void testResultSetsFromDatabaseMetadataClosedOnConnectionClose() throws E
assertTrue(resultSets[i].isClosed());
}
}

@Test
public void testJdbcDriverConsultsProxySelectorForTcpConnections() throws Exception {
AtomicBoolean consulted = new AtomicBoolean(false);
ProxySelector original = ProxySelector.getDefault();
ProxySelector.setDefault(
new ProxySelector() {
@Override
public List<Proxy> select(URI uri) {
consulted.set(true);
return original.select(uri);
}

@Override
public void connectFailed(URI uri, SocketAddress sa, IOException e) {}
});

try {
final Properties properties = new Properties();
properties.put(ArrowFlightConnectionProperty.USER.camelName(), userTest);
properties.put(ArrowFlightConnectionProperty.PASSWORD.camelName(), passTest);
properties.put("useEncryption", false);

DriverManager.getConnection(
"jdbc:arrow-flight-sql://localhost:" + FLIGHT_SERVER_TEST_EXTENSION.getPort(),
properties)
.close();

assertTrue(
consulted.get(),
"JDBC driver must consult ProxySelector so JVM proxy settings are respected");
} finally {
ProxySelector.setDefault(original);
}
}
}
Loading