diff options
| author | Tim Smith <tsmith@chef.io> | 2018-11-20 16:04:34 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-20 16:04:34 -0800 |
| commit | ff5842829821626b736acfaef2199e6cbb5d3083 (patch) | |
| tree | 9f04c86902643d86056c3ff211fec5be4a68094b | |
| parent | 87f5518d8de895a4e1954f76c97117f5c6515c31 (diff) | |
| parent | 2885992c6355408581f3de43318e9951c43e4b44 (diff) | |
| download | chef-ff5842829821626b736acfaef2199e6cbb5d3083.tar.gz | |
Merge pull request #7971 from chef/apt
Chef 14: apt_repository: prevent gpg key import on newer Debian releases
| -rw-r--r-- | lib/chef/provider/apt_repository.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider/apt_repository_spec.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/apt_repository.rb b/lib/chef/provider/apt_repository.rb index 2062ac5a42..45cc40508c 100644 --- a/lib/chef/provider/apt_repository.rb +++ b/lib/chef/provider/apt_repository.rb @@ -225,7 +225,7 @@ class Chef # # @return [String] the full apt-key command to run def keyserver_install_cmd(key, keyserver) - cmd = "apt-key adv --recv" + cmd = "apt-key adv --no-tty --recv" cmd << " --keyserver-options http-proxy=#{new_resource.key_proxy}" if new_resource.key_proxy cmd << " --keyserver " cmd << if keyserver.start_with?("hkp://") diff --git a/spec/unit/provider/apt_repository_spec.rb b/spec/unit/provider/apt_repository_spec.rb index 1601e9f629..11d505dad8 100644 --- a/spec/unit/provider/apt_repository_spec.rb +++ b/spec/unit/provider/apt_repository_spec.rb @@ -162,16 +162,16 @@ C5986B4F1257FFA86632CBA746181433FBB75451 describe "#keyserver_install_cmd" do it "returns keyserver install command" do - expect(provider.keyserver_install_cmd("ABC", "gpg.mit.edu")).to eq("apt-key adv --recv --keyserver hkp://gpg.mit.edu:80 ABC") + expect(provider.keyserver_install_cmd("ABC", "gpg.mit.edu")).to eq("apt-key adv --no-tty --recv --keyserver hkp://gpg.mit.edu:80 ABC") end it "uses proxy if key_proxy property is set" do new_resource.key_proxy("proxy.mycorp.dmz:3128") - expect(provider.keyserver_install_cmd("ABC", "gpg.mit.edu")).to eq("apt-key adv --recv --keyserver-options http-proxy=proxy.mycorp.dmz:3128 --keyserver hkp://gpg.mit.edu:80 ABC") + expect(provider.keyserver_install_cmd("ABC", "gpg.mit.edu")).to eq("apt-key adv --no-tty --recv --keyserver-options http-proxy=proxy.mycorp.dmz:3128 --keyserver hkp://gpg.mit.edu:80 ABC") end it "properly handles keyservers passed with hkp:// URIs" do - expect(provider.keyserver_install_cmd("ABC", "hkp://gpg.mit.edu")).to eq("apt-key adv --recv --keyserver hkp://gpg.mit.edu ABC") + expect(provider.keyserver_install_cmd("ABC", "hkp://gpg.mit.edu")).to eq("apt-key adv --no-tty --recv --keyserver hkp://gpg.mit.edu ABC") end end |