chef 13.12.14-universal-mingw32 → 14.0.190-universal-mingw32

data/lib/chef/run_context/cookbook_compiler.rb

@@ -31,12 +31,14 @@ class Chef
     class CookbookCompiler
       attr_reader :events
       attr_reader :run_list_expansion
+      attr_reader :logger
 
       def initialize(run_context, run_list_expansion, events)
         @run_context = run_context
         @events = events
         @run_list_expansion = run_list_expansion
         @cookbook_order = nil
+        @logger = run_context.logger.with_child(subsystem: "cookbook_compiler")
       end
 
       # Chef::Node object for the current run.
@@ -89,7 +91,7 @@ class Chef
             cookbook = Chef::Recipe.parse_recipe_name(recipe).first
             add_cookbook_with_deps(ordered_cookbooks, seen_cookbooks, cookbook)
           end
-          Chef::Log.debug("Cookbooks to compile: #{ordered_cookbooks.inspect}")
+          logger.debug("Cookbooks to compile: #{ordered_cookbooks.inspect}")
           ordered_cookbooks
         end
       end
@@ -116,6 +118,7 @@ class Chef
 
         # Doing a full ohai system check is costly, so only do so if we've loaded additional plugins
         if ohai_plugin_count > 0
+          # FIXME(log): figure out what the ohai logger looks like here
           ohai = Ohai::System.new.run_additional_plugins(Chef::Config[:ohai_segment_plugin_path])
           node.consume_ohai_data(ohai)
         end
@@ -192,7 +195,7 @@ class Chef
         default_file = list_of_attr_files.find { |path| File.basename(path) == "default.rb" }
         if root_alias
           if default_file
-            Chef::Log.error("Cookbook #{cookbook_name} contains both attributes.rb and and attributes/default.rb, ignoring attributes/default.rb")
+            logger.error("Cookbook #{cookbook_name} contains both attributes.rb and and attributes/default.rb, ignoring attributes/default.rb")
             list_of_attr_files.delete(default_file)
           end
           # The actual root_alias path decoding is handled in CookbookVersion#attribute_filenames_by_short_filename
@@ -208,7 +211,8 @@ class Chef
       end
 
       def load_attribute_file(cookbook_name, filename)
-        Chef::Log.debug("Node #{node.name} loading cookbook #{cookbook_name}'s attribute file #{filename}")
+        # FIXME(log): should be trace
+        logger.debug("Node #{node.name} loading cookbook #{cookbook_name}'s attribute file #{filename}")
         attr_file_basename = ::File.basename(filename, ".rb")
         node.include_attribute("#{cookbook_name}::#{attr_file_basename}")
       rescue Exception => e
@@ -220,7 +224,8 @@ class Chef
         files_in_cookbook_by_segment(cookbook_name, :libraries).each do |filename|
           next unless File.extname(filename) == ".rb"
           begin
-            Chef::Log.debug("Loading cookbook #{cookbook_name}'s library file: #{filename}")
+            # FIXME(log): should be trace
+            logger.debug("Loading cookbook #{cookbook_name}'s library file: #{filename}")
             Kernel.load(filename)
             @events.library_file_loaded(filename)
           rescue Exception => e
@@ -240,7 +245,8 @@ class Chef
       end
 
       def load_lwrp_provider(cookbook_name, filename)
-        Chef::Log.debug("Loading cookbook #{cookbook_name}'s providers from #{filename}")
+        # FIXME(log): should be trace
+        logger.debug("Loading cookbook #{cookbook_name}'s providers from #{filename}")
         Chef::Provider::LWRPBase.build_from_file(cookbook_name, filename, self)
         @events.lwrp_file_loaded(filename)
       rescue Exception => e
@@ -249,7 +255,8 @@ class Chef
       end
 
       def load_lwrp_resource(cookbook_name, filename)
