chef 15.17.4 → 16.0.257

data/lib/chef/resources.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require_relative "resource/alternatives"
 require_relative "resource/apt_package"
 require_relative "resource/apt_preference"
 require_relative "resource/apt_repository"
@@ -26,9 +27,13 @@ require_relative "resource/batch"
 require_relative "resource/breakpoint"
 require_relative "resource/build_essential"
 require_relative "resource/cookbook_file"
+require_relative "resource/chef_client_cron"
+require_relative "resource/chef_client_scheduled_task"
+require_relative "resource/chef_client_systemd_timer"
 require_relative "resource/chef_gem"
 require_relative "resource/chef_handler"
 require_relative "resource/chef_sleep"
+require_relative "resource/chef_vault_secret"
 require_relative "resource/chocolatey_config"
 require_relative "resource/chocolatey_feature"
 require_relative "resource/chocolatey_package"
@@ -48,7 +53,7 @@ require_relative "resource/file"
 require_relative "resource/freebsd_package"
 require_relative "resource/ips_package"
 require_relative "resource/gem_package"
-require_relative "resource/git"
+require_relative "resource/scm/git"
 require_relative "resource/group"
 require_relative "resource/http_request"
 require_relative "resource/hostname"
@@ -82,6 +87,7 @@ require_relative "resource/package"
 require_relative "resource/pacman_package"
 require_relative "resource/paludis_package"
 require_relative "resource/perl"
+require_relative "resource/plist"
 require_relative "resource/portage_package"
 require_relative "resource/powershell_package_source"
 require_relative "resource/powershell_script"
@@ -102,7 +108,6 @@ require_relative "resource/solaris_package"
 require_relative "resource/route"
 require_relative "resource/ruby"
 require_relative "resource/ruby_block"
-require_relative "resource/scm"
 require_relative "resource/script"
 require_relative "resource/service"
 require_relative "resource/sudo"
@@ -111,7 +116,7 @@ require_relative "resource/swap_file"
 require_relative "resource/systemd_unit"
 require_relative "resource/ssh_known_hosts_entry"
 require_relative "resource/windows_service"
-require_relative "resource/subversion"
+require_relative "resource/scm/subversion"
 require_relative "resource/smartos_package"
 require_relative "resource/template"
 require_relative "resource/user"
@@ -122,6 +127,7 @@ require_relative "resource/user/mac_user"
 require_relative "resource/user/pw_user"
 require_relative "resource/user/solaris_user"
 require_relative "resource/user/windows_user"
+require_relative "resource/user_ulimit"
 require_relative "resource/whyrun_safe_ruby_block"
 require_relative "resource/windows_env"
 require_relative "resource/windows_package"
@@ -157,3 +163,5 @@ require_relative "resource/windows_task"
 require_relative "resource/windows_uac"
 require_relative "resource/windows_workgroup"
 require_relative "resource/timezone"
+require_relative "resource/windows_user_privilege"
+require_relative "resource/windows_security_policy"

data/lib/chef/role.rb

@@ -257,11 +257,11 @@ class Chef
 
         js_path, rb_path = js_files.first, rb_files.first
 
-        if js_path && File.exist?(js_path)
+        if js_path && File.exists?(js_path)
           # from_json returns object.class => json_class in the JSON.
           hsh = Chef::JSONCompat.parse(IO.read(js_path))
           return from_hash(hsh)
-        elsif rb_path && File.exist?(rb_path)
+        elsif rb_path && File.exists?(rb_path)
           role = Chef::Role.new
           role.name(name)
           role.from_file(rb_path)

data/lib/chef/run_context/cookbook_compiler.rb

@@ -100,7 +100,15 @@ class Chef
       def compile_libraries
         @events.library_load_start(count_files_by_segment(:libraries))
         cookbook_order.each do |cookbook|
