diff options
| author | Tim Smith <tsmith@chef.io> | 2018-09-25 16:31:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 16:31:03 -0700 |
| commit | 1e00671b50b82dc8e874e7d76ed4e6c559db4bf5 (patch) | |
| tree | 86cf42669bbfa5650131b1dddafee525da8bc8f2 | |
| parent | 91650139b24c43f9b2641eb103c8ce1e3d70881d (diff) | |
| parent | d151b245a1653cbb779eae60fd84c7eaa64fa08c (diff) | |
| download | chef-1e00671b50b82dc8e874e7d76ed4e6c559db4bf5.tar.gz | |
Merge pull request #7684 from chef/windows_package
windows_package: Avoid exposing sensitive data during package install failures if sensitive property set
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | chef.gemspec | 2 | ||||
| -rw-r--r-- | lib/chef/provider/package/windows.rb | 1 | ||||
| -rw-r--r-- | lib/chef/provider/package/windows/exe.rb | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index ae98adf99c..56a8560d62 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -24,7 +24,7 @@ PATH mixlib-authentication (~> 1.4) mixlib-cli (~> 1.7) mixlib-log (~> 1.3) - mixlib-shellout (~> 2.0) + mixlib-shellout (~> 2.4) net-sftp (~> 2.1, >= 2.1.2) net-ssh (>= 2.9, < 5.0) net-ssh-multi (~> 1.2, >= 1.2.1) @@ -55,7 +55,7 @@ PATH mixlib-authentication (~> 1.4) mixlib-cli (~> 1.7) mixlib-log (~> 1.3) - mixlib-shellout (~> 2.0) + mixlib-shellout (~> 2.4) net-sftp (~> 2.1, >= 2.1.2) net-ssh (>= 2.9, < 5.0) net-ssh-multi (~> 1.2, >= 1.2.1) diff --git a/chef.gemspec b/chef.gemspec index 250660e5fb..aa871bdabd 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-cli", "~> 1.7" s.add_dependency "mixlib-log", "~> 1.3" s.add_dependency "mixlib-authentication", "~> 1.4" - s.add_dependency "mixlib-shellout", "~> 2.0" + s.add_dependency "mixlib-shellout", "~> 2.4" s.add_dependency "mixlib-archive", "~> 0.4" s.add_dependency "ohai", "~> 13.0" diff --git a/lib/chef/provider/package/windows.rb b/lib/chef/provider/package/windows.rb index 1d160095be..a35aa85c16 100644 --- a/lib/chef/provider/package/windows.rb +++ b/lib/chef/provider/package/windows.rb @@ -229,6 +229,7 @@ class Chef r.timeout(new_resource.timeout) r.returns(new_resource.returns) r.options(new_resource.options) + r.sensitive(new_resource.sensitive) end end diff --git a/lib/chef/provider/package/windows/exe.rb b/lib/chef/provider/package/windows/exe.rb index 0baea6bccd..dfa1bbe2a9 100644 --- a/lib/chef/provider/package/windows/exe.rb +++ b/lib/chef/provider/package/windows/exe.rb @@ -62,7 +62,7 @@ class Chef unattended_flags, expand_options(new_resource.options), "& exit %%%%ERRORLEVEL%%%%", - ].join(" "), timeout: new_resource.timeout, returns: new_resource.returns + ].join(" "), timeout: new_resource.timeout, returns: new_resource.returns, sensitive: new_resource.sensitive ) end |