prmoore77 commented on code in PR #38461:
URL: https://github.com/apache/arrow/pull/38461#discussion_r1382151693
##########
java/flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/client/utils/ClientAuthenticationUtils.java:
##########
@@ -235,6 +235,57 @@ public static InputStream getCertificateStream(final
String keyStorePath,
return getSingleCertificateInputStream(keyStore);
}
+ /**
+ * Generates an {@link InputStream} that contains certificates for path-based
+ * TLS Root Certificates.
+ *
+ * @param tlsRootsCertificatesPath The path of the TLS Root Certificates.
+ * @return a new {code InputStream} containing the certificates.
+ * @throws GeneralSecurityException on error.
+ * @throws IOException on error.
+ */
+ public static InputStream getTlsRootCertificatesStream(final String
tlsRootsCertificatesPath)
+ throws GeneralSecurityException, IOException {
+ Preconditions.checkNotNull(tlsRootsCertificatesPath, "TLS Root
certificates path cannot be null!");
+
+ return Files
+
.newInputStream(Paths.get(Preconditions.checkNotNull(tlsRootsCertificatesPath)));
Review Comment:
This should now be fixed.
##########
java/flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/ConnectionTlsRootCertsTest.java:
##########
@@ -0,0 +1,356 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.arrow.driver.jdbc;
+
+import static org.junit.Assert.assertNotNull;
+
+import java.net.URLEncoder;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.Properties;
+
+import org.apache.arrow.driver.jdbc.authentication.UserPasswordAuthentication;
+import org.apache.arrow.driver.jdbc.client.ArrowFlightSqlClientHandler;
+import
org.apache.arrow.driver.jdbc.utils.ArrowFlightConnectionConfigImpl.ArrowFlightConnectionProperty;
+import org.apache.arrow.driver.jdbc.utils.FlightSqlTestCertificates;
+import org.apache.arrow.driver.jdbc.utils.MockFlightSqlProducer;
+import org.apache.arrow.memory.BufferAllocator;
+import org.apache.arrow.memory.RootAllocator;
+import org.apache.arrow.util.AutoCloseables;
+import
org.apache.calcite.avatica.org.apache.http.auth.UsernamePasswordCredentials;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+
+/**
+ * Tests encrypted connections.
+ */
+public class ConnectionTlsRootCertsTest {
+
+ @ClassRule
+ public static final FlightServerTestRule FLIGHT_SERVER_TEST_RULE;
+ private static final String tlsRootCertsPath;
+ private static final String badTlsRootCertsPath;
+ private static final MockFlightSqlProducer PRODUCER = new
MockFlightSqlProducer();
+ private static final String userTest = "user1";
+ private static final String passTest = "pass1";
+
+ static {
+ final FlightSqlTestCertificates.CertKeyPair
+ certKey = FlightSqlTestCertificates.exampleTlsCerts().get(0);
+
+ tlsRootCertsPath = certKey.cert.getPath();
+
+ badTlsRootCertsPath = certKey.cert.getPath() + ".bad";
+
+ UserPasswordAuthentication authentication = new
UserPasswordAuthentication.Builder()
+ .user(userTest, passTest)
+ .build();
+
+ FLIGHT_SERVER_TEST_RULE = new FlightServerTestRule.Builder()
+ .authentication(authentication)
+ .useEncryption(certKey.cert, certKey.key)
+ .producer(PRODUCER)
+ .build();
+ }
+
+ private BufferAllocator allocator;
+
+ @Before
+ public void setUp() throws Exception {
+ allocator = new RootAllocator(Long.MAX_VALUE);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ allocator.getChildAllocators().forEach(BufferAllocator::close);
+ AutoCloseables.close(allocator);
+ }
+
+ /**
+ * Try to instantiate an encrypted FlightClient.
+ *
+ * @throws Exception on error.
+ */
+ @Test
+ public void testGetEncryptedClientAuthenticated() throws Exception {
+ final UsernamePasswordCredentials credentials = new
UsernamePasswordCredentials(
+ userTest, passTest);
+
+ try (ArrowFlightSqlClientHandler client =
+ new ArrowFlightSqlClientHandler.Builder()
+ .withHost(FLIGHT_SERVER_TEST_RULE.getHost())
+ .withPort(FLIGHT_SERVER_TEST_RULE.getPort())
+ .withUsername(credentials.getUserName())
+ .withPassword(credentials.getPassword())
+ .withTlsRootCertificates(tlsRootCertsPath)
+ .withBufferAllocator(allocator)
+ .withEncryption(true)
+ .build()) {
+ assertNotNull(client);
+ }
+ }
+
+ /**
+ * Try to instantiate an encrypted FlightClient providing a bad TLS Root
Certs Path. It's expected to
+ * receive the SQLException.
+ *
+ * @throws Exception on error.
+ */
+ @Test(expected = SQLException.class)
Review Comment:
This should now be done.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
