chef 15.4.45 → 15.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09023fe03c2a36ec34f9b087b7671cd38d066cde37ad6027051f333046950701'
-  data.tar.gz: cdd9bd027741716d597f2cc5c9faa1bfaac2f14f7c28b98995b0f71bc8afb295
+  metadata.gz: b826d0315123f87d4feb069a4289749d0bf5db9a76853499c80dcbddfdad2ed0
+  data.tar.gz: 27867153b65d9cd6123d57898e1a9348490d163c7dea664448d1e275786dc2d3
 SHA512:
-  metadata.gz: 52c05b3792352bf46d3124412c92bb1e4a2d2b693de090bb7e793a923547a68955ab1f1faf3bd2c122d1850dd8f9b2c12e0f4ac639a60bdb9ad6cb1b2e607f52
-  data.tar.gz: b9fb6e927fb5d5277979db1e798526b5294e55326a7c0fbc5527d0b736134fc78cec96f9e6584c3bab768a91f2328b66218ed7814735c610a5102af635a28422
+  metadata.gz: 29e068c32113545d82e3d83cfaff2966dd96ad08e8882861458354c9372707fb97a9846384e5e55078ee8b50fc06aa480a02f17e1a2201593460d991d9bbb3c0
+  data.tar.gz: bc7f429bf5bb6b92667db0b2fde9117bc4806744aea7a1e43259e3693c86d2099f9fcedc989036b57e2dc9a6a1437db020bee675c0d0f6d8ca6b352b6a2f46e0

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/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?

data/lib/chef/config.rb

@@ -4,7 +4,7 @@
 # Author:: AJ Christensen (<aj@chef.io>)
 # Author:: Mark Mzyk (<mmzyk@chef.io>)
 # Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +28,7 @@ require "chef-config/logger"
 ChefConfig.logger = Chef::Log
 
 require "chef-config/config"
+require "chef-utils" unless defined?(ChefUtils::CANARY)
 require_relative "platform/query_helpers"
 
 # Ohai::Config defines its own log_level and log_location. When loaded, it will
@@ -55,7 +56,7 @@ class Chef
 
     default :event_loggers do
       evt_loggers = []
-      if ChefConfig.windows? && !Chef::Platform.windows_nano_server?
+      if ChefUtils.windows? && !Chef::Platform.windows_nano_server?
         evt_loggers << :win_evt
       end
       evt_loggers

data/lib/chef/cookbook/chefignore.rb

@@ -24,11 +24,9 @@ class Chef
       attr_reader :ignores
 
       def initialize(ignore_file_or_repo)
-        # Check the 'ignore_file_or_repo' path first and then look in the parent directory
+        # Check the 'ignore_file_or_repo' path first and then look in the parent directories till root
         # to handle both the chef repo cookbook layout and a standalone cookbook
         @ignore_file = find_ignore_file(ignore_file_or_repo)
-        @ignore_file = find_ignore_file(File.dirname(ignore_file_or_repo)) unless readable_file_or_symlink?(@ignore_file)
-
         @ignores = parse_ignore_file
       end
 
@@ -50,27 +48,34 @@ class Chef
 
       def parse_ignore_file
         ignore_globs = []
-        if readable_file_or_symlink?(@ignore_file)
+        if @ignore_file && readable_file_or_symlink?(@ignore_file)
           File.foreach(@ignore_file) do |line|
             ignore_globs << line.strip unless line =~ COMMENTS_AND_WHITESPACE
           end
         else
-          Chef::Log.trace("No chefignore file found at #{@ignore_file} no files will be ignored")
+          Chef::Log.debug("No chefignore file found. No files will be ignored!")
         end
         ignore_globs
       end
 
+      # Lookup of chefignore file till the root dir of the provided path.
+      # If file refer then lookup the parent dir till the root.
+      # eg. path: /var/.chef/cookbook_name
+      # Lookup at '/var/.chef/cookbook_name/chefignore', '/var/.chef/chefignore' '/var/chefignore' and '/chefignore' until exist
       def find_ignore_file(path)
-        if File.basename(path) =~ /chefignore/
-          path
-        else
-          File.join(path, "chefignore")
+        Pathname.new(path).ascend do |dir|
+          next unless dir.directory?
+
+          file = dir.join("chefignore")
+          return file.expand_path.to_s if file.exist?
         end
+
+        nil
       end
 
       def readable_file_or_symlink?(path)
-        File.exist?(@ignore_file) && File.readable?(@ignore_file) &&
-          (File.file?(@ignore_file) || File.symlink?(@ignore_file))
+        File.exist?(path) && File.readable?(path) &&
+          (File.file?(path) || File.symlink?(path))
       end
     end
   end