Fixes #2889 by supporting CRLF and LF certificates and adding logging…

… when parsing certificates Signed-off-by: Pascal Budner <mail@pascalbudner.de>
fluent · Mar 16, 2020 · 90ccbd0 · 90ccbd0
1 parent 84c93e9
commit 90ccbd0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/fluent/plugin_helper/cert_option.rb b/lib/fluent/plugin_helper/cert_option.rb
@@ -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
+          log.warn "cert_path does not contain a valid certificate"
+        end
         list
       end
     end