chef 11.14.0.alpha.4 → 11.14.0.rc.2

data/distro/common/markdown/man1/knife.mkd

@@ -41,7 +41,7 @@ documentation using `knife help TOPIC`.
   * `-c`, `--config` CONFIG:
     The configuration file to use
   * `-E`, `--environment ENVIRONMENT`:
-    Set the Chef environment
+    Set the Chef environment (except for in searches, where this will be flagrantly ignored)
   * `-e`, `--editor` EDITOR:
     Set the editor to use for interactive commands
   * `-F`, `--format` FORMAT:

data/lib/chef/application/knife.rb

@@ -51,7 +51,7 @@ class Chef::Application::Knife < Chef::Application
   option :environment,
     :short        => "-E ENVIRONMENT",
     :long         => "--environment ENVIRONMENT",
-    :description  => "Set the Chef environment"
+    :description  => "Set the Chef environment (except for in searches, where this will be flagrantly ignored)"
 
   option :editor,
     :short        => "-e EDITOR",

data/lib/chef/application/windows_service.rb

@@ -211,7 +211,6 @@ class Chef
       def reconfigure(startup_parameters=[])
         configure_chef startup_parameters
         configure_logging
-        configure_proxy_environment_variables
 
         Chef::Config[:chef_server_url] = config[:chef_server_url] if config.has_key? :chef_server_url
         unless Chef::Config[:exception_handlers].any? {|h| Chef::Handler::ErrorReport === h}

data/lib/chef/chef_fs/file_system.rb

@@ -285,8 +285,12 @@ class Chef
                 if options[:dry_run]
                   ui.output "Would delete #{dest_path}" if ui
                 else
-                  dest_entry.delete(true)
-                  ui.output "Deleted extra entry #{dest_path} (purge is on)" if ui
+                  begin
+                    dest_entry.delete(true)
+                    ui.output "Deleted extra entry #{dest_path} (purge is on)" if ui
+                  rescue Chef::ChefFS::FileSystem::NotFoundError
+                    ui.output "Entry #{dest_path} does not exist. Nothing to do. (purge is on)" if ui
+                  end
                 end
               else
                 ui.output ("Not deleting extra entry #{dest_path} (purge is off)") if ui

data/lib/chef/config.rb

@@ -331,6 +331,7 @@ class Chef
 
     default :rest_timeout, 300
     default :yum_timeout, 900
+    default :yum_lock_timeout, 30
     default :solo,  false
     default :splay, nil
     default :why_run, false
@@ -551,8 +552,8 @@ class Chef
       windows_home_path = env['SYSTEMDRIVE'] + env['HOMEPATH'] if env['SYSTEMDRIVE'] && env['HOMEPATH']
     end
 
-    # returns a platform specific path to the user home dir
-    default( :user_home ) { env['HOME'] || windows_home_path || env['USERPROFILE'] }
+    # returns a platform specific path to the user home dir if set, otherwise default to current directory.
+    default( :user_home ) { env['HOME'] || windows_home_path || env['USERPROFILE'] || Dir.pwd }
 
     # Enable file permission fixup for selinux. Fixup will be done
     # only if selinux is enabled in the system.

data/lib/chef/config_fetcher.rb

@@ -18,7 +18,7 @@ class Chef
       config_data = read_config
       begin
         Chef::JSONCompat.from_json(config_data)
-      rescue JSON::ParserError => error
+      rescue FFI_Yajl::ParseError => error
         Chef::Application.fatal!("Could not parse the provided JSON file (#{config_location}): " + error.message, 2)
       end
     end

data/lib/chef/cookbook/metadata.rb

@@ -242,8 +242,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def supports(platform, *version_args)
         version = new_args_format(:supports, platform, version_args)
-        validate_version_constraint(:supports, platform, version)
-        @platforms[platform] = version
+        normalized_version = normalize_version_constraint(:supports, platform, version)
+        @platforms[platform] = normalized_version
         @platforms[platform]
       end
 
@@ -259,8 +259,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def depends(cookbook, *version_args)
         version = new_args_format(:depends, cookbook, version_args)
-        validate_version_constraint(:depends, cookbook, version)
-        @dependencies[cookbook] = version
+        normalized_version = normalize_version_constraint(:depends, cookbook, version)
+        @dependencies[cookbook] = normalized_version
         @dependencies[cookbook]
       end
 
@@ -276,8 +276,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def recommends(cookbook, *version_args)
         version = new_args_format(:recommends, cookbook,  version_args)