-        Chef::Log.debug("Loading cookbook #{cookbook_name}'s resources from #{filename}")
+        # FIXME(log): should be trace
+        logger.debug("Loading cookbook #{cookbook_name}'s resources from #{filename}")
         Chef::Resource::LWRPBase.build_from_file(cookbook_name, filename, self)
         @events.lwrp_file_loaded(filename)
       rescue Exception => e
@@ -262,7 +269,8 @@ class Chef
         files_in_cookbook_by_segment(cookbook_name, :ohai).each do |filename|
           next unless File.extname(filename) == ".rb"
 
-          Chef::Log.debug "Loading Ohai plugin: #{filename} from #{cookbook_name}"
+          # FIXME(log): should be trace
+          logger.debug "Loading Ohai plugin: #{filename} from #{cookbook_name}"
           target_name = File.join(target, cookbook_name.to_s, File.basename(filename))
 
           FileUtils.mkdir_p(File.dirname(target_name))
@@ -273,11 +281,12 @@ class Chef
       def load_resource_definitions_from_cookbook(cookbook_name)
         files_in_cookbook_by_segment(cookbook_name, :definitions).each do |filename|
           begin
-            Chef::Log.debug("Loading cookbook #{cookbook_name}'s definitions from #{filename}")
+            # FIXME(log): should be trace
+            logger.debug("Loading cookbook #{cookbook_name}'s definitions from #{filename}")
             resourcelist = Chef::ResourceDefinitionList.new
             resourcelist.from_file(filename)
             definitions.merge!(resourcelist.defines) do |key, oldval, newval|
-              Chef::Log.info("Overriding duplicate definition #{key}, new definition found in #{filename}")
+              logger.info("Overriding duplicate definition #{key}, new definition found in #{filename}")
               newval
             end
             @events.definition_file_loaded(filename)

data/lib/chef/search/query.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2017, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,7 +27,6 @@ class Chef
   class Search
     class Query
 
-      attr_accessor :rest
       attr_reader :config
 
       def initialize(url = nil, config: Chef::Config)

data/lib/chef/shell.rb

@@ -41,7 +41,6 @@ module Shell
   LEADERS[Chef::Node]   = ":attributes"
 
   class << self
-    attr_accessor :client_type
     attr_accessor :options
     attr_accessor :env
     attr_writer   :editor

data/lib/chef/shell/model_wrapper.rb

@@ -17,7 +17,7 @@
 #
 
 require "chef/mixin/convert_to_class_name"
-require "chef/mixin/language"
+require "chef/dsl/data_query"
 
 module Shell
   class ModelWrapper

data/lib/chef/shell/shell_session.rb

@@ -2,7 +2,7 @@
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
 # Author:: Tim Hinderliter (<tim@chef.io>)
 # Copyright:: Copyright 2009-2016, Daniel DeLeo
-# Copyright:: Copyright 2011-2016, Chef Software Inc.
+# Copyright:: Copyright 2011-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,7 +38,7 @@ module Shell
       @session_type
     end
 
-    attr_accessor :node, :compile, :recipe, :run_context, :json_configuration
+    attr_accessor :node, :compile, :recipe, :json_configuration
     attr_reader :node_attributes, :client
     def initialize
       @node_built = false
@@ -73,6 +73,7 @@ module Shell
       run_context.resource_collection
     end
 
+    attr_writer :run_context
     def run_context
       @run_context ||= rebuild_context
     end
@@ -251,7 +252,7 @@ module Shell
     # DoppelGanger implementation of build_node. preserves as many of the node's
     # attributes, and does not save updates to the server
     def build_node
-      Chef::Log.debug("Building node object for #{@node_name}")
+      Chef::Log.trace("Building node object for #{@node_name}")
       @node = Chef::Node.find_or_create(node_name)
       ohai_data = @ohai.data.merge(@node.automatic_attrs)
       @node.consume_external_attrs(ohai_data, nil)

data/lib/chef/util/diff.rb

@@ -64,7 +64,7 @@ class Chef
       def use_tempfile_if_missing(file)
         tempfile = nil
         unless File.exists?(file)
