[KYUUBI #5713] Backport HIVE-27271: Client connection to HS2 fails when transportMode=http, ssl=true, sslTrustStore specified without trustStorePassword in the JDBC URL #5712

dev-lpq · 2023-11-16T06:38:56Z

🔍 Description

Issue References 🔗

This pull request fixes ##5713

Describe Your Solution 🔧

trustStorePassword is not a necessary parameter in connection URL. Connection can be established without it.

From the javadocs Link A password may be given to unlock the keystore (e.g. the keystore resides on a hardware token device), or to check the integrity of the keystore data. If a password is not given for integrity checking, then integrity checking is not performed.
In order to create an empty keystore, or if the keystore cannot be initialized from a stream, pass null as the stream argument.

Reference PR comes from HIVE-27271

Types of changes 🔖

Bugfix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Test Plan 🧪

Behavior Without This Pull Request ⚰️

Behavior With This Pull Request 🎉

Related Unit Tests

Checklists

📝 Author Self Checklist

My code follows the style guidelines of this project
I have performed a self-review
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
My changes generate no new warnings
I have added tests that prove my fix is effective or that my feature works
New and existing unit tests pass locally with my changes
This patch was not authored or co-authored using Generative Tooling

📝 Committer Pre-Merge Checklist

Be nice. Be informative.

…tore specified without trustStorePassword in the JDBC URL

codecov-commenter · 2023-11-16T07:56:44Z

Codecov Report

Attention: 4 lines in your changes are missing coverage. Please review.

Comparison is base (23f32cf) 61.43% compared to head (c1011e4) 61.41%.

Files	Patch %	Lines
.../org/apache/kyuubi/jdbc/hive/KyuubiConnection.java	0.00%	4 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##             master    #5712      +/-   ##
============================================
- Coverage     61.43%   61.41%   -0.03%     
  Complexity       23       23              
============================================
  Files           607      607              
  Lines         35735    35737       +2     
  Branches       4896     4898       +2     
============================================
- Hits          21955    21948       -7     
+ Misses        11402    11400       -2     
- Partials       2378     2389      +11

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

turboFei · 2023-11-16T11:51:13Z

This pr backport apache/hive@36bd69e

turboFei · 2023-11-16T11:52:06Z

kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/hive/KyuubiConnection.java

          try (FileInputStream fis = new FileInputStream(sslTrustStorePath)) {
-            sslTrustStore.load(fis, sslTrustStorePassword.toCharArray());
+            sslTrustStore.load(
+                fis, sslTrustStorePassword != null ? sslTrustStorePassword.toCharArray() : null);


new line is not needed

Run mvn spotless:apply, automatically applies rule to a new line.

turboFei · 2023-11-16T11:52:16Z

kyuubi-hive-jdbc/src/main/java/org/apache/kyuubi/jdbc/hive/KyuubiConnection.java

      try (FileInputStream fis = new FileInputStream(trustStorePath)) {
-        sslTrustStore.load(fis, trustStorePassword.toCharArray());
+        sslTrustStore.load(
+            fis, trustStorePassword != null ? trustStorePassword.toCharArray() : null);


new line is not needed

Run mvn spotless:apply, automatically applies rule to a new line.

I see, thanks for the explantation

turboFei

new line is not needed

Refer: apache/hive#4262

…en transportMode=http, ssl=true, sslTrustStore specified without trustStorePassword in the JDBC URL # 🔍 Description Backport apache/hive#4262 ## Issue References 🔗 This pull request fixes ##5713 ## Describe Your Solution 🔧 trustStorePassword is not a necessary parameter in connection URL. Connection can be established without it. From the javadocs [Link](https://docs.oracle.com/javase/7/docs/api/java/security/KeyStore.html#load(java.io.InputStream,%20char%5B%5D)) A password may be given to unlock the keystore (e.g. the keystore resides on a hardware token device), or to check the integrity of the keystore data. If a password is not given for integrity checking, then integrity checking is not performed. In order to create an empty keystore, or if the keystore cannot be initialized from a stream, pass null as the stream argument. Reference PR comes from HIVE-27271 ## Types of changes 🔖 - [x] Bugfix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) ## Test Plan 🧪 #### Behavior Without This Pull Request ⚰️ #### Behavior With This Pull Request 🎉 #### Related Unit Tests --- # Checklists ## 📝 Author Self Checklist - [ ] My code follows the [style guidelines](https://kyuubi.readthedocs.io/en/master/contributing/code/style.html) of this project - [ ] I have performed a self-review - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html) ## 📝 Committer Pre-Merge Checklist - [x] Pull request title is okay. - [x] No license issues. - [x] Milestone correctly set? - [ ] Test coverage is ok - [x] Assignees are selected. - [x] Minimum number of approvals - [x] No changes are requested **Be nice. Be informative.** Closes #5712 from dev-lpq/ssl_http_store. Closes #5713 c1011e4 [pengqli] Support client connection when transportMode=http,ssl=true, sslTrustStore specified without trustStorePassword in the JDBC URL Authored-by: pengqli <pengqli@cisco.com> Signed-off-by: Cheng Pan <chengpan@apache.org> (cherry picked from commit 0bcd107) Signed-off-by: Cheng Pan <chengpan@apache.org>

pan3793 · 2023-11-17T11:33:03Z

Thanks, merged to master/1.8.1/1.7.4

Support client connection when transportMode=http,ssl=true, sslTrustS…

c1011e4

…tore specified without trustStorePassword in the JDBC URL

github-actions bot added module:hive module:ctl labels Nov 16, 2023

turboFei reviewed Nov 16, 2023

View reviewed changes

turboFei requested changes Nov 16, 2023

View reviewed changes

turboFei approved these changes Nov 17, 2023

View reviewed changes

turboFei assigned dev-lpq Nov 17, 2023

turboFei modified the milestones: v1.8.1, v1.7.4 Nov 17, 2023

pan3793 approved these changes Nov 17, 2023

View reviewed changes

cxzl25 approved these changes Nov 17, 2023

View reviewed changes

pan3793 closed this in 0bcd107 Nov 17, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[KYUUBI #5713] Backport HIVE-27271: Client connection to HS2 fails when transportMode=http, ssl=true, sslTrustStore specified without trustStorePassword in the JDBC URL #5712

[KYUUBI #5713] Backport HIVE-27271: Client connection to HS2 fails when transportMode=http, ssl=true, sslTrustStore specified without trustStorePassword in the JDBC URL #5712

Uh oh!

dev-lpq commented Nov 16, 2023 •

edited by pan3793

Loading

Uh oh!

codecov-commenter commented Nov 16, 2023

Uh oh!

turboFei commented Nov 16, 2023

Uh oh!

turboFei Nov 16, 2023

Uh oh!

dev-lpq Nov 16, 2023

Uh oh!

turboFei Nov 16, 2023

Uh oh!

dev-lpq Nov 16, 2023

Uh oh!

turboFei Nov 17, 2023

Uh oh!

turboFei left a comment •

edited

Loading

Uh oh!

pan3793 commented Nov 17, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

[KYUUBI #5713] Backport HIVE-27271: Client connection to HS2 fails when transportMode=http, ssl=true, sslTrustStore specified without trustStorePassword in the JDBC URL #5712

[KYUUBI #5713] Backport HIVE-27271: Client connection to HS2 fails when transportMode=http, ssl=true, sslTrustStore specified without trustStorePassword in the JDBC URL #5712

Uh oh!

Conversation

dev-lpq commented Nov 16, 2023 • edited by pan3793 Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🔍 Description

Issue References 🔗

Describe Your Solution 🔧

Types of changes 🔖

Test Plan 🧪

Behavior Without This Pull Request ⚰️

Behavior With This Pull Request 🎉

Related Unit Tests

Checklists

📝 Author Self Checklist

📝 Committer Pre-Merge Checklist

Uh oh!

codecov-commenter commented Nov 16, 2023

Codecov Report

Uh oh!

turboFei commented Nov 16, 2023

Uh oh!

turboFei Nov 16, 2023

Choose a reason for hiding this comment

Uh oh!

dev-lpq Nov 16, 2023

Choose a reason for hiding this comment

Uh oh!

turboFei Nov 16, 2023

Choose a reason for hiding this comment

Uh oh!

dev-lpq Nov 16, 2023

Choose a reason for hiding this comment

Uh oh!

turboFei Nov 17, 2023

Choose a reason for hiding this comment

Uh oh!

turboFei left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pan3793 commented Nov 17, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

dev-lpq commented Nov 16, 2023 •

edited by pan3793

Loading

turboFei left a comment •

edited

Loading