summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvijaymmali1990 <vijay.mali@msystechnologies.com>2019-01-24 17:52:43 +0530
committervijaymmali1990 <vijay.mali@msystechnologies.com>2019-01-24 17:56:35 +0530
commitd596064039ab1992295f667b9c3a96802e84e881 (patch)
tree741be079b76c44d43376134f5fc10dcdff11f09a
parent524a649b9bb7565c0a65aedb2aad8c63ec20ac2c (diff)
downloadchef-d596064039ab1992295f667b9c3a96802e84e881.tar.gz
Fix for apt_repository creating temporary files as root in running user home directory
Signed-off-by: vijaymmali1990 <vijay.mali@msystechnologies.com>
-rw-r--r--lib/chef/provider/apt_repository.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/chef/provider/apt_repository.rb b/lib/chef/provider/apt_repository.rb
index 38d52e6bd5..215f113521 100644
--- a/lib/chef/provider/apt_repository.rb
+++ b/lib/chef/provider/apt_repository.rb
@@ -21,6 +21,7 @@ require "chef/dsl/declare_resource"
require "chef/mixin/shell_out"
require "chef/http/simple"
require "chef/provider/noop"
+require "tmpdir"
class Chef
class Provider
@@ -200,13 +201,15 @@ class Chef
def install_key_from_uri(key)
key_name = key.gsub(/[^0-9A-Za-z\-]/, "_")
cached_keyfile = ::File.join(Chef::Config[:file_cache_path], key_name)
+ tmp_dir = Dir.mktmpdir(".gpg")
+ at_exit { FileUtils.remove_entry(tmp_dir) }
declare_resource(key_type(key), cached_keyfile) do
source key
mode "0644"
sensitive new_resource.sensitive
action :create
- verify "gpg --homedir /tmp/ %{path}"
+ verify "gpg --homedir #{tmp_dir} %{path}"
end
declare_resource(:execute, "apt-key add #{cached_keyfile}") do