Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[fix][client] Fix load the trust store file #19483

Merged
merged 2 commits into from Feb 24, 2023

Conversation

nodece
Copy link
Member

@nodece nodece commented Feb 10, 2023

Motivation

When the trust store file is empty, we can skip loading the trust store file, because there is using the trust store file from the operating system.

Modifications

  • Add check and load the tlsTrustStorePath to the KeyStoreSSLContext

Documentation

  • doc
  • doc-required
  • doc-not-needed
  • doc-complete

@nodece
Copy link
Member Author

nodece commented Feb 14, 2023

/pulsarbot rerun-failure-checks

Copy link
Member

@michaeljmarshall michaeljmarshall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@nodece - are there any other configurations we should update to make pulsar more easily use the OS's trust stores?

@nodece
Copy link
Member Author

nodece commented Feb 18, 2023

LGTM.

@nodece - are there any other configurations we should update to make pulsar more easily use the OS's trust stores?

We don't need any configuration. The TLS provider has taken care of that for us.

@michaeljmarshall
Copy link
Member

@nodece - I think it would be helpful to update the relevant configuration files to indicate that users are able to use the OS's truststore by passing nothing. It's a pretty obvious default, but because we didn't support it before, I think it is worth documenting. What do you think?

@nodece
Copy link
Member Author

nodece commented Feb 24, 2023

@michaeljmarshall Good idea.

@codecov-commenter
Copy link

Codecov Report

Merging #19483 (83c95f1) into master (e286339) will increase coverage by 1.76%.
The diff coverage is 14.19%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master   #19483      +/-   ##
============================================
+ Coverage     60.44%   62.21%   +1.76%     
- Complexity     3494    25833   +22339     
============================================
  Files          1832     1844      +12     
  Lines        135153   135517     +364     
  Branches      14871    14917      +46     
============================================
+ Hits          81693    84311    +2618     
+ Misses        45869    43438    -2431     
- Partials       7591     7768     +177     
Flag Coverage Δ
inttests 24.60% <5.74%> (-0.07%) ⬇️
systests 25.27% <6.64%> (?)
unittests 59.49% <13.59%> (+0.43%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...lance/extensions/ExtensibleLoadManagerWrapper.java 0.00% <0.00%> (ø)
...xtensions/channel/ServiceUnitStateChannelImpl.java 0.55% <0.00%> (-0.11%) ⬇️
...ns/channel/ServiceUnitStateCompactionStrategy.java 11.42% <0.00%> (-1.91%) ⬇️
...lance/extensions/channel/ServiceUnitStateData.java 0.00% <0.00%> (ø)
...java/org/apache/pulsar/admin/cli/CmdFunctions.java 46.95% <0.00%> (-0.25%) ⬇️
...ar/functions/source/MultiConsumerPulsarSource.java 89.47% <0.00%> (-4.98%) ⬇️
...r/functions/source/SingleConsumerPulsarSource.java 93.33% <0.00%> (-6.67%) ⬇️
...he/pulsar/functions/utils/FunctionConfigUtils.java 63.10% <33.33%> (+10.14%) ⬆️
...va/org/apache/pulsar/broker/service/ServerCnx.java 54.97% <50.00%> (+0.72%) ⬆️
.../pulsar/compaction/StrategicTwoPhaseCompactor.java 74.56% <52.17%> (-1.74%) ⬇️
... and 297 more

@nodece nodece merged commit 6d3e483 into apache:master Feb 24, 2023
nodece added a commit to nodece/pulsar that referenced this pull request Feb 24, 2023
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 6d3e483)
nodece added a commit to nodece/pulsar that referenced this pull request Feb 24, 2023
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 6d3e483)
nodece added a commit to nodece/pulsar that referenced this pull request Feb 24, 2023
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 6d3e483)
nodece added a commit to nodece/pulsar that referenced this pull request Feb 24, 2023
Signed-off-by: Zixuan Liu <nodeces@gmail.com>
(cherry picked from commit 6d3e483)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants