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.

Sign up for GitHub

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

Jump to bottom

Fixes #2889 by supporting CRLF and LF X.509 certificates #2890

Merged
merged 2 commits into from
Mar 17, 2020
Merged

Fixes #2889 by supporting CRLF and LF X.509 certificates #2890

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90ccbd0
Fixes #2889 by supporting CRLF and LF certificates and adding logging…
pbudner Mar 16, 2020
dac4931
Added test for CRLF certificates
pbudner Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/fluent/plugin_helper/cert_option.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,12 @@ def cert_option_generate_server_pair_self_signed(generate_opts)

def cert_option_certificates_from_file(path)
data = File.read(path)
pattern = Regexp.compile('-+BEGIN CERTIFICATE-+\n(?:[^-]*\n)+-+END CERTIFICATE-+\n?', Regexp::MULTILINE)
pattern = Regexp.compile('-+BEGIN CERTIFICATE-+\r?\n(?:[^-]*\r?\n)+-+END CERTIFICATE-+\r?\n?', Regexp::MULTILINE)
list = []
data.scan(pattern){|match| list << OpenSSL::X509::Certificate.new(match) }
if list.length() == 0
ganmacs marked this conversation as resolved.
Show resolved Hide resolved
log.warn "cert_path does not contain a valid certificate"
end
list
end
end
Expand Down