nrg4878 commented on a change in pull request #1791:
URL: https://github.com/apache/hive/pull/1791#discussion_r552149040
##########
File path: jdbc/src/java/org/apache/hive/jdbc/HiveConnection.java
##########
@@ -896,39 +946,103 @@ private void openSession() throws SQLException {
openReq.setPassword(sessConfMap.get(JdbcConnectionParams.AUTH_PASSWD));
}
+ //TODO(Vihang): This is a bit hacky. We piggy back on a dummy OpenSession
call
+ // to get the redirect response from the server. Instead its probably
cleaner to
+ // explicitly do a HTTP post request and get the response.
+ int numRetry = isBrowserAuthMode() ? 2 : 1;
+ for (int i=0; i<numRetry; i++) {
+ try {
+ openSession(openReq);
+ } catch (TException e) {
+ if (isSamlRedirect(e)) {
+ boolean success = doBrowserSSO();
+ if (!success) {
+ String msg = browserClient.getServerResponse() == null
+ || browserClient.getServerResponse().getMsg() == null ? ""
+ : browserClient.getServerResponse().getMsg();
+ throw new SQLException(
+ "Could not establish connection to " + jdbcUriString + ": "
+ + msg, " 08S01", e);
+ }
+ } else {
+ throw new SQLException(
+ "Could not establish connection to " + jdbcUriString + ": " + e
+ .getMessage(), " 08S01", e);
+ }
+ }
+ }
+ isClosed = false;
+ }
+
+ private boolean doBrowserSSO() throws SQLException {
try {
- TOpenSessionResp openResp = client.OpenSession(openReq);
+ Preconditions.checkNotNull(browserClient);
+ try (IJdbcBrowserClient bc = browserClient) {
+ browserClient.doBrowserSSO();
+ HiveJdbcBrowserServerResponse response =
browserClient.getServerResponse();
+ if (response != null) {
+ return response.isSuccessful();
+ }
+ return false;
+ }
+ } catch (Exception ex) {
+ throw new SQLException("Browser based SSO failed: " + ex.getMessage(),
+ " 08S01",
+ ex);
+ }
+ }
- // Populate a given configuration from HS2 server HiveConf, only if that
configuration
- // is not already present in Connection parameter HiveConf i.e., client
side configuration
- // takes precedence over the server side configuration.
- Map<String, String> serverHiveConf = openResp.getConfiguration();
+ @VisibleForTesting
+ public IJdbcBrowserClient getBrowserClient() {
+ return browserClient;
+ }
- updateServerHiveConf(serverHiveConf, connParams);
+ private void openSession(TOpenSessionReq openReq) throws TException,
SQLException {
+ TOpenSessionResp openResp = client.OpenSession(openReq);
- // validate connection
- Utils.verifySuccess(openResp.getStatus());
- if (!supportedProtocols.contains(openResp.getServerProtocolVersion())) {
- throw new TException("Unsupported Hive2 protocol");
- }
- protocol = openResp.getServerProtocolVersion();
- sessHandle = openResp.getSessionHandle();
-
- final String serverFetchSizeString =
-
openResp.getConfiguration().get(ConfVars.HIVE_SERVER2_THRIFT_RESULTSET_DEFAULT_FETCH_SIZE.varname);
- if (serverFetchSizeString == null) {
- throw new IllegalStateException("Server returned a null default fetch
size. Check that "
- +
ConfVars.HIVE_SERVER2_THRIFT_RESULTSET_DEFAULT_FETCH_SIZE.varname + " is
configured correctly.");
- }
+ // Populate a given configuration from HS2 server HiveConf, only if that
configuration
+ // is not already present in Connection parameter HiveConf i.e., client
side configuration
+ // takes precedence over the server side configuration.
+ Map<String, String> serverHiveConf = openResp.getConfiguration();
+
+ updateServerHiveConf(serverHiveConf, connParams);
+
+ // validate connection
+ Utils.verifySuccess(openResp.getStatus());
+ if (!supportedProtocols.contains(openResp.getServerProtocolVersion())) {
+ throw new TException("Unsupported Hive2 protocol");
+ }
+ protocol = openResp.getServerProtocolVersion();
+ sessHandle = openResp.getSessionHandle();
- this.defaultFetchSize = Integer.parseInt(serverFetchSizeString);
- if (this.defaultFetchSize <= 0) {
- throw new IllegalStateException("Default fetch size must be greater
than 0");
+ final String serverFetchSizeString =
+
openResp.getConfiguration().get(ConfVars.HIVE_SERVER2_THRIFT_RESULTSET_DEFAULT_FETCH_SIZE.varname);
+ if (serverFetchSizeString == null) {
+ throw new IllegalStateException("Server returned a null default fetch
size. Check that "
+ + ConfVars.HIVE_SERVER2_THRIFT_RESULTSET_DEFAULT_FETCH_SIZE.varname
+ " is configured correctly.");
+ }
+
+ this.defaultFetchSize = Integer.parseInt(serverFetchSizeString);
+ if (this.defaultFetchSize <= 0) {
+ throw new IllegalStateException("Default fetch size must be greater than
0");
+ }
+ }
+
+ private boolean isSamlRedirect(TException e) {
Review comment:
@vihangk1 Could you please add some comments to the method as to why we
look for 302 and 303 in the error message. This will help remember the logic
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