-          Chef::Log.debug("File #{file} does not exist to diff against, using empty tempfile")
+          Chef::Log.trace("File #{file} does not exist to diff against, using empty tempfile")
           tempfile = Tempfile.new("chef-diff")
           file = tempfile.path
         end
@@ -139,7 +139,7 @@ class Chef
         return "(new content is binary, diff output suppressed)" if is_binary?(new_file)
 
         begin
-          Chef::Log.debug("Running: diff -u #{old_file} #{new_file}")
+          Chef::Log.trace("Running: diff -u #{old_file} #{new_file}")
           diff_str = udiff(old_file, new_file)
 
         rescue Exception => e

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

@@ -26,7 +26,7 @@ class Chef::Util::DSC
     end
 
     def configuration_document_from_script_code(code, configuration_flags, imports, shellout_flags)
-      Chef::Log.debug("DSC: DSC code:\n '#{code}'")
+      Chef::Log.trace("DSC: DSC code:\n '#{code}'")
       generated_script_path = write_document_generation_script(code, "chef_dsc", imports)
       begin
         configuration_document_from_script_path(generated_script_path, "chef_dsc", configuration_flags, shellout_flags)

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

@@ -130,7 +130,7 @@ class Chef
                   end
                   current_resource = { :name => info }
                 else
-                  Chef::Log.debug("Ignoring op_action #{op_action}: Read line #{line}")
+                  Chef::Log.trace("Ignoring op_action #{op_action}: Read line #{line}")
                 end
               when :end
                 # Make sure we log the last line

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

@@ -46,7 +46,7 @@ class Chef::Util::DSC
     private
 
     def run_configuration_cmdlet(configuration_document, apply_configuration, shellout_flags)
-      Chef::Log.debug("DSC: Calling DSC Local Config Manager to #{apply_configuration ? "set" : "test"} configuration document.")
+      Chef::Log.trace("DSC: Calling DSC Local Config Manager to #{apply_configuration ? "set" : "test"} configuration document.")
 
       start_operation_timing
       status = nil
@@ -63,10 +63,10 @@ class Chef::Util::DSC
         end_operation_timing
         remove_configuration_document
         if last_operation_execution_time_seconds
-          Chef::Log.debug("DSC: DSC operation completed in #{last_operation_execution_time_seconds} seconds.")
+          Chef::Log.trace("DSC: DSC operation completed in #{last_operation_execution_time_seconds} seconds.")
         end
       end
-      Chef::Log.debug("DSC: Completed call to DSC Local Config Manager")
+      Chef::Log.trace("DSC: Completed call to DSC Local Config Manager")
       status
     end
 
@@ -110,7 +110,7 @@ class Chef::Util::DSC
     end
 
     def configuration_update_required?(command_output)
-      Chef::Log.debug("DSC: DSC returned the following '-whatif' output from test operation:\n#{command_output}")
+      Chef::Log.trace("DSC: DSC returned the following '-whatif' output from test operation:\n#{command_output}")
       begin
         Parser.parse(command_output, ps_version_gte_5?)
       rescue Chef::Exceptions::LCMParser => e

data/lib/chef/util/selinux.rb

@@ -51,7 +51,7 @@ class Chef
           restorecon_flags = [ "-R" ]
           restorecon_flags << "-r" if recursive
           restorecon_flags << file_path
-          Chef::Log.debug("Restoring selinux security content with #{restorecon_path}")
+          Chef::Log.trace("Restoring selinux security content with #{restorecon_path}")
           shell_out_compact!(restorecon_path, restorecon_flags)
         else
           Chef::Log.warn "Can not find 'restorecon' on the system. Skipping selinux security context restore."

data/lib/chef/util/windows/logon_session.rb

@@ -25,7 +25,7 @@ class Chef
       class LogonSession
         include Chef::Mixin::WideString
 
-        def initialize(username, password, domain = nil)
+        def initialize(username, password, domain = nil, authentication = :remote)
           if username.nil? || password.nil?
             raise ArgumentError, "The logon session must be initialize with non-nil user name and password parameters"
           end
