Skip to content

Use validate_cmd to validate a CA before writing #86

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
ekohl wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use validate_cmd to validate a CA before writing #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6863a7d
Remove almost duplicate branches for file definition
ekohl Sep 29, 2025
799e2be
Use validate_cmd to validate certificate
ekohl Sep 29, 2025
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
41 changes: 11 additions & 30 deletions manifests/ca.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

if $source and $content {
fail('You must not specify both $source and $content for trusted_ca defined resources')
} elsif !$source and !$content {
fail('You must specify either $source or $content for trusted_ca defined resources')
}

if $name =~ Pattern["\\.${certfile_suffix}$"] {
Expand All @@ -48,35 +50,14 @@
$_name = "${name}.${certfile_suffix}"
}

if $source {
file { "${install_path}/${_name}":
ensure => 'file',
source => $source,
notify => Exec["validate ${install_path}/${_name}"],
mode => '0644',
owner => 'root',
group => 'root',
}
} elsif $content {
file { "${install_path}/${_name}":
ensure => 'file',
content => $content,
notify => Exec["validate ${install_path}/${_name}"],
mode => '0644',
owner => 'root',
group => 'root',
}
} else {
fail('You must specify either $source or $content for trusted_ca defined resources')
}

# This makes sure the certificate is valid
exec { "validate ${install_path}/${_name}":
command => "openssl x509 -in ${install_path}/${_name} -noout",
logoutput => on_failure,
path => $trusted_ca::path,
notify => Exec['update_system_certs'],
returns => 0,
refreshonly => true,
file { "${install_path}/${_name}":
ensure => 'file',
content => $content,
source => $source,
notify => Exec['update_system_certs'],
mode => '0644',
owner => 'root',
group => 'root',
validate_cmd => 'openssl x509 -in % -noout',
}
}
13 changes: 13 additions & 0 deletions spec/acceptance/certs_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,21 @@
end

describe command("cd /root && /usr/bin/java SSLPoke #{fact('fqdn')} 443") do
its(:exit_status) { is_expected.to eq 0 }

Check failure on line 56 in spec/acceptance/certs_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / OpenVox 8 - Debian 11 

trusted_ca success after cert Command "cd /root && /usr/bin/java SSLPoke debian11-64-openvox8.example.com 443" exit_status is expected to eq 0

Failure/Error: its(:exit_status) { is_expected.to eq 0 }
  
  expected: 0
       got: 1
  
  (compared using ==)
end
# rubocop:enable RSpec/RepeatedExampleGroupBody
end

context 'invalid certificate' do
it 'refuses to apply' do
pp = <<-EOS
include trusted_ca
trusted_ca::ca { 'test':
content => 'invalid',
}
EOS

apply_manifest(pp, expect_failures: true)
end
end
end
7 changes: 1 addition & 6 deletions spec/defines/trusted_ca_ca_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,34 +34,29 @@
case facts[:os]['family']
when 'RedHat'
file = '/etc/pki/ca-trust/source/anchors/mycert.crt'
notify = 'Exec[validate /etc/pki/ca-trust/source/anchors/mycert.crt]'
source = 'puppet:///data/mycert.crt'
when 'Debian'
file = '/usr/local/share/ca-certificates/mycert.crt'
notify = 'Exec[validate /usr/local/share/ca-certificates/mycert.crt]'
source = 'puppet:///data/mycert.crt'
when 'Suse'
if facts[:operatingsystem] == 'SLES'
if facts[:operatingsystemmajrelease] == '11'
file = '/etc/ssl/certs/mycert.pem'
notify = 'Exec[validate /etc/ssl/certs/mycert.pem]'
source = 'puppet:///data/mycert.pem'
else
file = '/etc/pki/trust/anchors/mycert.crt'
notify = 'Exec[validate /etc/pki/trust/anchors/mycert.crt]'
source = 'puppet:///data/mycert.crt'
end
else
file = '/etc/pki/trust/anchors/mycert.crt'
notify = 'Exec[validate /etc/pki/trust/anchors/mycert.crt]'
source = 'puppet:///data/mycert.crt'
end
end

let(:params) { { source: source } }

it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_file(file).that_notifies(notify) }
it { is_expected.to contain_file(file).that_notifies('Exec[update_system_certs]') }
end
end
end
Expand Down
Loading