-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Add TLS module #2802
Merged
+202
−31
Merged
Add TLS module #2802
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
aecf76d
Add Fluent::TLS module to unify TLS definitions
repeatedly 719e998
server: Add min_version/max_version to TLS transport
repeatedly 3d5bdba
Use Fluent::TLS instead of own constants
repeatedly 82f164a
Fix code for ruby 2.4
repeatedly f0d9688
Add test for TLS module
repeatedly a8cd768
tls: Different error will be raised on travis-ci
repeatedly 17a702e
tls: Add TLS v1.3 support for ruby 2.5 or later
repeatedly 0d5aecd
tls: Add commment for min_version/max_version test
repeatedly File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
# | ||
# Fluentd | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
require 'openssl' | ||
require 'fluent/config/error' | ||
|
||
module Fluent | ||
module TLS | ||
DEFAULT_VERSION = :'TLSv1_2' | ||
SUPPORTED_VERSIONS = [:'TLSv1_1', :'TLSv1_2', :'TLS1_1', :'TLS1_2'] | ||
### follow httpclient configuration by nahi | ||
# OpenSSL 0.9.8 default: "ALL:!ADH:!LOW:!EXP:!MD5:+SSLv2:@STRENGTH" | ||
CIPHERS_DEFAULT = "ALL:!aNULL:!eNULL:!SSLv2" # OpenSSL >1.0.0 default | ||
|
||
METHODS_MAP = { | ||
TLSv1: OpenSSL::SSL::TLS1_VERSION, | ||
TLSv1_1: OpenSSL::SSL::TLS1_1_VERSION, | ||
TLSv1_2: OpenSSL::SSL::TLS1_2_VERSION, | ||
}.freeze | ||
METHODS_MAP_FOR_VERSION = { | ||
TLS1: :'TLSv1', | ||
TLS1_1: :'TLSv1_1', | ||
TLS1_2: :'TLSv1_2', | ||
}.freeze | ||
|
||
# Helper for old syntax/method support: | ||
# ruby 2.4 uses ssl_version= but this method is now deprecated. | ||
# min_version=/max_version= use 'TLS1_2' but ssl_version= uses 'TLSv1_2' | ||
def set_version_to_context(ctx, version, min_version, max_version) | ||
if ctx.respond_to?(:'min_version=') | ||
case | ||
when min_version.nil? && max_version.nil? | ||
min_version = METHODS_MAP[version] | ||
max_version = METHODS_MAP[version] | ||
when min_version.nil? && max_version | ||
raise Fluentd::ConfigError, "When you set max_version, must set min_version together" | ||
when min_version && max_version.nil? | ||
raise Fluentd::ConfigError, "When you set min_version, must set max_version together" | ||
else | ||
min_version = METHODS_MAP[min_version] || min_version | ||
ganmacs marked this conversation as resolved.
Show resolved
Hide resolved
|
||
max_version = METHODS_MAP[max_version] || max_version | ||
end | ||
ctx.min_version = min_version | ||
ctx.max_version = max_version | ||
else | ||
ctx.ssl_version = METHODS_MAP_FOR_VERSION[version] || version | ||
end | ||
|
||
ctx | ||
end | ||
|
||
module_function :set_version_to_context | ||
end | ||
end | ||
|
||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. [nits] unnecessary line. |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ruby 2.4 doesn't have these constants. Fix soon.