-        validate_version_constraint(:recommends, cookbook, version)
-        @recommendations[cookbook] = version
+        normalized_version = normalize_version_constraint(:recommends, cookbook, version)
+        @recommendations[cookbook] = normalized_version
         @recommendations[cookbook]
       end
 
@@ -293,8 +293,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def suggests(cookbook, *version_args)
         version = new_args_format(:suggests, cookbook, version_args)
-        validate_version_constraint(:suggests, cookbook, version)
-        @suggestions[cookbook] = version
+        normalized_version = normalize_version_constraint(:suggests, cookbook, version)
+        @suggestions[cookbook] = normalized_version
         @suggestions[cookbook]
       end
 
@@ -310,8 +310,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def conflicts(cookbook, *version_args)
         version = new_args_format(:conflicts, cookbook, version_args)
-        validate_version_constraint(:conflicts, cookbook, version)
-        @conflicting[cookbook] = version
+        normalized_version = normalize_version_constraint(:conflicts, cookbook, version)
+        @conflicting[cookbook] = normalized_version
         @conflicting[cookbook]
       end
 
@@ -331,8 +331,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def provides(cookbook, *version_args)
         version = new_args_format(:provides, cookbook, version_args)
-        validate_version_constraint(:provides, cookbook, version)
-        @providing[cookbook] = version
+        normalized_version = normalize_version_constraint(:provides, cookbook, version)
+        @providing[cookbook] = normalized_version
         @providing[cookbook]
       end
 
@@ -347,8 +347,8 @@ class Chef
       # versions<Array>:: Returns the list of versions for the platform
       def replaces(cookbook, *version_args)
         version = new_args_format(:replaces, cookbook, version_args)
-        validate_version_constraint(:replaces, cookbook, version)
-        @replacing[cookbook] = version
+        normalized_version = normalize_version_constraint(:replaces, cookbook, version)
+        @replacing[cookbook] = normalized_version
         @replacing[cookbook]
       end
 
@@ -532,6 +532,12 @@ Called from:
 INVALID
         raise Exceptions::InvalidVersionConstraint, msg
       end
+
+      def normalize_version_constraint(caller_name, dep_name, constraint_str)
+        version_constraint = validate_version_constraint(caller_name, dep_name, constraint_str)
+        "#{version_constraint.op} #{version_constraint.raw_version}"
+      end
+
       # Verify that the given array is an array of strings
       #
       # Raise an exception if the members of the array are not Strings

data/lib/chef/cookbook/synchronizer.rb

@@ -68,6 +68,8 @@ class Chef
       @eager_segments.freeze
 
       @cookbooks_by_name, @events = cookbooks_by_name, events
+
+      @cookbook_full_file_paths = {}
     end
 
     def cache
@@ -136,14 +138,20 @@ class Chef
 
       files.each do |file|
         queue << lambda do |lock|
-          sync_file(file)
-          lock.synchronize { mark_file_synced(file) }
+          full_file_path = sync_file(file)
+
+          lock.synchronize {
+            # Save the full_path of the downloaded file to be restored in the manifest later
+            save_full_file_path(file, full_file_path)
+            mark_file_synced(file)
+          }
         end
       end
 
       @events.cookbook_sync_start(cookbook_count)
       queue.process(Chef::Config[:cookbook_sync_threads])
-      update_cookbook_filenames
+      # Update the full file paths in the manifest
+      update_cookbook_filenames()
 
     rescue Exception => e
       @events.cookbook_sync_failed(cookbooks, e)
@@ -153,6 +161,14 @@ class Chef
       true
     end
 
+    # Saves the full_path to the file of the cookbook to be updated
+    # in the manifest later
+    def save_full_file_path(file, full_path)
+      @cookbook_full_file_paths[file.cookbook] ||= { }
+      @cookbook_full_file_paths[file.cookbook][file.segment] ||= [ ]
+      @cookbook_full_file_paths[file.cookbook][file.segment] << full_path
+    end
+
     # Iterates over cached cookbooks' files, removing files belonging to
     # cookbooks that don't appear in +cookbook_hash+
     def clear_obsoleted_cookbooks
@@ -170,14 +186,9 @@ class Chef
     end
 
     def update_cookbook_filenames
-      files_by_cookbook.each do |cookbook, cookbook_files|
-        files_by_segment = cookbook_files.group_by { |file| file.segment }
-        @eager_segments.each do |segment|
-          segment_files = files_by_segment[segment]
-          next unless segment_files
-
-          filenames = segment_files.map { |file| file.manifest_record['path'] }
-          cookbook.replace_segment_filenames(segment, filenames)
+      @cookbook_full_file_paths.each do |cookbook, file_segments|
+        file_segments.each do |segment, full_paths|
+          cookbook.replace_segment_filenames(segment, full_paths)
         end
       end
     end
