From 9fa7ba574eb7a3578b5d235c62c692238db8427a Mon Sep 17 00:00:00 2001 From: Sakthivel Subramanian Date: Sat, 14 Nov 2026 14:31:09 +0000 Subject: [PATCH 1/4] fix: bind embedded proxy and sidecar listener to loopback by default --- README.md | 2 +- docs/config-options.md | 2 +- .../google/cloud/spanner/adapter/Adapter.java | 32 ++- .../cloud/spanner/adapter/Launcher.java | 40 ++-- .../adapter/SpannerCqlSessionBuilder.java | 43 +++- .../adapter/configs/ConfigConstants.java | 2 +- .../cloud/spanner/adapter/AdapterTest.java | 6 +- .../adapter/LauncherConfigParserTest.java | 29 +++ .../cloud/spanner/adapter/LauncherTest.java | 20 ++ .../adapter/SpannerCqlSessionBuilderTest.java | 220 ++++++++++++++++++ 10 files changed, 355 insertions(+), 41 deletions(-) diff --git a/README.md b/README.md index a8558f81..b67b110d 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ For non-Java applications or tools like `cqlsh`, you can run the Spanner Cassand **Configuration Notes:** * **Database URI**: You must specify the Spanner database URI. This is done via the `databaseUri` property in YAML or the `-DdatabaseUri` system property. - * **Host**: The default host is `0.0.0.0`. This can be overridden with the `host` property in YAML or `-Dhost`. + * **Host**: The default host is `127.0.0.1`. This can be overridden with the `host` property in YAML or `-Dhost`. * **Port**: The default port is `9042`. This can be overridden with the `port` property in YAML or `-Dport`. * **gRPC Channels**: The default number of gRPC channels is `4`. This can be overridden with `numGrpcChannels` in YAML or `-DnumGrpcChannels`. * **Health Check**: You can optionally enable a health check endpoint. diff --git a/docs/config-options.md b/docs/config-options.md index 18138543..030306ce 100644 --- a/docs/config-options.md +++ b/docs/config-options.md @@ -17,7 +17,7 @@ globalClientConfigs: listeners: # The name of the listener. It is recommended to use a meaningful name, such as the cluster name. - name: "listener_1" - # [Optional] The host to bind the listener to. Defaults to "0.0.0.0". + # [Optional] The host to bind the listener to. Defaults to "127.0.0.1". host: "127.0.0.1" # [Optional] The port to bind the listener to. Defaults to 9042. port: 9042 diff --git a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Adapter.java b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Adapter.java index a0032d1c..76f40cee 100644 --- a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Adapter.java +++ b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Adapter.java @@ -30,6 +30,7 @@ import com.google.cloud.NoCredentials; import com.google.cloud.spanner.adapter.SpannerCqlSessionBuilder.InstanceType; import com.google.common.base.MoreObjects; +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.spanner.adapter.v1.AdapterClient; import com.google.spanner.adapter.v1.AdapterSettings; @@ -120,17 +121,16 @@ void start() { .keyManager( new File(options.getClientCertPath()), new File(options.getClientKeyPath())) .build(); - channelProviderBuilder.setChannelConfigurator( - channelBuilder -> { - if (channelBuilder instanceof NettyChannelBuilder) { - ((NettyChannelBuilder) channelBuilder).sslContext(mTLSContext); - } else { - throw new IllegalStateException( - "mTLS requires NettyChannelBuilder, but got " - + channelBuilder.getClass().getName()); - } - return channelBuilder; - }); + channelProviderBuilder.setChannelConfigurator(channelBuilder -> { + if (channelBuilder instanceof NettyChannelBuilder) { + ((NettyChannelBuilder) channelBuilder).sslContext(mTLSContext); + } else { + throw new IllegalStateException( + "mTLS requires NettyChannelBuilder, but got " + + channelBuilder.getClass().getName()); + } + return channelBuilder; + }); } channelProviderBuilder @@ -178,7 +178,10 @@ void start() { serverSocket = new ServerSocket( options.getTcpPort(), DEFAULT_CONNECTION_BACKLOG, options.getInetAddress()); - LOG.info("Local TCP server started on {}:{}", options.getInetAddress(), options.getTcpPort()); + LOG.info( + "Local TCP server started on {}:{}", + options.getInetAddress(), + serverSocket.getLocalPort()); if (executor == null) { executor = Executors.newCachedThreadPool(); @@ -211,6 +214,11 @@ void stop() throws IOException { LOG.info("Adapter stopped."); } + int getBoundPort() { + Preconditions.checkState(started && serverSocket != null, "Adapter was never started!"); + return serverSocket.getLocalPort(); + } + private void acceptClientConnections() { try { while (!Thread.currentThread().isInterrupted()) { diff --git a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Launcher.java b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Launcher.java index ec0a8670..00e31c0a 100644 --- a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Launcher.java +++ b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/Launcher.java @@ -62,7 +62,7 @@ *