chef 18.5.0 → 18.7.3

data/lib/chef/run_lock.rb

@@ -151,9 +151,6 @@ class Chef
         # will return false
         if runlock.flock(File::LOCK_NB | File::LOCK_EX) == 0
           true
-        # Target mode does not have run locks, because concurrency is intended
-        elsif Chef::Config.target_mode?
-          true
         else
           false
         end

data/lib/chef/scan_access_control.rb

@@ -46,7 +46,7 @@ class Chef
 
     # Modifies @current_resource, setting the current access control state.
     def set_all!
-      if ::TargetIO::File.exist?(new_resource.path)
+      if ::File.exist?(new_resource.path)
         set_owner
         set_group
         set_mode
@@ -76,7 +76,7 @@ class Chef
     end
 
     def lookup_uid
-      unless (pwent = TargetIO::Etc.getpwuid(stat.uid)).nil?
+      unless (pwent = Etc.getpwuid(stat.uid)).nil?
         pwent.name
       else
         stat.uid
@@ -103,7 +103,7 @@ class Chef
     end
 
     def lookup_gid
-      unless (pwent = TargetIO::Etc.getgrgid(stat.gid)).nil?
+      unless (pwent = Etc.getgrgid(stat.gid)).nil?
         pwent.name
       else
         stat.gid
@@ -128,10 +128,10 @@ class Chef
 
     def stat
       @stat ||= if @new_resource.instance_of?(Chef::Resource::Link)
-                  ::TargetIO::File.lstat(@new_resource.path)
+                  ::File.lstat(@new_resource.path)
                 else
-                  realpath = ::TargetIO::File.realpath(@new_resource.path)
-                  ::TargetIO::File.stat(realpath)
+                  realpath = ::File.realpath(@new_resource.path)
+                  ::File.stat(realpath)
                 end
     end
   end

data/lib/chef/util/backup.rb

@@ -30,7 +30,7 @@ class Chef
       end
 
       def backup!
-        if @new_resource.backup != false && @new_resource.backup > 0 && ::TargetIO::File.exist?(path)
+        if @new_resource.backup != false && @new_resource.backup > 0 && ::File.exist?(path)
           do_backup
           # Clean up after the number of backups
           slice_number = @new_resource.backup

data/lib/chef/util/diff.rb

@@ -60,7 +60,7 @@ class Chef
 
       def use_tempfile_if_missing(file)
         tempfile = nil
-        unless TargetIO::File.exist?(file)
+        unless File.exist?(file)
           Chef::Log.trace("File #{file} does not exist to diff against, using empty tempfile")
           tempfile = Tempfile.new("chef-diff")
           file = tempfile.path
@@ -131,19 +131,6 @@ class Chef
         diff_filesize_threshold = Chef::Config[:diff_filesize_threshold]
         diff_output_threshold = Chef::Config[:diff_output_threshold]
 
-        # Download files for diffs in Target Mode, then work locally
-        if ChefConfig::Config.target_mode?
-          connection = Chef.run_context&.transport_connection
-
-          old_copy = Tempfile.new(old_file)
-          connection.download(old_file, old_copy.path) if connection.file(old_file).exist?
-          old_file = old_copy.path
-
-          new_copy = Tempfile.new(new_file)
-          connection.download(new_file, new_copy.path) if connection.file(new_file).exist?
-          new_file = new_copy.path
-        end
-
         if ::File.size(old_file) > diff_filesize_threshold || ::File.size(new_file) > diff_filesize_threshold
           return "(file sizes exceed #{diff_filesize_threshold} bytes, diff output suppressed)"
         end

data/lib/chef/util/file_edit.rb

@@ -29,9 +29,9 @@ class Chef
       public
 
       def initialize(filepath)
-        raise ArgumentError, "File '#{filepath}' does not exist" unless TargetIO::File.exist?(filepath)
+        raise ArgumentError, "File '#{filepath}' does not exist" unless File.exist?(filepath)
 
