chef 15.4.45-universal-mingw32 → 15.5.9-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21b19428acc0503074938fb4e5dc93cb5cd70542f35625634b205d74b662bf48
-  data.tar.gz: 9e75d184a6494c67c334198d6cc55c60a9441d9bf18bece3598d8476d95adc8f
+  metadata.gz: 1afaba89cda06122cc51c81b3420614fdeea3f02e7d0e6c6445c95ea7542a915
+  data.tar.gz: 5efb653a06b24fd9bb5074c418d48b0520b695b6ca4a51a5abc8392ae5ec396c
 SHA512:
-  metadata.gz: 6877efd745673cb51b0879c8e78abb0ea88049e320e07d69052bc3616f4c53077f039f47310b90fb469e13f90f9f5df3b8935aee3ea45ba5aa26984829d6a849
-  data.tar.gz: ffe577ee8b5b6f36e0a75930a9878bb659c60488c4ea9471e2596294a9590c6db0887f5be1d8266d26052b55702b89cf5ee15d432cee54aee63d9b3da65aab8d
+  metadata.gz: c0836a85ec320556e812ddca44716bcca33e69253031817dafa3c80159e226d869ed25860e5a3b1e0bd61b0789ccc1d308d83f8d56343fc7e7f38a7f36e488b5
+  data.tar.gz: c04bcfa673429f5a6f4cf867c7be4ab40413c7614bf5844b1ae43f1808376913087998f576c26d9c2a6245a508db3bc1120752af4da1659bc7082ee590e543f0

data/Gemfile

@@ -10,6 +10,7 @@ gem "chef", path: "."
 # necessary until we release ohai 15
 gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
 
+gem "chef-utils", path: File.expand_path("../chef-utils", __FILE__) if File.exist?(File.expand_path("../chef-utils", __FILE__))
 gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
 
 if File.exist?(File.expand_path("../chef-bin", __FILE__))
@@ -25,8 +26,8 @@ gem "cheffish", "~> 14"
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
-  gem "inspec-core", "~> 4.3"
-  gem "inspec-core-bin", "~> 4.3" # need to provide the binaries for inspec
+  gem "inspec-core", "~> 4.18"
+  gem "inspec-core-bin", "~> 4.18" # need to provide the binaries for inspec
   gem "chef-vault"
   gem "ed25519" # ed25519 ssh key support done here as it's a native gem we can't put in train
   gem "bcrypt_pbkdf" # ed25519 ssh key support done here as it's a native gem we can't put in train
@@ -65,6 +66,7 @@ group(:development, :test) do
   gem "rspec_junit_formatter", "~> 0.2.0"
   gem "simplecov"
   gem "webmock"
+  gem "fauxhai-ng" # for chef-utils gem
 end
 
 group(:chefstyle) do
@@ -76,7 +78,7 @@ instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 
 # If you want to load debugging tools into the bundle exec sandbox,
 # add these additional dependencies into Gemfile.local
-eval_gemfile(__FILE__ + ".local") if File.exist?(__FILE__ + ".local")
+eval_gemfile("./Gemfile.local") if File.exist?("./Gemfile.local")
 
 # These lines added for Windows development only.
 # For FFI to call into PowerShell we need the binaries and assemblies located

data/Rakefile

@@ -26,9 +26,11 @@ ENV["CHEF_LICENSE"] = "accept-no-persist"
 
 # hack the chef-config install to run before the traditional install task
 task :super_install do
-  chef_config_path = ::File.join(::File.dirname(__FILE__), "chef-config")
-  Dir.chdir(chef_config_path)
-  sh("rake install")
+  %w{chef-utils chef-config}.each do |gem|
+    path = ::File.join(::File.dirname(__FILE__), gem)
+    Dir.chdir(path)
+    sh("rake install")
+  end
 end
 
 task install: :super_install

data/chef.gemspec

