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

Apt-key fixes to properly work on Debian 9 #822

Merged
merged 2 commits into from
Nov 16, 2018
Merged

Apt-key fixes to properly work on Debian 9 #822

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
c84e842
Pass in --no-tty to apt-key
ekohl Nov 14, 2018
53ea6e7
Autorequire dirmngr in apt_key types
ekohl Nov 14, 2018
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
8 changes: 4 additions & 4 deletions lib/puppet/provider/apt_key/apt_key.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
commands gpg: '/usr/bin/gpg'

def self.instances
cli_args = ['adv', '--list-keys', '--with-colons', '--fingerprint', '--fixed-list-mode']
cli_args = ['adv', '--no-tty', '--list-keys', '--with-colons', '--fingerprint', '--fixed-list-mode']

key_output = apt_key(cli_args).encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')

Expand Down Expand Up @@ -160,7 +160,7 @@ def tempfile(content)
# confirm that the fingerprint from the file, matches the long key that is in the manifest
if name.size == 40
if File.executable? command(:gpg)
extracted_key = execute(["#{command(:gpg)} --with-fingerprint --with-colons #{file.path} | awk -F: '/^fpr:/ { print $10 }'"], failonfail: false)
extracted_key = execute(["#{command(:gpg)} --no-tty --with-fingerprint --with-colons #{file.path} | awk -F: '/^fpr:/ { print $10 }'"], failonfail: false)
extracted_key = extracted_key.chomp

found_match = false
Expand Down Expand Up @@ -193,7 +193,7 @@ def update_expired_key

# Breaking up the command like this is needed because it blows up
# if --recv-keys isn't the last argument.
command.push('adv', '--keyserver', resource[:server])
command.push('adv', '--no-tty', '--keyserver', resource[:server])
unless resource[:options].nil?
command.push('--keyserver-options', resource[:options])
end
Expand All @@ -211,7 +211,7 @@ def create
if resource[:source].nil? && resource[:content].nil?
# Breaking up the command like this is needed because it blows up
# if --recv-keys isn't the last argument.
command.push('adv', '--keyserver', resource[:server])
command.push('adv', '--no-tty', '--keyserver', resource[:server])
unless resource[:options].nil?
command.push('--keyserver-options', resource[:options])
end
Expand Down
4 changes: 4 additions & 0 deletions lib/puppet/type/apt_key.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@
end
end

autorequire(:package) do
'dirmngr'
end

newparam(:server) do
desc 'The key server to fetch the key from based on the ID. It can either be a domain name or url.'
defaultto :'keyserver.ubuntu.com'
Expand Down
16 changes: 0 additions & 16 deletions manifests/key.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,6 @@
server => $server,
options => $options,
} -> anchor { "apt_key ${id} present": }

case $facts['os']['name'] {
'Debian': {
if versioncmp($facts['os']['release']['major'], '9') >= 0 {
ensure_packages(['dirmngr'])
Apt::Key<| title == $title |>
}
}
'Ubuntu': {
if versioncmp($facts['os']['release']['full'], '17.04') >= 0 {
ensure_packages(['dirmngr'])
Apt::Key<| title == $title |>
}
}
default: { }
}
}
}

Expand Down
16 changes: 2 additions & 14 deletions spec/acceptance/apt_key_provider_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
PUPPETLABS_EXP_KEY_LONG_ID = '47B320EB4C7C375AA9DAE1A01054B7A24BD6EC30'.freeze
PUPPETLABS_EXP_KEY_DATES = 'pub:e:4096:1:1054B7A24BD6EC30:2010-07-10:2017-01-05::-:Puppet Labs Release Key'.freeze
SHOULD_NEVER_EXIST_ID = 'EF8D349F'.freeze
KEY_CHECK_COMMAND = 'apt-key adv --list-keys --with-colons --fingerprint | grep '.freeze
KEY_CHECK_COMMAND = 'apt-key adv --no-tty --list-keys --with-colons --fingerprint | grep '.freeze
PUPPETLABS_KEY_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} #{PUPPETLABS_GPG_KEY_FINGERPRINT}".freeze
CENTOS_KEY_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} #{CENTOS_GPG_KEY_FINGERPRINT}".freeze
PUPPETLABS_EXP_CHECK_COMMAND = "#{KEY_CHECK_COMMAND} '#{PUPPETLABS_EXP_KEY_DATES}'".freeze
Expand All @@ -31,7 +31,7 @@ def populate_default_options_pp(value)

def install_key(key)
retry_on_error_matching do
shell("apt-key adv --keyserver pgp.mit.edu --recv-keys #{key}")
shell("apt-key adv --no-tty --keyserver pgp.mit.edu --recv-keys #{key}")
end
end

Expand Down Expand Up @@ -665,12 +665,6 @@ def apply_manifest_twice(manifest_pp)
}
MANIFEST

refresh_check_for_dirmngr_pp = <<-MANIFEST
package { 'dirmngr':
ensure => 'present',
}
MANIFEST

describe 'apt_key' do
before(:each) do
# Delete twice to make sure everything is cleaned
Expand Down Expand Up @@ -977,12 +971,6 @@ def apply_manifest_twice(manifest_pp)
let(:puppetlabs_exp_check_command) { PUPPETLABS_EXP_CHECK_COMMAND }
end
before(:each) do
if fact('lsbdistcodename') == 'stretch' || fact('lsbdistcodename') == 'bionic'
# Ensure dirmngr package is installed
apply_manifest(refresh_check_for_dirmngr_pp, acceptable_exit_codes: [0, 2])
# Export environment variable to disable apt-key warning when using grep
shell('export APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1')
end
# Delete the Puppet Labs Release Key and install an expired version of the key
apply_manifest(refresh_del_key_pp)
apply_manifest(refresh_pp, catch_failures: true)
Expand Down