@@ -204,8 +215,8 @@ class Chef
         Chef::Log.debug("Not storing #{cache_filename}, as the cache is up to date.")
       end
 
-      # Update the manifest with the full path to the cached file
-      file.manifest_record['path'] = cache.load(cache_filename, false)
+      # Load the file in the cache and return the full file path to the loaded file
+      cache.load(cache_filename, false)
     end
 
     def cached_copy_up_to_date?(local_path, expected_checksum)

data/lib/chef/encrypted_data_bag_item/decryptor.rb

@@ -17,7 +17,7 @@
 #
 
 require 'yaml'
-require 'yajl'
+require 'ffi_yajl'
 require 'openssl'
 require 'base64'
 require 'digest/sha2'
@@ -121,8 +121,8 @@ class Chef::EncryptedDataBagItem
       end
 
       def for_decrypted_item
-        Yajl::Parser.parse(decrypted_data)["json_wrapper"]
-      rescue Yajl::ParseError
+        FFI_Yajl::Parser.parse(decrypted_data)["json_wrapper"]
+      rescue FFI_Yajl::ParseError
         # convert to a DecryptionFailure error because the most likely scenario
         # here is that the decryption step was unsuccessful but returned bad
         # data rather than raising an error.

data/lib/chef/encrypted_data_bag_item/encryptor.rb

@@ -19,7 +19,7 @@
 require 'base64'
 require 'digest/sha2'
 require 'openssl'
-require 'yajl'
+require 'ffi_yajl'
 require 'chef/encrypted_data_bag_item'
 require 'chef/encrypted_data_bag_item/unsupported_encrypted_data_bag_item_format'
 
@@ -111,7 +111,7 @@ class Chef::EncryptedDataBagItem
       # Strings) that do not produce valid JSON when serialized without the
       # wrapper.
       def serialized_data
-        Yajl::Encoder.encode(:json_wrapper => plaintext_data)
+        FFI_Yajl::Encoder.encode(:json_wrapper => plaintext_data)
       end
     end
 

data/lib/chef/exceptions.rb

@@ -64,6 +64,7 @@ class Chef
     class PrivateKeyMissing < RuntimeError; end
     class CannotWritePrivateKey < RuntimeError; end
     class RoleNotFound < RuntimeError; end
+    class DuplicateRole < RuntimeError; end
     class ValidationFailed < ArgumentError; end
     class InvalidPrivateKey < ArgumentError; end
     class ConfigurationError < ArgumentError; end

data/lib/chef/file_content_management/deploy/mv_windows.rb

@@ -60,7 +60,7 @@ class Chef
             # Catch and raise if the user is not elevated enough.
             # At this point we can't configure the file as expected so
             # we're failing action on the resource.
-            raise Chef::Exceptions::WindowsNotAdmin, "can not get the security information for '#{dst}' due to missing Administrator privilages."
+            raise Chef::Exceptions::WindowsNotAdmin, "can not get the security information for '#{dst}' due to missing Administrator privileges."
           end
 
           if dst_sd.dacl_present?

data/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb

@@ -40,7 +40,7 @@ class Chef
           end
 
           unless dynamic_resource?
-            error_description.section("Resource Declaration:", recipe_snippet)
+            error_description.section("Resource Declaration:", resource.sensitive ? "suppressed sensitive resource output" : recipe_snippet)
           end
 
           error_description.section("Compiled Resource:", "#{resource.to_text}")

data/lib/chef/http.rb

@@ -21,12 +21,14 @@
 # limitations under the License.
 #
 
+require 'tempfile'
 require 'net/https'
 require 'uri'
 require 'chef/http/basic_client'
 require 'chef/monkey_patches/string'
 require 'chef/monkey_patches/net_http'
 require 'chef/config'
+require 'chef/platform/query_helpers'
 require 'chef/exceptions'
 
 class Chef
@@ -207,7 +209,10 @@ class Chef
       elsif path.nil? or path.empty?
         URI.parse(@url)
       else
-        URI.parse("#{@url}/#{path}")
+        # The regular expressions used here are to make sure '@url' does not have
+        # any trailing slashes and 'path' does not have any leading slashes. This
+        # way they are always joined correctly using just one slash.
+        URI.parse(@url.gsub(%r{/+$}, '') + '/' + path.gsub(%r{^/+}, ''))
       end
     end
 

data/lib/chef/http/http_request.rb

@@ -60,6 +60,8 @@ class Chef
 
       HOST_LOWER = "host".freeze
 