@@ -16,13 +16,14 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 2.5.0"
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
+  s.add_dependency "chef-utils", "= #{Chef::VERSION}"
   s.add_dependency "train-core", "~> 3.1"
   s.add_dependency "train-winrm", ">= 0.2.5"
 
   s.add_dependency "license-acceptance", "~> 1.0", ">= 1.0.5"
   s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0"
   s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0"
-  s.add_dependency "mixlib-authentication", "~> 2.1"
+  s.add_dependency "mixlib-authentication", ">= 2.1", "< 4"
   s.add_dependency "mixlib-shellout", ">= 3.0.3", "< 4.0"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
   s.add_dependency "ohai", "~> 15.0"

data/ext/win32-eventlog/Rakefile

@@ -1,6 +1,8 @@
 require "rubygems"
 require "rake"
 require "mkmf"
+require "erb"
+require "chef/dist"
 
 desc "Building event log dll"
 
@@ -12,6 +14,12 @@ def ensure_present(commands)
   end
 end
 
+# Templating the windows event log messages
+# So we can inject distro constants in there
+template = ERB.new(IO.read("chef-log.man.erb"))
+chef_log_man = template.result
+File.open("chef-log.man", "w") { |f| f.write(chef_log_man) }
+
 EVT_MC_FILE = "chef-log.man".freeze
 EVT_RC_FILE = "chef-log.rc".freeze
 EVT_RESOURCE_OBJECT = "resource.o".freeze
@@ -43,7 +51,7 @@ task register: EVT_SHARED_OBJECT do
   begin
     Win32::EventLog.add_event_source(
       source: "Application",
-      key_name: "Chef",
+      key_name: Chef::Dist::PRODUCT,
       event_message_file: dll_file,
       category_message_file: dll_file
     )

data/ext/win32-eventlog/{chef-log.man → chef-log.man.erb}

@@ -1,25 +1,25 @@
 MessageId=10000
 SymbolicName=RUN_START
 Language=English
-Starting Chef Infra Client run v%1
+Starting <%= Chef::Dist::PRODUCT %> run v%1
 .
 
 MessageId=10001
 SymbolicName=RUN_STARTED
 Language=English
-Started Chef Infra Client run %1
+Started <%= Chef::Dist::PRODUCT %> run %1
 .
 
 MessageId=10002
 SymbolicName=RUN_COMPLETED
 Language=English
-Completed Chef Infra Client run %1 in %2 seconds
+Completed <%= Chef::Dist::PRODUCT %> run %1 in %2 seconds
 .
 
 MessageId=10003
 SymbolicName=RUN_FAILED
 Language=English
-Failed Chef Infra Client run %1 in %2 seconds.%n
+Failed <%= Chef::Dist::PRODUCT %> run %1 in %2 seconds.%n
 Exception type: %3%n
 Exception message: %4%n
 Exception backtrace: %5%n

data/lib/chef/application.rb

@@ -78,7 +78,7 @@ class Chef
         Chef::Application.fatal!("SIGTERM received, stopping", Chef::Exceptions::SigTerm.new)
       end
 
-      unless Chef::Platform.windows?
+      unless ChefUtils.windows?
         trap("QUIT") do
           logger.info("SIGQUIT received, call stack:\n  " + caller.join("\n  "))
         end
@@ -305,7 +305,7 @@ class Chef
       # win32-process gem exposes some form of :fork for Process
       # class. So we are separately ensuring that the platform we're
       # running on is not windows before forking.
-      chef_config[:client_fork] && Process.respond_to?(:fork) && !Chef::Platform.windows?
+      chef_config[:client_fork] && Process.respond_to?(:fork) && !ChefUtils.windows?
     end
 
     # Run chef-client once and then exit. If TERM signal is received, ignores the

data/lib/chef/application/client.rb

@@ -33,7 +33,7 @@ class Chef::Application::Client < Chef::Application::Base
     long: "--config CONFIG",
     description: "The configuration file to use."
 
