fixed url with SSL property

Author: chernser

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcConfiguration.java

@@ -3,13 +3,16 @@
 import com.clickhouse.client.ClickHouseNode;
 import com.clickhouse.client.api.Client;
 import com.clickhouse.client.api.ClientConfigProperties;
+import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.http.ClickHouseHttpProto;
 import com.clickhouse.data.ClickHouseUtils;
 import com.clickhouse.jdbc.Driver;
 
 import java.net.MalformedURLException;
+import java.net.URI;
 import java.net.URL;
 import java.sql.DriverPropertyInfo;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -23,6 +26,8 @@ public class JdbcConfiguration {
     public static final String PREFIX_CLICKHOUSE = "jdbc:clickhouse:";
     public static final String PREFIX_CLICKHOUSE_SHORT = "jdbc:ch:";
 
+    public static final String USE_SSL_PROP = "ssl";
+
     final boolean disableFrameworkDetection;
 
     private final Map<String, String> clientProperties;
@@ -41,12 +46,14 @@ public boolean isDisableFrameworkDetection() {
      * @param url - JDBC url
      * @param info - Driver and Client properties.
      */
-    public JdbcConfiguration(String url, Properties info) {
-        this.connectionUrl = cleanUrl(url);
+    public JdbcConfiguration(String url, Properties info) throws SQLException {
         this.disableFrameworkDetection = Boolean.parseBoolean(info.getProperty("disable_frameworks_detection", "false"));
         this.clientProperties = new HashMap<>();
         this.driverProperties = new HashMap<>();
-        initProperties(this.connectionUrl, info);
+        initProperties(url, info);
+
+        boolean useSSL = Boolean.parseBoolean(info.getProperty("ssl", "false"));
+        this.connectionUrl = createConnectionURL(url, useSSL);
     }
 
     public static boolean acceptsURL(String url) {
@@ -59,20 +66,30 @@ public String getConnectionUrl() {
     }
 
     /**
-     * Transforms JDBC URL to WEB network. Method doesn't do guessing.
-     * If protocol is not set - then {@code https} used by default.
-     * User can always pass any protocol explicitly what is always should be encouraged.
+     * Returns normalized URL that can be passed as parameter to Client#addEndpoint().
+     * Returned url has only schema and authority and doesn't have query parameters.
+     * Note: Some BI tools do not let pass
      * @param url - JDBC url
+     * @param ssl - if SSL protocol should be used when protocol is not specified
      * @return URL without JDBC prefix
      */
-    protected String cleanUrl(String url) {
+    static String createConnectionURL(String url, boolean ssl) throws SQLException {
         url = stripUrlPrefix(url);
         if (url.startsWith("//")) {
-            url = "https:" + url;
+            url = (ssl ? "https:" : "http:") + url;
+        }
+
+        try {
+            System.out.println(url);
+            URI tmp = URI.create(url);
+            System.out.println(tmp);
+            return tmp.getScheme() + "://" + tmp.getAuthority() + tmp.getPath();
+        } catch (Exception e) {
+            throw new SQLException("Failed to parse url", e);
         }
-        return url;
     }
-    private String stripUrlPrefix(String url) {
+
+    private static String stripUrlPrefix(String url) {
         if (url.startsWith(PREFIX_CLICKHOUSE)) {
             return url.substring(PREFIX_CLICKHOUSE.length());
         } else if (url.startsWith(PREFIX_CLICKHOUSE_SHORT)) {

jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/JdbcConfigurationTest.java

@@ -7,7 +7,6 @@
 
 import java.sql.DriverPropertyInfo;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.stream.Collectors;
@@ -16,17 +15,23 @@
 
 public class JdbcConfigurationTest {
     @Test(dataProvider = "testConnectionUrlDataProvider")
-    public void testConnectionUrl(String jdbcUrl, String connectionUrl) {
-        JdbcConfiguration configuration = new JdbcConfiguration(jdbcUrl, new Properties());
+    public void testConnectionUrl(String jdbcUrl, String connectionUrl, Properties properties) throws Exception {
+        JdbcConfiguration configuration = new JdbcConfiguration(jdbcUrl, properties);
         assertEquals(configuration.getConnectionUrl(), connectionUrl);
     }
 
     @DataProvider(name = "testConnectionUrlDataProvider")
     public static Object[][] testConnectionUrlDataProvider() {
+        Properties defaultProps = new Properties();
+        Properties useSSL = new Properties();
+        useSSL.put(JdbcConfiguration.USE_SSL_PROP, "true");
+
         return new Object[][] {
-                {"jdbc:clickhouse://localhost:8123/", "https://localhost:8123/"},
-                {"jdbc:clickhouse://localhost:8443/clickhouse?param1=value1&param2=value2", "https://localhost:8443/clickhouse?param1=value1&param2=value2"},
-                {"jdbc:clickhouse:http://localhost:8123/clickhouse?param1=value1&param2=value2", "http://localhost:8123/clickhouse?param1=value1&param2=value2"}
+                {"jdbc:clickhouse://localhost:8123/", "http://localhost:8123/", defaultProps},
+                {"jdbc:clickhouse://localhost:8443/clickhouse?param1=value1&param2=value2", "http://localhost:8443/clickhouse", defaultProps},
+                {"jdbc:clickhouse:https://localhost:8123/clickhouse?param1=value1&param2=value2", "https://localhost:8123/clickhouse", defaultProps},
+                {"jdbc:clickhouse://localhost:8443/", "https://localhost:8443/", useSSL},
+                {"jdbc:clickhouse://localhost:8443/default?param1=value1&custom_header1=val1,val2,val3", "https://localhost:8443/default", useSSL},
         };
     }
 
@@ -39,11 +44,10 @@ public void testConfigurationProperties() throws Exception {
                 ClientConfigProperties.commaSeparated(Arrays.asList("http_headers=header1=3,header2=4")));
         String url = "jdbc:clickhouse://localhost:8123/clickhouse?client_name=test_application&database=default1";
         JdbcConfiguration configuration = new JdbcConfiguration(url, properties);
-        Assert.assertEquals(configuration.getConnectionUrl(), "https://localhost:8123/clickhouse?client_name=test_application&database=default1");
+        Assert.assertEquals(configuration.getConnectionUrl(), "http://localhost:8123/clickhouse");
         Map<String, DriverPropertyInfo> infos = configuration.getDriverPropertyInfo().stream().collect(Collectors.toMap(d -> d.name, d -> d));
 
         DriverPropertyInfo p = infos.get(ClientConfigProperties.DATABASE.getKey());
-        Assert.assertEquals(p.value, "default2");
-
+        Assert.assertEquals(p.value, "default1");
     }
 }