-          load_libraries_from_cookbook(cookbook)
+          eager_load_libraries = cookbook_collection[cookbook].metadata.eager_load_libraries
+          if eager_load_libraries == true # actully true, not truthy
+            load_libraries_from_cookbook(cookbook)
+          else
+            $LOAD_PATH.unshift File.expand_path("libraries", cookbook_collection[cookbook].root_dir)
+            if eager_load_libraries # we have a String or Array<String> and not false
+              load_libraries_from_cookbook(cookbook, eager_load_libraries)
+            end
+          end
         end
         @events.library_load_complete
       end
@@ -221,10 +229,8 @@ class Chef
         raise
       end
 
-      def load_libraries_from_cookbook(cookbook_name)
-        files_in_cookbook_by_segment(cookbook_name, :libraries).each do |filename|
-          next unless File.extname(filename) == ".rb"
-
+      def load_libraries_from_cookbook(cookbook_name, globs = "**/*.rb")
+        each_file_in_cookbook_by_segment(cookbook_name, :libraries, globs) do |filename|
           begin
             logger.trace("Loading cookbook #{cookbook_name}'s library file: #{filename}")
             Kernel.require(filename)
@@ -239,11 +245,13 @@ class Chef
       def load_lwrps_from_cookbook(cookbook_name)
         files_in_cookbook_by_segment(cookbook_name, :providers).each do |filename|
           next unless File.extname(filename) == ".rb"
+          next if File.basename(filename).match?(/^_/)
 
           load_lwrp_provider(cookbook_name, filename)
         end
         files_in_cookbook_by_segment(cookbook_name, :resources).each do |filename|
           next unless File.extname(filename) == ".rb"
+          next if File.basename(filename).match?(/^_/)
 
           load_lwrp_resource(cookbook_name, filename)
         end
@@ -327,6 +335,22 @@ class Chef
         cookbook_collection[cookbook].files_for(segment).map { |record| record[:full_path] }.sort
       end
 
+      # Iterates through all files in given cookbook segment, yielding the full path to the file
+      # if it matches one of the given globs.  Returns matching files in lexical sort order.  Supports
+      # extended globbing.  The segment should not be included in the glob.
+      #
+      def each_file_in_cookbook_by_segment(cookbook, segment, globs)
+        cookbook_collection[cookbook].files_for(segment).sort_by { |record| record[:path] }.each do |record|
+          Array(globs).each do |glob|
+            target = record[:path].delete_prefix("#{segment}/")
+            if File.fnmatch(glob, target, File::FNM_PATHNAME | File::FNM_EXTGLOB | File::FNM_DOTMATCH)
+              yield record[:full_path]
+              break
+            end
+          end
+        end
+      end
+
       # Yields the name, as a symbol, of each cookbook depended on by
       # +cookbook_name+ in lexical sort order.
       def each_cookbook_dep(cookbook_name, &block)

data/lib/chef/shell.rb

@@ -19,7 +19,6 @@ require "singleton" unless defined?(Singleton)
 require "pp" unless defined?(PP)
 require "etc" unless defined?(Etc)
 require "mixlib/cli" unless defined?(Mixlib::CLI)
-require "chef-config/mixin/dot_d"
 
 require_relative "../chef"
 require_relative "version"
@@ -62,6 +61,11 @@ module Shell
     # to get access to the main object before irb starts.
     ::IRB.setup(nil)
 
+    irb_conf[:USE_COLORIZE] = options.config[:use_colorize]
+    irb_conf[:USE_SINGLELINE] = options.config[:use_singleline]
+    irb_conf[:USE_MULTILINE] = options.config[:use_multiline]
+    pp irb_conf[:USE_MULTILINE]
+
     irb = IRB::Irb.new
 
     if solo_mode?
@@ -128,6 +132,8 @@ module Shell
       conf.prompt_n       = "#{Chef::Dist::EXEC}#{leader(m)} ?> "
       conf.prompt_s       = "#{Chef::Dist::EXEC}#{leader(m)}%l> "
       conf.use_tracer     = false
+      conf.instance_variable_set(:@use_multiline, false)
+      conf.instance_variable_set(:@use_singleline, false)
     end
   end
 
@@ -200,7 +206,6 @@ module Shell
 
   class Options
     include Mixlib::CLI