+      URI_SCHEME_DEFAULT_PORT = { 'http'  => 80, 'https' => 443 }.freeze
+
       def self.user_agent=(ua)
         @user_agent = ua
       end
@@ -138,7 +140,13 @@ class Chef
         # No response compression unless we asked for it explicitly:
         @headers[HTTPRequest::ACCEPT_ENCODING] ||= "identity"
         @headers['X-Chef-Version'] = ::Chef::VERSION
-        @headers['Host'] = "#{uri_safe_host}:#{port}" unless @headers.keys.any? {|k| k.downcase.to_s == HOST_LOWER }
+
+        # Only include port in Host header when it is not the default port
+        # for the url scheme (80;443) - Fixes CHEF-5355
+        host_header = uri_safe_host.dup
+        host_header << ":#{port}" unless URI_SCHEME_DEFAULT_PORT[@url.scheme] == port.to_i
+        @headers['Host'] = host_header unless @headers.keys.any? {|k| k.downcase.to_s == HOST_LOWER }
+
         @headers
       end
 

data/lib/chef/http/simple.rb

@@ -1,7 +1,8 @@
 require 'chef/http'
 require 'chef/http/authenticator'
 require 'chef/http/decompressor'
-
+require 'chef/http/cookie_manager'
+require 'chef/http/validate_content_length'
 
 class Chef
   class HTTP

data/lib/chef/json_compat.rb

@@ -17,8 +17,8 @@
 
 # Wrapper class for interacting with JSON.
 
-require 'json'
-require 'yajl'
+require 'ffi_yajl'
+require 'ffi_yajl/json_gem'  # XXX: parts of chef require JSON gem's Hash#to_json monkeypatch
 
 class Chef
   class JSONCompat
@@ -40,20 +40,9 @@ class Chef
 
     class <<self
 
-      # See CHEF-1292/PL-538. Increase the max nesting for JSON, which defaults
-      # to 19, and isn't enough for some (for example, a Node within a Node)
-      # structures.
-      def opts_add_max_nesting(opts)
-        if opts.nil? || !opts.has_key?(:max_nesting)
-          opts = opts.nil? ? Hash.new : opts.clone
-          opts[:max_nesting] = JSON_MAX_NESTING
-        end
-        opts
-      end
-
       # Just call the JSON gem's parse method with a modified :max_nesting field
       def from_json(source, opts = {})
-        obj = ::Yajl::Parser.parse(source)
+        obj = ::FFI_Yajl::Parser.parse(source)
 
         # JSON gem requires top level object to be a Hash or Array (otherwise
         # you get the "must contain two octets" error). Yajl doesn't impose the
@@ -99,11 +88,11 @@ class Chef
       end
 
       def to_json(obj, opts = nil)
-        obj.to_json(opts_add_max_nesting(opts))
+        obj.to_json(opts)
       end
 
       def to_json_pretty(obj, opts = nil)
-        ::JSON.pretty_generate(obj, opts_add_max_nesting(opts))
+        ::JSON.pretty_generate(obj, opts)
       end
 
 

data/lib/chef/knife/bootstrap.rb

@@ -239,6 +239,8 @@ class Chef
         if Array(@name_args).first.nil?
           ui.error("Must pass an FQDN or ip to bootstrap")
           exit 1
+        elsif Array(@name_args).first == "windows"
+          ui.warn("Hostname containing 'windows' specified. Please install 'knife-windows' if you are attempting to bootstrap a Windows node via WinRM.")
         end
       end
 

data/lib/chef/knife/bootstrap/archlinux-gems.erb

@@ -5,8 +5,8 @@ if [ ! -f /usr/bin/chef-client ]; then
   pacman -Syy
   pacman -S --noconfirm ruby ntp base-devel
   ntpdate -u pool.ntp.org
-  gem install ohai --no-rdoc --no-ri --verbose
-  gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
+  gem install ohai --no-user-install --no-document --verbose
+  gem install chef --no-user-install --no-document --verbose <%= bootstrap_version_string %>
 fi
 
 mkdir -p /etc/chef

data/lib/chef/knife/core/object_loader.rb

@@ -16,6 +16,8 @@
 # limitations under the License.
 #
 
+require 'ffi_yajl'
+
 class Chef
   class Knife
     module Core
@@ -83,7 +85,7 @@ class Chef
         def object_from_file(filename)
           case filename
           when /\.(js|json)$/
-            r = Yajl::Parser.parse(IO.read(filename))
+            r = FFI_Yajl::Parser.parse(IO.read(filename))
 
             # Chef::DataBagItem doesn't work well with the json_create method
             if @klass == Chef::DataBagItem