-        @editor = Editor.new(TargetIO::File.open(filepath, &:readlines))
+        @editor = Editor.new(File.open(filepath, &:readlines))
         @original_pathname = filepath
         @file_edited = false
       end
@@ -85,8 +85,8 @@ class Chef
       def write_file
         if @changes
           backup_pathname = original_pathname + ".old"
-          TargetIO::FileUtils.cp(original_pathname, backup_pathname, preserve: true)
-          TargetIO::File.open(original_pathname, "w") do |newfile|
+          FileUtils.cp(original_pathname, backup_pathname, preserve: true)
+          File.open(original_pathname, "w") do |newfile|
             editor.lines.each do |line|
               newfile.puts(line)
             end

data/lib/chef/util/powershell/ps_credential.rb

@@ -31,9 +31,19 @@ class Chef
           "New-Object System.Management.Automation.PSCredential('#{@username}',('#{encrypt(@password)}' | ConvertTo-SecureString))"
         end
 
+        def to_plaintext
+          "#<Chef::Util::Powershell::PSCredential:#{object_id} @username=#{@username.inspect}>"
+        end
+
+        # These leak an encrypted password, however we can't rely on no-one using
+        # these assuming that behavior.
         alias to_s to_psobject
         alias to_text to_psobject
 
+        # Inspect has no business leaking anything but the username, and to be honest
+        # even that one could be dicey
+        alias inspect to_plaintext
+
         private
 
         def encrypt(str)

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("18.5.0")
+  VERSION = Chef::VersionString.new("18.7.3")
 end
 
 #

data/lib/chef/win32/registry.rb

@@ -26,6 +26,11 @@ if RUBY_PLATFORM.match?(/mswin|mingw|windows/)
     autoload :Registry, File.expand_path("../monkey_patches/win32/registry", __dir__)
   end
   require_relative "api/registry"
+
+  require "win32/resolv"
+  ::Win32::Registry.define_method :export_string do |str, enc = (Encoding.default_internal || "utf-8")|
+    str.encode(enc)
+  end
 end
 
 class Chef
@@ -377,7 +382,6 @@ class Chef
         hive_name = reg_path.shift
         key = reg_path.join("\\")
       end
-
     end
   end
 end

data/lib/chef/win32/security.rb

@@ -130,6 +130,15 @@ class Chef
         end
       end
 
+      def self.clear_account_rights(name)
+        return if get_account_right(name) == []
+
+        with_lsa_policy(name) do |policy_handle, sid|
+          result = LsaRemoveAccountRights(policy_handle.read_pointer, sid, true, nil, 1)
+          test_and_raise_lsa_nt_status(result)
+        end
+      end
+
       def self.adjust_token_privileges(token, privileges)
         token = token.handle if token.respond_to?(:handle)
         old_privileges_size = FFI::Buffer.new(:long).write_long(privileges.size_with_privileges)

data/lib/chef.rb

@@ -32,5 +32,3 @@ require_relative "chef/handler"
 require_relative "chef/handler/json_file"
 require_relative "chef/event_dispatch/dsl"
 require_relative "chef/chef_class"
-
-require_relative "chef/target_io"

data/spec/functional/assets/yumrepo-empty/repodata/repomd.xml

@@ -4,7 +4,7 @@
 <data type="filelists">
   <checksum type="sha256">401dc19bda88c82c403423fb835844d64345f7e95f5b9835888189c03834cc93</checksum>
   <open-checksum type="sha256">bf9808b81cb2dbc54b4b8e35adc584ddcaa73bd81f7088d73bf7dbbada961310</open-checksum>
-  <location href="repodata/401dc19bda88c82c403423fb835844d64345f7e95f5b9835888189c03834cc93-filelists.xml.gz"/>
+  <location href="repodata/401dc-filelists.xml.gz"/>
   <timestamp>1667508211</timestamp>
   <size>123</size>
   <open-size>125</open-size>