-    include ChefConfig::Mixin::DotD
 
     def self.footer(text = nil)
       @footer = text if text
@@ -220,6 +225,21 @@ module Shell
             #{Chef::Dist::USER_CONF_DIR}/knife.rb      if -s option is given.
     FOOTER
 
+    option :use_multiline,
+      long: "--[no-]multiline",
+      default: true,
+      description: "[Do not] use multiline editor module"
+
+    option :use_singleline,
+      long: "--[no-]singleline",
+      default: true,
+      description: "[Do not] use singleline editor module"
+
+    option :use_colorize,
+      long: "--[no-]colorize",
+      default: true,
+      description: "[Do not] use colorization"
+
     option :config_file,
       short: "-c CONFIG",
       long: "--config CONFIG",
@@ -316,44 +336,15 @@ module Shell
       # We have to nuke ARGV to make sure irb's option parser never sees it.
       # otherwise, IRB complains about command line switches it doesn't recognize.
       ARGV.clear
-
-      # This code should not exist.
-      # We should be using Application::Client and then calling load_config_file
-      # which does all this properly. However this will do for now.
       config[:config_file] = config_file_for_shell_mode(environment)
       config_msg = config[:config_file] || "none (standalone session)"
       puts "loading configuration: #{config_msg}"
-
-      # load the config (if we have one)
-      unless config[:config_file].nil?
-        if File.exist?(config[:config_file]) && File.readable?(config[:config_file])
-          Chef::Config.from_file(config[:config_file])
-        end
-
-        # even if we couldn't load that, we need to tell Chef::Config what
-        # the file was so it sets confdir and d_dir and such properly
-        Chef::Config[:config_file] = config[:config_file]
-
-        # now attempt to load any relevant dot-dirs
-        load_dot_d(Chef::Config[:client_d_dir]) if Chef::Config[:client_d_dir]
-      end
-
-      # finally merge command-line options in
+      Chef::Config.from_file(config[:config_file]) if !config[:config_file].nil? && File.exists?(config[:config_file]) && File.readable?(config[:config_file])
       Chef::Config.merge!(config)
     end
 
     private
 
