Skip to content

Commit 95ec780

Browse files
committed
(PUP-11930) log openssl version
Log the openssl version and whether FIPS is enabled. The version contains spaces, so quote it. This is omitted on JRuby, because we don't require openssl, see puppet/ssl/openssl_loader.rb for details. Debug: Runtime environment: puppet_version=8.1.0 ... \ openssl_version='OpenSSL 1.1.1f 31 Mar 2020', openssl_fips=false
1 parent 3d4c34b commit 95ec780

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

lib/puppet/application.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,8 +503,12 @@ def log_runtime_environment(extra_info=nil)
503503
runtime_info = {
504504
'puppet_version' => Puppet.version,
505505
'ruby_version' => RUBY_VERSION,
506-
'run_mode' => self.class.run_mode.name,
506+
'run_mode' => self.class.run_mode.name
507507
}
508+
unless Puppet::Util::Platform.jruby_fips?
509+
runtime_info['openssl_version'] = "'#{OpenSSL::OPENSSL_VERSION}'"
510+
runtime_info['openssl_fips'] = OpenSSL::OPENSSL_FIPS
511+
end
508512
runtime_info['default_encoding'] = Encoding.default_external
509513
runtime_info.merge!(extra_info) unless extra_info.nil?
510514

0 commit comments

Comments
 (0)