Accept private key for TLS server without passphrase #1575
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
repeatedly
reviewed
May 19, 2017
| @@ -46,12 +46,10 @@ def cert_option_server_validate!(conf) | |||
| case | |||
| when conf.cert_path | |||
| raise Fluent::ConfigError, "private_key_path is required when cert_path is specified" unless conf.private_key_path | |||
| raise Fluent::ConfigError, "private_key_passphrase is required when cert_path is specified" unless conf.private_key_passphrase | |||
There was a problem hiding this comment.
How about logging warn message like "For security reason, setting private_key_passphrase is recommended"?
| cert_option_load(conf.cert_path, conf.private_key_path, conf.private_key_passphrase) | ||
|
|
||
| when conf.ca_cert_path | ||
| raise Fluent::ConfigError, "ca_private_key_path is required when ca_cert_path is specified" unless conf.ca_private_key_path | ||
| raise Fluent::ConfigError, "ca_private_key_passphrase is required when ca_cert_path is specified" unless conf.ca_private_key_passphrase |
test/plugin_helper/test_server.rb
Outdated
| @@ -982,7 +985,7 @@ def open_tls_session(addr, port, verify: true, cert_path: nil, selfsigned: true, | |||
| assert_equal "yay\nfoo\n", received | |||
| end | |||
|
|
|||
| test 'load chained server cert by private CA cert file, verified from clients using CA cert file as root' do | |||
| test 'load chained server cert by private CA cert file, verified from clients using CA cert file as root' do |ca_key_passphrase, private_key_passphrase| | |||
test/plugin_helper/test_server.rb
Outdated
| @@ -1137,20 +1142,18 @@ def open_tls_session(addr, port, verify: true, cert_path: nil, selfsigned: true, | |||
| assert_equal "yay\nfoo\n", received | |||
| end | |||
|
|
|||
| test 'load chained server cert by private CA cert file, verified from clients using CA cert file as root' do | |||
| test 'load chained server cert by private CA cert file, verified from clients using CA cert file as root' do |ca_key_passphrase, private_key_passphrase| | |||
mururu
force-pushed
the
private-key-without-passphrase
branch
from
83d5f16
to
d094045
Compare
|
Updated. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It is convenient for users to leave the way to manage private keys to them like other many middlewares.