@@ -33,6 +33,7 @@ class Chef
           @original_username = username
           @original_password = password
           @original_domain = domain
+          @authentication = authentication
           @token = FFI::Buffer.new(:pointer)
           @session_opened = false
           @impersonating = false
@@ -47,7 +48,8 @@ class Chef
           password = wstring(original_password)
           domain = wstring(original_domain)
 
-          status = Chef::ReservedNames::Win32::API::Security.LogonUserW(username, domain, password, Chef::ReservedNames::Win32::API::Security::LOGON32_LOGON_NEW_CREDENTIALS, Chef::ReservedNames::Win32::API::Security::LOGON32_PROVIDER_DEFAULT, token)
+          logon_type = (authentication == :local) ? (Chef::ReservedNames::Win32::API::Security::LOGON32_LOGON_NETWORK) : (Chef::ReservedNames::Win32::API::Security::LOGON32_LOGON_NEW_CREDENTIALS)
+          status = Chef::ReservedNames::Win32::API::Security.LogonUserW(username, domain, password, logon_type, Chef::ReservedNames::Win32::API::Security::LOGON32_PROVIDER_DEFAULT, token)
 
           if !status
             last_error = FFI::LastError.error
@@ -110,6 +112,7 @@ class Chef
         attr_reader :original_username
         attr_reader :original_password
         attr_reader :original_domain
+        attr_reader :authentication
 
         attr_reader :token
         attr_reader :session_opened

data/lib/chef/util/windows/net_user.rb

@@ -95,9 +95,9 @@ class Chef::Util::Windows::NetUser < Chef::Util::Windows
   def validate_credentials(passwd)
     token = Security.logon_user(@username, nil, passwd,
                LOGON32_LOGON_NETWORK, LOGON32_PROVIDER_DEFAULT)
-    return true
+    true
   rescue Chef::Exceptions::Win32APIError
-    return false
+    false
   end
 
   def get_info

data/lib/chef/util/windows/volume.rb

@@ -46,8 +46,4 @@ class Chef::Util::Windows::Volume < Chef::Util::Windows
   rescue Chef::Exceptions::Win32APIError => e
     raise ArgumentError, e
   end
-
-  def mount_point
-    @mount_point
-  end
 end

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require "chef/version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("13.12.14")
+  VERSION = Chef::VersionString.new("14.0.190")
 end
 
 #

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

@@ -194,12 +194,12 @@ class Chef
         ERROR_INVALID_EXE_SIGNATURE     = 191
         ERROR_EXE_MARKED_INVALID        = 192
         ERROR_BAD_EXE_FORMAT            = 193
-        ERROR_ITERATED_DATA_EXCEEDS_64k = 194 # rubocop:disable Style/ConstantName
+        ERROR_ITERATED_DATA_EXCEEDS_64k = 194 # rubocop:disable Naming/ConstantName
         ERROR_INVALID_MINALLOCSIZE      = 195
         ERROR_DYNLINK_FROM_INVALID_RING = 196
         ERROR_IOPL_NOT_ENABLED          = 197
         ERROR_INVALID_SEGDPL            = 198
-        ERROR_AUTODATASEG_EXCEEDS_64k   = 199 # rubocop:disable Style/ConstantName
+        ERROR_AUTODATASEG_EXCEEDS_64k   = 199 # rubocop:disable Naming/ConstantName
         ERROR_RING2SEG_MUST_BE_MOVABLE  = 200
         ERROR_RELOC_CHAIN_XEEDS_SEGLIM  = 201
         ERROR_INFLOOP_IN_RELOC_CHAIN    = 202

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

@@ -45,7 +45,7 @@ class Chef
         USE_FORCE = 1
         USE_LOTS_OF_FORCE = 2 #every windows API should support this flag
 
-        NERR_Success = 0 # rubocop:disable Style/ConstantName
+        NERR_Success = 0 # rubocop:disable Naming/ConstantName
         ERROR_MORE_DATA = 234
 
         ffi_lib "netapi32"

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