-  unless Chef::Platform.windows?
+  unless ChefUtils.windows?
     option :daemonize,
       short: "-d [WAIT]",
       long: "--daemonize [WAIT]",

data/lib/chef/application/knife.rb

@@ -114,6 +114,7 @@ class Chef::Application::Knife < Chef::Application
     short: "-F FORMAT",
     long: "--format FORMAT",
     description: "Which format to use for output.",
+    in: %w{summary text json yaml pp},
     default: "summary"
 
   option :local_mode,

data/lib/chef/application/solo.rb

@@ -36,7 +36,7 @@ class Chef::Application::Solo < Chef::Application::Base
     default: Chef::Config.platform_specific_path("#{Chef::Dist::CONF_DIR}/solo.rb"),
     description: "The configuration file to use."
 
-  unless Chef::Platform.windows?
+  unless ChefUtils.windows?
     option :daemonize,
       short: "-d",
       long: "--daemonize",

data/lib/chef/chef_class.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright 2015-2016, Chef Software, Inc.
+# Copyright:: Copyright 2015-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -239,10 +239,5 @@ class Chef
     end
   end
 
-  # @api private Only for test dependency injection; not evenly implemented as yet.
-  def self.path_to(path)
-    path
-  end
-
   reset!
 end

data/lib/chef/chef_fs.rb

@@ -53,7 +53,7 @@ require_relative "platform"
 class Chef
   module ChefFS
     def self.windows?
-      Chef::Platform.windows?
+      ChefUtils.windows?
     end
   end
 end

data/lib/chef/chef_fs/file_pattern.rb

@@ -245,7 +245,7 @@ class Chef
       end
 
       def self.pattern_special_characters
-        if Chef::ChefFS.windows?
+        if ChefUtils.windows?
           @pattern_special_characters ||= /(\*\*|\*|\?|[\*\?\.\|\(\)\[\]\{\}\+\\\\\^\$])/
         else
           # Unix also supports character regexes and backslashes

data/lib/chef/chef_fs/file_system/chef_server/cookbook_artifacts_dir.rb

@@ -65,7 +65,7 @@ class Chef
               file_class.symlink other.file_path, proxy_cookbook_path
 
               # Instantiate a proxy loader using the temporary symlink
-              proxy_loader = Chef::Cookbook::CookbookVersionLoader.new(proxy_cookbook_path, other.parent.chefignore)
+              proxy_loader = Chef::Cookbook::CookbookVersionLoader.new(proxy_cookbook_path, other.chefignore)
               proxy_loader.load_cookbooks
 
               cookbook_to_upload = proxy_loader.cookbook_version
@@ -86,7 +86,7 @@ class Chef
               # the symlink without removing the original contents if we
               # are running on windows
               #
-              if Chef::Platform.windows?
+              if ChefUtils.windows?
                 Dir.rmdir proxy_cookbook_path
               end
             end

data/lib/chef/chef_fs/file_system/chef_server/versioned_cookbooks_dir.rb

@@ -71,7 +71,7 @@ class Chef
               file_class.symlink other.file_path, proxy_cookbook_path
 
               # Instantiate a proxy loader using the temporary symlink
-              proxy_loader = Chef::Cookbook::CookbookVersionLoader.new(proxy_cookbook_path, other.parent.chefignore)
+              proxy_loader = Chef::Cookbook::CookbookVersionLoader.new(proxy_cookbook_path, other.chefignore)
               proxy_loader.load_cookbooks
 
               cookbook_to_upload = proxy_loader.cookbook_version
@@ -91,7 +91,7 @@ class Chef
               # the symlink without removing the original contents if we
               # are running on windows
               #
-              if Chef::Platform.windows?
+              if ChefUtils.windows?
                 Dir.rmdir proxy_cookbook_path
               end
             end

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_artifact_dir.rb