-    # shamelessly lifted from application.rb
-    def apply_config(config_content, config_file_path)
-      Chef::Config.from_string(config_content, config_file_path)
-    rescue Exception => error
-      logger.fatal("Configuration error #{error.class}: #{error.message}")
-      filtered_trace = error.backtrace.grep(/#{Regexp.escape(config_file_path)}/)
-      filtered_trace.each { |line| logger.fatal("  " + line ) }
-      raise Chef::Exceptions::ConfigurationError.new("Aborting due to error in '#{config_file_path}': #{error}")
-    end
-
     def config_file_for_shell_mode(environment)
       dot_chef_dir = Chef::Util::PathHelper.home(".chef")
       if config[:config_file]

data/lib/chef/shell/shell_session.rb

@@ -41,7 +41,6 @@ module Shell
 
     attr_accessor :node, :compile, :recipe, :json_configuration
     attr_reader :node_attributes, :client
-
     def initialize
       @node_built = false
       formatter = Chef::Formatters.new(Chef::Config.formatter, STDOUT, STDERR)
@@ -76,7 +75,6 @@ module Shell
     end
 
     attr_writer :run_context
-
     def run_context
       @run_context ||= rebuild_context
     end

data/lib/chef/util/diff.rb

@@ -64,7 +64,7 @@ class Chef
 
       def use_tempfile_if_missing(file)
         tempfile = nil
-        unless File.exist?(file)
+        unless File.exists?(file)
           Chef::Log.trace("File #{file} does not exist to diff against, using empty tempfile")
           tempfile = Tempfile.new("chef-diff")
           file = tempfile.path

data/lib/chef/util/dsc/configuration_generator.rb

@@ -64,7 +64,7 @@ class Chef::Util::DSC
     #   The name may not be null or empty, and should start with a letter.
     def validate_configuration_name!(configuration_name)
       if !!(configuration_name =~ /\A[A-Za-z]+[_a-zA-Z0-9]*\Z/) == false
-        raise ArgumentError, "Configuration `#{configuration_name}` is not a valid PowerShell cmdlet name"
+        raise ArgumentError, 'Configuration `#{configuration_name}` is not a valid PowerShell cmdlet name'
       end
     end
 

data/lib/chef/util/dsc/lcm_output_parser.rb

@@ -160,9 +160,9 @@ class Chef
 
           def self.parse_line(line)
             if match = line.match(/^.*?:.*?:\s*LCM:\s*\[(.*?)\](.*)/)
-              # If the line looks like
-              # What If: [machinename]: LCM: [op_action op_type] message
-              # extract op_action, op_type, and message
+                # If the line looks like
+                # What If: [machinename]: LCM: [op_action op_type] message
+                # extract op_action, op_type, and message
               operation, info = match.captures
               op_action, op_type = operation.strip.split(" ").map { |m| m.downcase.to_sym }
             else

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

@@ -164,7 +164,7 @@ class Chef
           end
 
           def self.destroy(name)
-            proc { File.delete(name) if File.exist? name }
+            proc { File.delete(name) if File.exists? name }
           end
         end
       end

data/lib/chef/version.rb

@@ -22,8 +22,8 @@
 require_relative "version_string"
 
 class Chef
-  CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("15.17.4")
+  CHEF_ROOT = File.expand_path("../..", __FILE__)
+  VERSION = Chef::VersionString.new("16.0.257")
 end
 
 #

data/lib/chef/version_string.rb

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "chef-utils/version_string" unless defined?(ChefUtils::VersionString)
+require "chef-utils/version_string"
 
 class Chef
   VersionString = ChefUtils::VersionString

data/lib/chef/win32/api/file.rb

@@ -461,22 +461,22 @@ BOOL WINAPI DeviceIoControl(
 =end
         safe_attach_function :DeviceIoControl, %i{HANDLE DWORD LPVOID DWORD LPVOID DWORD LPDWORD pointer}, :BOOL
 
-        # BOOL WINAPI DeleteVolumeMountPoint(
-        # _In_ LPCTSTR lpszVolumeMountPoint
-        # );
+# BOOL WINAPI DeleteVolumeMountPoint(
+  # _In_ LPCTSTR lpszVolumeMountPoint
+# );
         safe_attach_function :DeleteVolumeMountPointW, [:LPCTSTR], :BOOL
 
-        # BOOL WINAPI SetVolumeMountPoint(
-        # _In_ LPCTSTR lpszVolumeMountPoint,
-        # _In_ LPCTSTR lpszVolumeName
-        # );
+# BOOL WINAPI SetVolumeMountPoint(
+  # _In_ LPCTSTR lpszVolumeMountPoint,
+  # _In_ LPCTSTR lpszVolumeName
+# );
         safe_attach_function :SetVolumeMountPointW, %i{LPCTSTR LPCTSTR}, :BOOL
 
-        # BOOL WINAPI GetVolumeNameForVolumeMountPoint(
-        # _In_  LPCTSTR lpszVolumeMountPoint,
-        # _Out_ LPTSTR  lpszVolumeName,
-        # _In_  DWORD   cchBufferLength
-        # );
+# BOOL WINAPI GetVolumeNameForVolumeMountPoint(
+  # _In_  LPCTSTR lpszVolumeMountPoint,
+  # _Out_ LPTSTR  lpszVolumeName,
+  # _In_  DWORD   cchBufferLength
+# );
         safe_attach_function :GetVolumeNameForVolumeMountPointW, %i{LPCTSTR LPTSTR DWORD}, :BOOL
 
 =begin
@@ -538,12 +538,12 @@ BOOL WINAPI VerQueryValue(
         # ensures the handle is closed on exit of the block
         # FIXME: yard with @yield
         def file_search_handle(path)
-          # Workaround for CHEF-4419:
-          # Make sure paths starting with "/" has a drive letter
-          # assigned from the current working diretory.
-          # Note: With CHEF-4427 this issue will be fixed with a
-          # broader fix to map all the paths starting with "/" to
-          # SYSTEM_DRIVE on windows.
+            # Workaround for CHEF-4419:
+            # Make sure paths starting with "/" has a drive letter
+            # assigned from the current working diretory.
+            # Note: With CHEF-4427 this issue will be fixed with a
+            # broader fix to map all the paths starting with "/" to
+            # SYSTEM_DRIVE on windows.
           path = ::File.expand_path(path) if path.start_with? "/"
           path = canonical_encode_path(path)
           find_data = WIN32_FIND_DATA.new

data/lib/chef/win32/api/security.rb

@@ -413,6 +413,11 @@ class Chef
             :Buffer, :PWSTR
         end
 
+        # https://docs.microsoft.com/en-us/windows/win32/api/ntsecapi/ns-ntsecapi-lsa_enumeration_information
+        class LSA_ENUMERATION_INFORMATION < FFI::Struct
+          layout :Sid, :PSID
+        end
+
         ffi_lib "advapi32"
 
         safe_attach_function :AccessCheck, %i{pointer HANDLE DWORD pointer pointer pointer pointer pointer}, :BOOL
@@ -448,6 +453,7 @@ class Chef
         safe_attach_function :LookupPrivilegeDisplayNameW, %i{LPCWSTR LPCWSTR LPWSTR LPDWORD LPDWORD}, :BOOL
         safe_attach_function :LookupPrivilegeValueW, %i{LPCWSTR LPCWSTR PLUID}, :BOOL
         safe_attach_function :LsaAddAccountRights, %i{pointer pointer pointer ULONG}, :NTSTATUS
+        safe_attach_function :LsaEnumerateAccountsWithUserRight, %i{LSA_HANDLE PLSA_UNICODE_STRING PVOID PULONG}, :NTSTATUS
         safe_attach_function :LsaRemoveAccountRights, %i{pointer pointer BOOL pointer ULONG}, :NTSTATUS
         safe_attach_function :LsaClose, [ :LSA_HANDLE ], :NTSTATUS
         safe_attach_function :LsaEnumerateAccountRights, %i{LSA_HANDLE PSID PLSA_UNICODE_STRING PULONG}, :NTSTATUS

data/lib/chef/win32/file.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Author:: Mark Mzyk (<mmzyk@ospcode.com>)
+# Author:: Mark Mzyk (<mmzyk@chef.io>)
 # Copyright:: Copyright (c) Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
@@ -78,7 +78,7 @@ class Chef
       def self.symlink?(file_name)
         is_symlink = false
         path = encode_path(file_name)
-        if ::File.exist?(file_name) || ::File.symlink?(file_name)
+        if ::File.exists?(file_name) || ::File.symlink?(file_name)
           if (GetFileAttributesW(path) & FILE_ATTRIBUTE_REPARSE_POINT) > 0
             file_search_handle(file_name) do |handle, find_data|
               if find_data[:dw_reserved_0] == IO_REPARSE_TAG_SYMLINK
@@ -104,7 +104,7 @@ class Chef
       # will raise a NotImplementedError, as per MRI.
       #
       def self.readlink(link_name)
-        raise Errno::ENOENT, link_name unless ::File.exist?(link_name) || ::File.symlink?(link_name)
+        raise Errno::ENOENT, link_name unless ::File.exists?(link_name) || ::File.symlink?(link_name)
 
         symlink_file_handle(link_name) do |handle|
           # Go to DeviceIoControl to get the symlink information
@@ -166,14 +166,6 @@ class Chef
         VersionInfo.new(file_name)
       end
 
-      def self.verify_links_supported!
-        CreateSymbolicLinkW(nil)
-      rescue Chef::Exceptions::Win32APIFunctionNotImplemented => e
-        raise e
-      rescue Exception
-        # things are ok.
-      end
-
       def self.file_access_check(path, desired_access)
         security_descriptor = Chef::ReservedNames::Win32::Security.get_file_security(path)
         token_rights = Chef::ReservedNames::Win32::Security::TOKEN_IMPERSONATE |