@@ -303,6 +303,17 @@ class Chef
              :SecurityDelegation,
         ]
 
+        # https://msdn.microsoft.com/en-us/library/windows/desktop/bb530718%28v=vs.85%29.aspx?f=255&MSPPError=-2147217396
+        ELEVATION_TYPE = enum :ELEVATION_TYPE, [
+            :TokenElevationTypeDefault, 1,
+            :TokenElevationTypeFull,
+            :TokenElevationTypeLimited
+        ]
+
+        class TOKEN_ELEVATION_TYPE < FFI::Struct
+          layout :ElevationType, :ELEVATION_TYPE
+        end
+
         # SECURITY_DESCRIPTOR is an opaque structure whose contents can vary.  Pass the
         # pointer around and free it with LocalFree.
         # http://msdn.microsoft.com/en-us/library/windows/desktop/aa379561(v=vs.85).aspx

data/lib/chef/win32/eventlog.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-if Chef::Platform.windows? && (not Chef::Platform.windows_server_2003?)
+if Chef::Platform.windows?
   if !defined? Chef::Win32EventLogLoaded
     if defined? Windows::Constants
       [:INFINITE, :WAIT_FAILED, :FORMAT_MESSAGE_IGNORE_INSERTS, :ERROR_INSUFFICIENT_BUFFER].each do |c|
@@ -26,6 +26,6 @@ if Chef::Platform.windows? && (not Chef::Platform.windows_server_2003?)
     end
 
     require "win32/eventlog"
-    Chef::Win32EventLogLoaded = true # rubocop:disable Style/ConstantName
+    Chef::Win32EventLogLoaded = true # rubocop:disable Naming/ConstantName
   end
 end

data/lib/chef/win32/mutex.rb

@@ -55,7 +55,7 @@ class Chef
           when WAIT_ABANDONED
             # Previous owner of the mutex died before it can release the
             # mutex. Log a warning and continue.
-            Chef::Log.debug "Existing owner of the mutex exited prematurely."
+            Chef::Log.trace "Existing owner of the mutex exited prematurely."
             break
           when WAIT_OBJECT_0
             # Mutex is successfully acquired.

data/lib/chef/win32/registry.rb

@@ -2,7 +2,7 @@
 # Author:: Prajakta Purohit (<prajakta@chef.io>)
 # Author:: Lamont Granquist (<lamont@chef.io>)
 #
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# Copyright:: Copyright 2012-2018, Chef Software Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ class Chef
       extend Chef::Mixin::WideString
 
       attr_accessor :run_context
-      attr_accessor :architecture
+      attr_reader :architecture
 
       def initialize(run_context = nil, user_architecture = :machine)
         @run_context = run_context
@@ -63,30 +63,30 @@ class Chef
       def set_value(key_path, value)
         data = value[:data]
         data = data.to_s if value[:type] == :string
-        Chef::Log.debug("Updating value #{value[:name]} in registry key #{key_path} with type #{value[:type]} and data #{data}")
+        Chef::Log.trace("Updating value #{value[:name]} in registry key #{key_path} with type #{value[:type]} and data #{data}")
         key_exists!(key_path)
         hive, key = get_hive_and_key(key_path)
         if value_exists?(key_path, value)
           if data_exists?(key_path, value)
-            Chef::Log.debug("Value #{value[:name]} in registry key #{key_path} already had those values, not updated")
+            Chef::Log.trace("Value #{value[:name]} in registry key #{key_path} already had those values, not updated")
             return false
           else
             hive.open(key, ::Win32::Registry::KEY_SET_VALUE | ::Win32::Registry::KEY_QUERY_VALUE | registry_system_architecture) do |reg|
               reg.write(value[:name], get_type_from_name(value[:type]), data)
             end