@@ -12,7 +12,7 @@
 <data type="primary">
   <checksum type="sha256">dabe2ce5481d23de1f4f52bdcfee0f9af98316c9e0de2ce8123adeefa0dd08b9</checksum>
   <open-checksum type="sha256">e1e2ffd2fb1ee76f87b70750d00ca5677a252b397ab6c2389137a0c33e7b359f</open-checksum>
-  <location href="repodata/dabe2ce5481d23de1f4f52bdcfee0f9af98316c9e0de2ce8123adeefa0dd08b9-primary.xml.gz"/>
+  <location href="repodata/dabe2-primary.xml.gz"/>
   <timestamp>1667508211</timestamp>
   <size>134</size>
   <open-size>167</open-size>
@@ -20,7 +20,7 @@
 <data type="primary_db">
   <checksum type="sha256">5dc1e6e73c84803f059bb3065e684e56adfc289a7e398946574d79dac6643945</checksum>
   <open-checksum type="sha256">f0d550414e8f2e960e82e704549364299ca9e3e8664ad4faffd208262c3b6d12</open-checksum>
-  <location href="repodata/5dc1e6e73c84803f059bb3065e684e56adfc289a7e398946574d79dac6643945-primary.sqlite.bz2"/>
+  <location href="repodata/5dc1e-primary.sqlite.bz2"/>
   <timestamp>1667508211</timestamp>
   <database_version>10</database_version>
   <size>1131</size>
@@ -29,7 +29,7 @@
 <data type="other_db">
   <checksum type="sha256">7c36572015e075add2b38b900837bcdbb8a504130ddff49b2351a7fc0affa3d4</checksum>
   <open-checksum type="sha256">4de0fe7c5dd2674849a7c63c326e42f33af0a0f46219bc6dd59f51dfa2ac8c68</open-checksum>
-  <location href="repodata/7c36572015e075add2b38b900837bcdbb8a504130ddff49b2351a7fc0affa3d4-other.sqlite.bz2"/>
+  <location href="repodata/7c365-other.sqlite.bz2"/>
   <timestamp>1667508211</timestamp>
   <database_version>10</database_version>
   <size>575</size>
@@ -38,7 +38,7 @@
 <data type="other">
   <checksum type="sha256">6bf9672d0862e8ef8b8ff05a2fd0208a922b1f5978e6589d87944c88259cb670</checksum>
   <open-checksum type="sha256">e0ed5e0054194df036cf09c1a911e15bf2a4e7f26f2a788b6f47d53e80717ccc</open-checksum>
-  <location href="repodata/6bf9672d0862e8ef8b8ff05a2fd0208a922b1f5978e6589d87944c88259cb670-other.xml.gz"/>
+  <location href="repodata/6bf96-other.xml.gz"/>
   <timestamp>1667508211</timestamp>
   <size>123</size>
   <open-size>121</open-size>
@@ -46,7 +46,7 @@
 <data type="filelists_db">
   <checksum type="sha256">01a3b489a465bcac22a43492163df43451dc6ce47d27f66de289756b91635523</checksum>
   <open-checksum type="sha256">c4211f57bdcbb142c9f93a6d32401539f775eb6a670ab7a423e13f435ce94689</open-checksum>
-  <location href="repodata/01a3b489a465bcac22a43492163df43451dc6ce47d27f66de289756b91635523-filelists.sqlite.bz2"/>
+  <location href="repodata/01a3b-filelists.sqlite.bz2"/>
   <timestamp>1667508211</timestamp>
   <database_version>10</database_version>
   <size>586</size>

data/spec/functional/resource/cookbook_file_spec.rb

@@ -57,7 +57,7 @@ describe Chef::Resource::CookbookFile do
     create_resource
   end
 
-  it_behaves_like "a file resource"
+  it_behaves_like "a file resource", :not_supported_on_windows_11
 
   # These examples cover CHEF-3467 where unexpected and incorrect
   # permissions can result on Windows because CookbookFile's