diff --git a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilder.java b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilder.java index ae6f1706..5cc66190 100644 --- a/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilder.java +++ b/google-cloud-spanner-cassandra/src/main/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilder.java @@ -28,7 +28,6 @@ import com.google.cloud.spanner.adapter.metrics.BuiltInMetricsRecorder; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Strings; -import com.google.common.net.HostAndPort; import com.google.spanner.adapter.v1.DatabaseName; import io.opentelemetry.api.OpenTelemetry; import java.net.InetAddress; @@ -36,6 +35,7 @@ import java.net.SocketAddress; import java.net.UnknownHostException; import java.time.Duration; +import java.util.LinkedHashSet; import java.util.List; import java.util.Optional; import java.util.Set; @@ -284,7 +284,10 @@ void checkContactPoints() throws UnknownHostException { } List configContactPoints = null; - try (DriverConfigLoader defaultLoader = configLoader == null ? defaultConfigLoader() : null) { + try (DriverConfigLoader defaultLoader = + configLoader == null + ? defaultConfigLoader(programmaticArgumentsBuilder.build().getClassLoader()) + : null) { DriverConfigLoader effectiveLoader = configLoader != null ? configLoader : defaultLoader; if (effectiveLoader != null && effectiveLoader @@ -299,56 +302,48 @@ void checkContactPoints() throws UnknownHostException { } } - int configCount = configContactPoints != null ? configContactPoints.size() : 0; - if (programmaticContactPoints.size() + configCount > 1) { - throw new IllegalArgumentException( - "At most one contact point can be provided when using SpannerCqlSessionBuilder, as it" - + " connects to the local adapter."); + Set uniqueContactPoints = new LinkedHashSet<>(); + boolean hasConfigContactPoints = configContactPoints != null && !configContactPoints.isEmpty(); + if (hasConfigContactPoints) { + for (String configContactPoint : configContactPoints) { + uniqueContactPoints.add(parseConfigContactPoint(configContactPoint)); + } } - if (configCount == 1) { - HostAndPort parsed = HostAndPort.fromString(configContactPoints.get(0)); - if (!parsed.hasPort() || parsed.getPort() <= 0 || Strings.isNullOrEmpty(parsed.getHost())) { - throw new IllegalArgumentException( - "Contact point in DriverConfigLoader must specify host and a non-zero port, but got: " - + configContactPoints.get(0)); + for (EndPoint providedEndPoint : programmaticContactPoints) { + SocketAddress address = providedEndPoint.resolve(); + if (address == null) { + throw new IllegalArgumentException("Resolved contact point address cannot be null."); } - final InetAddress[] resolvedAddresses; - try { - resolvedAddresses = InetAddress.getAllByName(parsed.getHost()); - } catch (UnknownHostException e) { + if (!(address instanceof InetSocketAddress)) { + // Should not happen with typical Cassandra contact points. throw new IllegalArgumentException( - "Contact point for in-process SpannerCqlSessionBuilder must be a resolved loopback" - + " address, but could not resolve: " - + configContactPoints.get(0), - e); + "Unsupported contact point address type: " + address.getClass().getName()); } - for (InetAddress addr : resolvedAddresses) { - if (addr == null || !addr.isLoopbackAddress()) { + InetSocketAddress inetSocketAddress = (InetSocketAddress) address; + InetAddress resolved; + if (inetSocketAddress.isUnresolved()) { + resolved = + resolveLoopbackHost(inetSocketAddress.getHostString(), inetSocketAddress.toString()); + } else { + resolved = inetSocketAddress.getAddress(); + if (resolved == null || !resolved.isLoopbackAddress()) { throw new IllegalArgumentException( "Contact point for in-process SpannerCqlSessionBuilder must be a resolved loopback" + " address, but got: " - + addr); + + inetSocketAddress); } } - if (resolvedAddresses.length != 1) { - throw new IllegalArgumentException( - "At most one contact point address can be provided when using" - + " SpannerCqlSessionBuilder, but '" - + configContactPoints.get(0) - + "' resolved to " - + resolvedAddresses.length - + " addresses."); - } - iNetAddress = resolvedAddresses[0]; - userContactPoint = null; - configContactPointProvided = true; - port = parsed.getPort(); - LOG.debug("Using config-provided localhost contact point: {}:{}", iNetAddress, port); - return; + uniqueContactPoints.add(new InetSocketAddress(resolved, inetSocketAddress.getPort())); } - if (programmaticContactPoints.isEmpty()) { + if (uniqueContactPoints.size() > 1) { + throw new IllegalArgumentException( + "At most one contact point can be provided when using SpannerCqlSessionBuilder, as it" + + " connects to the local adapter."); + } + + if (uniqueContactPoints.isEmpty()) { userContactPoint = null; iNetAddress = InetAddress.getLoopbackAddress(); port = DEFAULT_PORT; @@ -357,30 +352,100 @@ void checkContactPoints() throws UnknownHostException { return; } - // Exactly one contact point was provided by the user. Validate it. - EndPoint providedEndPoint = programmaticContactPoints.iterator().next(); - SocketAddress address = providedEndPoint.resolve(); - if (address == null) { - throw new IllegalArgumentException("Resolved contact point address cannot be null."); + InetSocketAddress singleContactPoint = uniqueContactPoints.iterator().next(); + iNetAddress = singleContactPoint.getAddress(); + port = singleContactPoint.getPort(); + configContactPointProvided = hasConfigContactPoints; + userContactPoint = + programmaticContactPoints.isEmpty() ? null : programmaticContactPoints.iterator().next(); + LOG.debug("Using localhost contact point: {}:{}", iNetAddress, port); + } + + /** + * Parses a {@code host:port} contact point string from {@link DriverConfigLoader} (accepting both + * bracketed and unbracketed IPv6 literals to match the DataStax driver) and validates that all + * resolved addresses are loopback with a port in {@code 1..65535}. + */ + private static InetSocketAddress parseConfigContactPoint(String contactPoint) { + if (Strings.isNullOrEmpty(contactPoint)) { + throw new IllegalArgumentException( + "Contact point in DriverConfigLoader must specify host and a non-zero port, but got: " + + contactPoint); + } + int lastColon = contactPoint.lastIndexOf(':'); + if (lastColon <= 0 || lastColon == contactPoint.length() - 1) { + throw new IllegalArgumentException( + "Contact point in DriverConfigLoader must specify host and a non-zero port, but got: " + + contactPoint); } + String rawHost = contactPoint.substring(0, lastColon); + String portStr = contactPoint.substring(lastColon + 1); + String parsedHost; + if (rawHost.startsWith("[")) { + if (!rawHost.endsWith("]") || rawHost.length() <= 2) { + throw new IllegalArgumentException( + "Contact point in DriverConfigLoader has malformed IPv6 brackets: " + contactPoint); + } + parsedHost = rawHost.substring(1, rawHost.length() - 1); + } else if (rawHost.endsWith("]")) { + throw new IllegalArgumentException( + "Contact point in DriverConfigLoader has malformed IPv6 brackets: " + contactPoint); + } else { + parsedHost = rawHost; + } + if (Strings.isNullOrEmpty(parsedHost)) { + throw new IllegalArgumentException( + "Contact point in DriverConfigLoader must specify host and a non-zero port, but got: " + + contactPoint); + } + final int parsedPort; + try { + parsedPort = Integer.parseInt(portStr); + } catch (NumberFormatException e) { + throw new IllegalArgumentException( + "Contact point in DriverConfigLoader must specify host and a non-zero port, but got: " + + contactPoint, + e); + } + if (parsedPort <= 0 || parsedPort > 65535) { + throw new IllegalArgumentException( + "Contact point in DriverConfigLoader must specify host and a non-zero port, but got: " + + contactPoint); + } + InetAddress resolved = resolveLoopbackHost(parsedHost, contactPoint); + return new InetSocketAddress(resolved, parsedPort); + } - if (address instanceof InetSocketAddress) { - InetSocketAddress inetSocketAddress = (InetSocketAddress) address; - iNetAddress = inetSocketAddress.getAddress(); - if (iNetAddress == null || !iNetAddress.isLoopbackAddress()) { + /** + * Resolves all IP addresses for {@code host}, verifies that every resolved address is a loopback + * address, and returns the primary address for binding the embedded adapter. + */ + private static InetAddress resolveLoopbackHost(String host, String displayValue) { + final InetAddress[] resolvedAddresses; + try { + resolvedAddresses = InetAddress.getAllByName(host); + } catch (UnknownHostException e) { + throw new IllegalArgumentException( + "Contact point for in-process SpannerCqlSessionBuilder must be a resolved loopback" + + " address, but could not resolve: " + + displayValue, + e); + } + if (resolvedAddresses.length == 0) { + throw new IllegalArgumentException( + "Contact point for in-process SpannerCqlSessionBuilder must be a resolved loopback" + + " address, but could not resolve: " + + displayValue); + } + for (InetAddress addr : resolvedAddresses) { + if (addr == null || !addr.isLoopbackAddress()) { throw new IllegalArgumentException( "Contact point for in-process SpannerCqlSessionBuilder must be a resolved loopback" + " address, but got: " - + inetSocketAddress); + + addr); } - userContactPoint = providedEndPoint; - port = inetSocketAddress.getPort(); - LOG.debug("Using user-provided localhost contact point: {}", inetSocketAddress); - } else { - // Should not happen with typical Cassandra contact points. - throw new IllegalArgumentException( - "Unsupported contact point address type: " + address.getClass().getName()); } + return resolvedAddresses[0]; } private void checkNumGrpcChannels() { diff --git a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilderTest.java b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilderTest.java index f67c8efe..8d12b2da 100644 --- a/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilderTest.java +++ b/google-cloud-spanner-cassandra/src/test/java/com/google/cloud/spanner/adapter/SpannerCqlSessionBuilderTest.java @@ -35,12 +35,21 @@ import com.google.spanner.adapter.v1.AdapterSettings; import com.google.spanner.adapter.v1.Session; import com.typesafe.config.ConfigFactory; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.ServerSocket; import java.net.SocketAddress; +import java.net.URL; +import java.net.URLClassLoader; +import java.net.URLConnection; +import java.net.URLStreamHandler; +import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.Collections; +import java.util.Enumeration; import java.util.List; import java.util.Set; import java.util.concurrent.CompletionStage; @@ -282,7 +291,7 @@ public void testConfigLoaderContactPoint_validLoopbackAccepted() throws Exceptio } @Test - public void testConfigLoaderContactPoint_multipleResolvedAddressesThrowsIllegalArgumentException() + public void testConfigLoaderContactPoint_dualStackLoopbackAcceptedAndMixedRejected() throws Exception { InetAddress ipv4Loopback = InetAddress.getByName("127.0.0.1"); InetAddress ipv6Loopback = InetAddress.getByName("::1"); @@ -302,7 +311,9 @@ public void testConfigLoaderContactPoint_multipleResolvedAddressesThrowsIllegalA mockedInetAddress .when(() -> InetAddress.getAllByName("multi-host")) .thenReturn(new InetAddress[] {ipv4Loopback, ipv6Loopback}); - assertThrows(IllegalArgumentException.class, builder::checkContactPoints); + builder.checkContactPoints(); + assertEquals(ipv4Loopback, builder.getAdapterInetAddress()); + assertEquals(9042, builder.getAdapterPort()); mockedInetAddress .when(() -> InetAddress.getAllByName("multi-host")) @@ -522,4 +533,147 @@ public String asMetricPrefix() { } } } + + @Test + public void testUnresolvedLoopbackContactPoint_acceptedAndUnresolvedWildcardRejected() + throws Exception { + List unresolvedLoopback = + Arrays.asList( + InetSocketAddress.createUnresolved("127.0.0.1", 9042), + InetSocketAddress.createUnresolved("::1", 9042), + InetSocketAddress.createUnresolved("localhost", 9042)); + + for (InetSocketAddress contactPoint : unresolvedLoopback) { + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .addContactPoint(contactPoint); + builder.checkContactPoints(); + assertThat(builder.getAdapterInetAddress()).isNotNull(); + assertThat(builder.getAdapterInetAddress().isLoopbackAddress()).isTrue(); + assertThat(builder.getAdapterPort()).isEqualTo(9042); + } + + SpannerCqlSessionBuilder wildcardBuilder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .addContactPoint(InetSocketAddress.createUnresolved("0.0.0.0", 9042)); + assertThrows(IllegalArgumentException.class, wildcardBuilder::checkContactPoints); + } + + @Test + public void testIdenticalConfigAndProgrammaticContactPoint_deduplicated() throws Exception { + DriverConfigLoader configLoader = + DriverConfigLoader.programmaticBuilder() + .withStringList( + DefaultDriverOption.CONTACT_POINTS, Collections.singletonList("127.0.0.1:9042")) + .build(); + SpannerCqlSessionBuilder duplicateBuilder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .withConfigLoader(configLoader) + .addContactPoint(new InetSocketAddress("127.0.0.1", 9042)); + + duplicateBuilder.checkContactPoints(); + assertEquals(InetAddress.getByName("127.0.0.1"), duplicateBuilder.getAdapterInetAddress()); + assertEquals(9042, duplicateBuilder.getAdapterPort()); + + SpannerCqlSessionBuilder distinctBuilder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .withConfigLoader(configLoader) + .addContactPoint(new InetSocketAddress("127.0.0.1", 9043)); + assertThrows(IllegalArgumentException.class, distinctBuilder::checkContactPoints); + } + + @Test + public void testConfigLoaderContactPoint_unbracketedAndBracketedIpv6LoopbackAccepted() + throws Exception { + InetAddress ipv6Loopback = InetAddress.getByName("::1"); + for (String cp : Arrays.asList("::1:9042", "[::1]:9042")) { + DriverConfigLoader configLoader = + DriverConfigLoader.programmaticBuilder() + .withStringList(DefaultDriverOption.CONTACT_POINTS, Collections.singletonList(cp)) + .build(); + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .withConfigLoader(configLoader); + + builder.checkContactPoints(); + assertEquals(ipv6Loopback, builder.getAdapterInetAddress()); + assertEquals(9042, builder.getAdapterPort()); + } + + for (String malformed : + Arrays.asList("[::1:9042", "127.0.0.1:notaport", "127.0.0.1", ":9042")) { + DriverConfigLoader configLoader = + DriverConfigLoader.programmaticBuilder() + .withStringList( + DefaultDriverOption.CONTACT_POINTS, Collections.singletonList(malformed)) + .build(); + SpannerCqlSessionBuilder builder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .withConfigLoader(configLoader); + assertThrows(IllegalArgumentException.class, builder::checkContactPoints); + } + } + + @Test + public void testDefaultConfigLoader_usesCustomClassLoader() throws Exception { + ClassLoader loopbackConfigCl = + classLoaderWithApplicationConf( + "datastax-java-driver.basic.contact-points = [\"127.0.0.1:9045\"]\n"); + SpannerCqlSessionBuilder loopbackBuilder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .withClassLoader(loopbackConfigCl); + + loopbackBuilder.checkContactPoints(); + assertEquals(InetAddress.getByName("127.0.0.1"), loopbackBuilder.getAdapterInetAddress()); + assertEquals(9045, loopbackBuilder.getAdapterPort()); + + ClassLoader nonLoopbackConfigCl = + classLoaderWithApplicationConf( + "datastax-java-driver.basic.contact-points = [\"10.0.0.1:9045\"]\n"); + SpannerCqlSessionBuilder nonLoopbackBuilder = + new SpannerCqlSessionBuilder() + .setDatabaseUri(TEST_DATABASE_URI) + .withClassLoader(nonLoopbackConfigCl); + assertThrows(IllegalArgumentException.class, nonLoopbackBuilder::checkContactPoints); + } + + private static ClassLoader classLoaderWithApplicationConf(final String content) { + final byte[] bytes = content.getBytes(StandardCharsets.UTF_8); + return new URLClassLoader(new URL[0], SpannerCqlSessionBuilderTest.class.getClassLoader()) { + @Override + public Enumeration getResources(String name) throws IOException { + if ("application.conf".equals(name)) { + URL url = + new URL( + "memory", + null, + -1, + "/application.conf", + new URLStreamHandler() { + @Override + protected URLConnection openConnection(URL u) { + return new URLConnection(u) { + @Override + public void connect() {} + + @Override + public InputStream getInputStream() { + return new ByteArrayInputStream(bytes); + } + }; + } + }); + return Collections.enumeration(Collections.singletonList(url)); + } + return super.getResources(name); + } + }; + } }