-            Chef::Log.debug("Value #{value[:name]} in registry key #{key_path} updated")
+            Chef::Log.trace("Value #{value[:name]} in registry key #{key_path} updated")
           end
         else
           hive.open(key, ::Win32::Registry::KEY_SET_VALUE | ::Win32::Registry::KEY_QUERY_VALUE | registry_system_architecture) do |reg|
             reg.write(value[:name], get_type_from_name(value[:type]), data)
           end
-          Chef::Log.debug("Value #{value[:name]} in registry key #{key_path} created")
+          Chef::Log.trace("Value #{value[:name]} in registry key #{key_path} created")
         end
         true
       end
 
       def delete_value(key_path, value)
-        Chef::Log.debug("Deleting value #{value[:name]} from registry key #{key_path}")
+        Chef::Log.trace("Deleting value #{value[:name]} from registry key #{key_path}")
         if value_exists?(key_path, value)
           begin
             hive, key = get_hive_and_key(key_path)
@@ -95,38 +95,38 @@ class Chef
           end
           hive.open(key, ::Win32::Registry::KEY_SET_VALUE | registry_system_architecture) do |reg|
             reg.delete_value(value[:name])
-            Chef::Log.debug("Deleted value #{value[:name]} from registry key #{key_path}")
+            Chef::Log.trace("Deleted value #{value[:name]} from registry key #{key_path}")
           end
         else
-          Chef::Log.debug("Value #{value[:name]} in registry key #{key_path} does not exist, not updated")
+          Chef::Log.trace("Value #{value[:name]} in registry key #{key_path} does not exist, not updated")
         end
         true
       end
 
       def create_key(key_path, recursive)
-        Chef::Log.debug("Creating registry key #{key_path}")
+        Chef::Log.trace("Creating registry key #{key_path}")
         if keys_missing?(key_path)
           if recursive == true
-            Chef::Log.debug("Registry key #{key_path} has missing subkeys, and recursive specified, creating them....")
+            Chef::Log.trace("Registry key #{key_path} has missing subkeys, and recursive specified, creating them....")
             create_missing(key_path)
           else
             raise Chef::Exceptions::Win32RegNoRecursive, "Registry key #{key_path} has missing subkeys, and recursive not specified"
           end
         end
         if key_exists?(key_path)
-          Chef::Log.debug("Registry key #{key_path} already exists, doing nothing")
+          Chef::Log.trace("Registry key #{key_path} already exists, doing nothing")
         else
           hive, key = get_hive_and_key(key_path)
           hive.create(key, ::Win32::Registry::KEY_WRITE | registry_system_architecture)
-          Chef::Log.debug("Registry key #{key_path} created")
+          Chef::Log.trace("Registry key #{key_path} created")
         end
         true
       end
 
       def delete_key(key_path, recursive)
-        Chef::Log.debug("Deleting registry key #{key_path}")
+        Chef::Log.trace("Deleting registry key #{key_path}")
         unless key_exists?(key_path)
-          Chef::Log.debug("Registry key #{key_path}, does not exist, not deleting")
+          Chef::Log.trace("Registry key #{key_path}, does not exist, not deleting")
           return true
         end
         if has_subkeys?(key_path) && !recursive
@@ -142,7 +142,7 @@ class Chef
         hive.open(key_parent, ::Win32::Registry::KEY_WRITE | registry_system_architecture) do |reg|
           reg.delete_key(key, recursive)
         end
-        Chef::Log.debug("Registry key #{key_path} deleted")
+        Chef::Log.trace("Registry key #{key_path} deleted")
         true
       end
 
@@ -357,7 +357,7 @@ class Chef
         missing_key_arr.each do |intermediate_key|
           existing_key_path = existing_key_path << "\\" << intermediate_key
           if !key_exists?(existing_key_path)
-            Chef::Log.debug("Recursively creating registry key #{existing_key_path}")
+            Chef::Log.trace("Recursively creating registry key #{existing_key_path}")
             hive.create(get_key(existing_key_path), ::Win32::Registry::KEY_ALL_ACCESS | registry_system_architecture)
           end
         end