Skip to content

Commit 0442c2a

Browse files
samikshya-dbsamikshya-db
authored
[PECO-1647] Fix HTTPS (#180)
1 parent ede2fdc commit 0442c2a

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎src/main/java/com/databricks/jdbc/driver/DatabricksConnectionContext.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public String getHostUrl() throws DatabricksParsingException {
105105
LOGGER.debug("public String getHostUrl()");
106106
// Determine the schema based on the transport mode
107107
String schema =
108-
(getTransportMode() != null && getTransportMode().equals("http"))
108+
(getSSLMode() != null && getSSLMode().equals("0"))
109109
? DatabricksJdbcConstants.HTTP_SCHEMA
110110
: DatabricksJdbcConstants.HTTPS_SCHEMA;
111111

@@ -127,8 +127,8 @@ public String getHostUrl() throws DatabricksParsingException {
127127
}
128128
}
129129

130-
private String getTransportMode() {
131-
return getParameter(DatabricksJdbcConstants.TRANSPORT_MODE);
130+
private String getSSLMode() {
131+
return getParameter(DatabricksJdbcConstants.SSL);
132132
}
133133

134134
@Override

‎src/main/java/com/databricks/jdbc/driver/DatabricksJdbcConstants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public final class DatabricksJdbcConstants {
6767

6868
public static final String HTTP_PATH = "httppath";
6969

70-
public static final String TRANSPORT_MODE = "transportmode";
70+
public static final String SSL = "ssl";
7171

7272
static final String HTTP_SCHEMA = "http://";
7373
static final String HTTPS_SCHEMA = "https://";

‎src/test/java/com/databricks/jdbc/driver/DatabricksConnectionContextTest.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,36 +20,36 @@ class DatabricksConnectionContextTest {
2020
private static final String VALID_URL_2 =
2121
"jdbc:databricks://azuredatabricks.net/default;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/fgff575757;LogLevel=invalid;EnableQueryResultLZ4Compression=1;UseThriftClient=0";
2222
private static final String VALID_URL_3 =
23-
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;transportMode=http;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;EnableQueryResultLZ4Compression=0;UseThriftClient=1";
23+
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;transportMode=http;ssl=0;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;EnableQueryResultLZ4Compression=0;UseThriftClient=1";
2424
private static final String VALID_URL_4 =
25-
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;transportMode=http;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;QueryResultCompressionType=1";
25+
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;QueryResultCompressionType=1";
2626
private static final String VALID_URL_5 =
27-
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:4473;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;QueryResultCompressionType=1";
27+
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:4473;ssl=0;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;QueryResultCompressionType=1";
2828

2929
private static final String VALID_URL_6 =
30-
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:4473/schemaName;transportMode=http;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;ConnCatalog=catalogName;QueryResultCompressionType=1";
30+
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:4473/schemaName;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;ConnCatalog=catalogName;QueryResultCompressionType=1";
3131

3232
private static final String VALID_URL_7 =
3333
"jdbc:databricks://adb-565757575.18.azuredatabricks.net:4423/default;ssl=1;AuthMech=3;httpPath=/sql/1.0/endpoints/erg6767gg;LogLevel=debug;LogPath=test1/application.log;auth_flow=2";
3434

3535
private static final String VALID_URL_WITH_INVALID_COMPRESSION_TYPE =
36-
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;transportMode=http;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;QueryResultCompressionType=234";
36+
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;QueryResultCompressionType=234";
3737

3838
private static final String INVALID_URL_1 =
39-
"jdbc:oracle://azuredatabricks.net/default;transportMode=http;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/fgff575757;";
39+
"jdbc:oracle://azuredatabricks.net/default;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/fgff575757;";
4040
private static final String INVALID_URL_2 =
41-
"http:databricks://azuredatabricks.net/default;transportMode=http;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/fgff575757;";
41+
"http:databricks://azuredatabricks.net/default;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/fgff575757;";
4242
private static final String VALID_TEST_URL = "jdbc:databricks://test";
4343

4444
private static final String VALID_CLUSTER_URL =
4545
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;ssl=1;httpPath=sql/protocolv1/o/6051921418418893/1115-130834-ms4m0yv;AuthMech=3";
4646
private static final String INVALID_CLUSTER_URL =
47-
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;transportMode=http;ssl=1;httpPath=sql/protocolv1/oo/6051921418418893/1115-130834-ms4m0yv;AuthMech=3";
47+
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;ssl=1;httpPath=sql/protocolv1/oo/6051921418418893/1115-130834-ms4m0yv;AuthMech=3";
4848

4949
private static final String VALID_URL_WITH_PROXY =
50-
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;transportMode=http;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;UseProxy=1;ProxyHost=127.0.0.1;ProxyPort=8080;ProxyAuth=1;ProxyUID=proxyUser;ProxyPwd=proxyPassword;";
50+
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;UseProxy=1;ProxyHost=127.0.0.1;ProxyPort=8080;ProxyAuth=1;ProxyUID=proxyUser;ProxyPwd=proxyPassword;";
5151
private static final String VALID_URL_WITH_PROXY_AND_CF_PROXY =
52-
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;transportMode=http;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;UseSystemProxy=1;UseProxy=1;ProxyHost=127.0.0.1;ProxyPort=8080;ProxyAuth=1;ProxyUID=proxyUser;ProxyPwd=proxyPassword;UseCFProxy=1;CFProxyHost=127.0.1.2;CFProxyPort=8081;CFProxyAuth=1;CFProxyUID=cfProxyUser;CFProxyPwd=cfProxyPassword;";
52+
"jdbc:databricks://e2-dogfood.staging.cloud.databricks.com:443/default;ssl=1;AuthMech=3;httpPath=/sql/1.0/warehouses/5c89f447c476a5a8;UseSystemProxy=1;UseProxy=1;ProxyHost=127.0.0.1;ProxyPort=8080;ProxyAuth=1;ProxyUID=proxyUser;ProxyPwd=proxyPassword;UseCFProxy=1;CFProxyHost=127.0.1.2;CFProxyPort=8081;CFProxyAuth=1;CFProxyUID=cfProxyUser;CFProxyPwd=cfProxyPassword;";
5353

5454
private static Properties properties = new Properties();
5555

@@ -246,7 +246,7 @@ public void testParsingOfUrlWithoutDefault() throws DatabricksSQLException {
246246
assertEquals(CompressionType.LZ4_COMPRESSION, connectionContext.getCompressionType());
247247
assertEquals(5, connectionContext.parameters.size());
248248
assertEquals(
249-
"https://e2-dogfood.staging.cloud.databricks.com:4473", connectionContext.getHostUrl());
249+
"http://e2-dogfood.staging.cloud.databricks.com:4473", connectionContext.getHostUrl());
250250
assertEquals("INFO", connectionContext.getLogLevelString());
251251
}
252252

‎src/test/java/com/databricks/jdbc/integration/IntegrationTestUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public static void resetJDBCConnection() {
8989
public static String getJDBCUrl() {
9090
String template =
9191
Boolean.parseBoolean(System.getProperty(IS_FAKE_SERVICE_TEST_PROP))
92-
? "jdbc:databricks://%s/default;transportMode=http;ssl=1;AuthMech=3;httpPath=%s"
92+
? "jdbc:databricks://%s/default;transportMode=http;ssl=0;AuthMech=3;httpPath=%s"
9393
: "jdbc:databricks://%s/default;ssl=1;AuthMech=3;httpPath=%s";
9494

9595
String host = getDatabricksHost();

0 commit comments

Comments
 (0)