Skip to content

Update java_certificate to function on windows #723

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update java_certificate to function on windows #723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ This file is used to list changes made in each version of the Java cookbook.

## Unreleased

- Update `install` and `remove` actions of `java_certificate` to function on Windows

## 12.1.1 - *2024-12-05*

## 12.1.0 - *2024-12-03*
Expand Down
17 changes: 11 additions & 6 deletions resources/certificate.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@

cmd = Mixlib::ShellOut.new("#{new_resource.java_home}/bin/keytool -list #{keystore_argument} -storepass #{new_resource.keystore_passwd} -rfc -alias \"#{new_resource.cert_alias}\"")
cmd.run_command
keystore_cert = cmd.stdout.match(/^[-]+BEGIN.*END(\s|\w)+[-]+$/m).to_s
normalized_stdout = cmd.stdout
normalized_stdout = normalized_stdout.gsub(/\r\n/, "\n") if platform?('windows')
keystore_cert = normalized_stdout.match(/^[-]+BEGIN.*END(\s|\w)+[-]+$/m).to_s

keystore_cert_digest = keystore_cert.empty? ? nil : OpenSSL::Digest::SHA512.hexdigest(OpenSSL::X509::Certificate.new(keystore_cert).to_der)
certfile_digest = OpenSSL::Digest::SHA512.hexdigest(OpenSSL::X509::Certificate.new(certdata).to_der)
Expand Down Expand Up @@ -109,13 +111,16 @@
action :remove do
keystore_argument = keystore_argument(new_resource.java_version, new_resource.cacerts, new_resource.keystore_path)

cmd = Mixlib::ShellOut.new("#{new_resource.java_home}/bin/keytool -list #{keystore_argument} -storepass #{new_resource.keystore_passwd} -v | grep \"#{new_resource.cert_alias}\"")
cmd = Mixlib::ShellOut.new("#{new_resource.java_home}/bin/keytool -list #{keystore_argument} -storepass #{new_resource.keystore_passwd} -v -alias \"#{new_resource.cert_alias}\"")
cmd.run_command
has_key = !cmd.stdout[/Alias name: #{new_resource.cert_alias}/].nil?
does_not_exist = cmd.stdout[/Alias <#{new_resource.cert_alias}> does not exist/].nil?
Chef::Application.fatal!("Error querying keystore for existing certificate: #{cmd.exitstatus}", cmd.exitstatus) unless (cmd.exitstatus == 0) || does_not_exist
alias_exists = !cmd.stdout[/Alias name: #{new_resource.cert_alias}/].nil?
alias_missing = !cmd.stdout[/Alias <#{new_resource.cert_alias}> does not exist/].nil?
# Only raise if command failed AND alias wasn't just missing
if cmd.exitstatus != 0 && !alias_missing
Chef::Application.fatal!("Error querying keystore for existing certificate: #{cmd.exitstatus}", cmd.exitstatus)
end

if has_key
if alias_exists
converge_by("remove certificate #{new_resource.cert_alias} from #{new_resource.keystore_path}") do
cmd = Mixlib::ShellOut.new("#{new_resource.java_home}/bin/keytool -delete -alias \"#{new_resource.cert_alias}\" #{keystore_argument} -storepass #{new_resource.keystore_passwd}")
cmd.run_command
Expand Down
Loading