@@ -25,7 +25,7 @@ class Chef
         class ChefRepositoryFileSystemCookbookArtifactDir < ChefRepositoryFileSystemCookbookDir
           # Override from parent
           def cookbook_version
-            loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, parent.chefignore)
+            loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, chefignore)
             cookbook_name, _dash, identifier = name.rpartition("-")
             # KLUDGE: We shouldn't have to use instance_variable_set
             loader.instance_variable_set(:@cookbook_name, cookbook_name)

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir.rb

@@ -21,6 +21,7 @@ require_relative "../chef_server/cookbook_dir"
 require_relative "../chef_server/versioned_cookbook_dir"
 require_relative "../exceptions"
 require_relative "../../../cookbook/cookbook_version_loader"
+require_relative "../../../cookbook/chefignore"
 
 class Chef
   module ChefFS
@@ -31,6 +32,11 @@ class Chef
         class ChefRepositoryFileSystemCookbookDir < ChefRepositoryFileSystemCookbookEntry
 
           # API Required by Respository::Directory
+          def chefignore
+            @chefignore ||= Chef::Cookbook::Chefignore.new(file_path)
+          rescue Errno::EISDIR, Errno::EACCES
+            # Work around a bug in Chefignore when chefignore is a directory
+          end
 
           def fs_entry_valid?
             return false unless File.directory?(file_path) && name_valid?
@@ -136,7 +142,7 @@ class Chef
           end
 
           def cookbook_version
-            loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, parent.chefignore)
+            loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, chefignore)
             loader.load_cookbooks
             loader.cookbook_version
           end

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_entry.rb

@@ -68,13 +68,14 @@ class Chef
             end
 
             # Check chefignore
-            ignorer = parent
+            ignorer = self
+
             loop do
-              if ignorer.is_a?(CookbooksDir)
+              if ignorer.is_a?(ChefRepositoryFileSystemCookbookDir)
                 # Grab the path from entry to child
                 path_to_child = name
                 child = self
-                while child.parent != ignorer
+                while child != ignorer
                   path_to_child = PathUtils.join(child.name, path_to_child)
                   child = child.parent
                 end

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir.rb

@@ -1,6 +1,6 @@
 #
 # Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software, Inc.
+# Copyright:: Copyright 2012-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,7 +44,7 @@ require_relative "../../data_handler/role_data_handler"
 require_relative "../../data_handler/user_data_handler"
 require_relative "../../data_handler/group_data_handler"
 require_relative "../../data_handler/container_data_handler"
-require_relative "../../../win32/security" if Chef::Platform.windows?
+require_relative "../../../win32/security" if ChefUtils.windows?
 
 class Chef
   module ChefFS
@@ -112,7 +112,7 @@ class Chef
                 begin
                   ::FileUtils.mkdir_p(path)
                   ::FileUtils.chmod(0700, path)
-                  if Chef::Platform.windows?
+                  if ChefUtils.windows?
                     all_mask = Chef::ReservedNames::Win32::API::Security::GENERIC_ALL
                     administrators = Chef::ReservedNames::Win32::Security::SID.Administrators
                     owner = Chef::ReservedNames::Win32::Security::SID.default_security_object_owner

data/lib/chef/chef_fs/file_system/repository/chef_repository_file_system_versioned_cookbook_dir.rb

@@ -25,7 +25,7 @@ class Chef
         class ChefRepositoryFileSystemVersionedCookbookDir < ChefRepositoryFileSystemCookbookDir
           # Override from parent
           def cookbook_version
-            loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, parent.chefignore)
+            loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, chefignore)
             # We need the canonical cookbook name if we are using versioned cookbooks, but we don't
             # want to spend a lot of time adding code to the main Chef libraries
             canonical_name = canonical_cookbook_name(File.basename(file_path))

data/lib/chef/chef_fs/file_system/repository/nodes_dir.rb

@@ -1,7 +1,7 @@
 #
 # Author:: John Keiser (<jkeiser@chef.io>)
 # Author:: Ho-Sheng Hsiao (<hosh@chef.io>)
-# Copyright:: Copyright 2012-2016, Chef Software Inc.
+# Copyright:: Copyright 2012-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@
 require_relative "node"
 require_relative "directory"
 require_relative "../exceptions"
-require_relative "../../../win32/security" if Chef::Platform.windows?
+require_relative "../../../win32/security" if ChefUtils.windows?
 
 class Chef
   module ChefFS
@@ -35,7 +35,7 @@ class Chef
           def create_child(child_name, file_contents = nil)
             child = super
             File.chmod(0600, child.file_path)
-            if Chef::Platform.windows?
+            if ChefUtils.windows?
               read_mask = Chef::ReservedNames::Win32::API::Security::GENERIC_READ
               write_mask = Chef::ReservedNames::Win32::API::Security::GENERIC_WRITE
               administrators = Chef::ReservedNames::Win32::Security::SID.Administrators

data/lib/chef/chef_fs/knife.rb

@@ -18,7 +18,7 @@
 
 require_relative "../knife"
 require "pathname" unless defined?(Pathname)
-require "chef/dist"
+require_relative "../dist"
 
 class Chef
   module ChefFS

data/lib/chef/chef_fs/path_utils.rb

@@ -58,7 +58,7 @@ class Chef
       end
 
       def self.regexp_path_separator
-        Chef::ChefFS.windows? ? '[\/\\\\]' : "/"
+        ChefUtils.windows? ? '[\/\\\\]' : "/"
       end
 
       # Given a server path, determines if it is absolute.
@@ -103,7 +103,7 @@ class Chef
 
       # Compares two path fragments according to the case-sentitivity of the host platform.
       def self.os_path_eq?(left, right)
-        Chef::ChefFS.windows? ? left.casecmp(right) == 0 : left == right
+        ChefUtils.windows? ? left.casecmp(right) == 0 : left == right
       end
 
       # Given two general OS-dependent file paths, determines the relative path of the

data/lib/chef/client.rb

@@ -20,7 +20,7 @@
 
 require_relative "config"
 require_relative "mixin/params_validate"
-require_relative "mixin/path_sanity"
+require "chef-utils/dsl/path_sanity" unless defined?(ChefUtils::DSL::PathSanity)
 require_relative "log"
 require_relative "deprecated"
 require_relative "server_api"
@@ -52,6 +52,7 @@ require_relative "policy_builder"
 require_relative "request_id"
 require_relative "platform/rebooter"
 require_relative "mixin/deprecation"
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 require "ohai" unless defined?(Ohai::System)
 require "rbconfig"
 require_relative "dist"
@@ -62,8 +63,6 @@ class Chef
   # The main object in a Chef run. Preps a Chef::Node and Chef::RunContext,
   # syncs cookbooks if necessary, and triggers convergence.
   class Client
-    include Chef::Mixin::PathSanity
-
     extend Chef::Mixin::Deprecation
 
     extend Forwardable
@@ -251,7 +250,7 @@ class Chef
         logger.info "#{Chef::Dist::CLIENT.capitalize} pid: #{Process.pid}"
         logger.info "Targeting node: #{Chef::Config.target_mode.host}" if Chef::Config.target_mode?
         logger.debug("#{Chef::Dist::CLIENT.capitalize} request_id: #{request_id}")
-        enforce_path_sanity
+        ENV["PATH"] = ChefUtils::PathSanity.sanitized_path if Chef::Config[:enforce_path_sanity]
 
         if Chef::Config.target_mode?
           get_ohai_data_remotely
@@ -749,7 +748,7 @@ class Chef
     # @api private
     #
     def do_windows_admin_check
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         logger.trace("Checking for administrator privileges....")
 
         if !has_admin_privileges?