chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

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

@@ -0,0 +1,48 @@
+#
+# Author:: Lamont Granquist (<lamont@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# PURPOSE: This strategy preserves the inode, and will preserve modes + ownership
+#          even if the user running chef cannot create that ownership (but has
+#          rights to the file).  It is vulnerable to crashes in the middle of
+#          writing the file which could result in corruption or zero-length files.
+#
+
+class Chef
+  class FileContentManagement
+    class Deploy
+      #
+      # PURPOSE: This strategy preserves the inode, and will preserve modes + ownership
+      #          even if the user running chef cannot create that ownership (but has
+      #          rights to the file).  It is vulnerable to crashes in the middle of
+      #          writing the file which could result in corruption or zero-length files.
+      #
+      class Cp
+        def create(file)
+          Chef::Log.debug("touching #{file} to create it")
+          FileUtils.touch(file)
+        end
+
+        def deploy(src, dst)
+          Chef::Log.debug("copying temporary file #{src} into place at #{dst}")
+          FileUtils.cp(src, dst)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,77 @@
+#
+# Author:: Lamont Granquist (<lamont@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class Chef
+  class FileContentManagement
+    class Deploy
+      #
+      # PURPOSE: this strategy is atomic, and attempts to preserve file modes
+      #
+      # NOTE: there is no preserve flag to FileUtils.mv, and we want to preserve the dst file
+      #       modes rather than the src file modes (preserve = true is what mv does already, we
+      #       would like preserve = false which is tricky).
+      #
+      class MvUnix
+        def create(file)
+          # this is very simple, but it ensures that ownership and file modes take
+          # good defaults, in particular mode needs to obey umask on create
+          Chef::Log.debug("touching #{file} to create it")
+          FileUtils.touch(file)
+        end
+
+        def deploy(src, dst)
+          # we are only responsible for content so restore the dst files perms
+          Chef::Log.debug("reading modes from #{dst} file")
+          stat = ::File.stat(dst)
+          mode = stat.mode & 07777
+          uid  = stat.uid
+          gid  = stat.gid
+
+          Chef::Log.debug("applying mode = #{mode.to_s(8)}, uid = #{uid}, gid = #{gid} to #{src}")
+
+          # i own the inode, so should be able to at least chmod it
+          ::File.chmod(mode, src)
+
+          # we may be running as non-root in which case because we are doing an mv we cannot preserve
+          # the file modes.  after the mv we have a different inode and if we don't have rights to
+          # chown/chgrp on the inode then we can't fix the ownership.
+          #
+          # in the case where i'm running chef-solo on my homedir as myself and some root-shell
+          # work has caused dotfiles of mine to change to root-owned, i'm fine with this not being
+          # exceptional, and i think most use cases will consider this to not be exceptional, and
+          # the right thing is to fix the ownership of the file to the user running the commmand
+          # (which requires write perms to the directory, or mv will throw an exception)
+          begin
+            ::File.chown(uid, nil, src)
+          rescue Errno::EPERM
+            Chef::Log.warn("Could not set uid = #{uid} on #{src}, file modes not preserved")
+          end
+          begin
+            ::File.chown(nil, gid, src)
+          rescue Errno::EPERM
+            Chef::Log.warn("Could not set gid = #{gid} on #{src}, file modes not preserved")
+          end
+
+          Chef::Log.debug("moving temporary file #{src} into place at #{dst}")
+          FileUtils.mv(src, dst)
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,95 @@
+#
+# Author:: Lamont Granquist (<lamont@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# We update the contents of the file, using mv for atomicity, while maintaining all the
+# ACL information on the dst file.
+#
+
+require 'chef/platform/query_helpers'
+if Chef::Platform.windows?
+  require 'chef/win32/security'
+end
+
+class Chef
+  class FileContentManagement
+    class Deploy
+      class MvWindows
+
+        Security = Chef::ReservedNames::Win32::Security
+        ACL = Security::ACL
+
+        def create(file)
+          Chef::Log.debug("touching #{file} to create it")
+          FileUtils.touch(file)
+        end
+
+        def deploy(src, dst)
+          #
+          # At the time of deploy ACLs are correctly configured on the
+          # dst. This would be a simple atomic move operations in
+          # windows was not converting inherited ACLs of src to
+          # non-inherited ACLs in certain cases.See:
+          # http://blogs.msdn.com/b/oldnewthing/archive/2006/08/24/717181.aspx
+          #
+
+          #
+          # First cache the ACLs of dst file
+          #
+
+          dst_so = Security::SecurableObject.new(dst)
+          begin
+            # get the sd with the SACL
+            dst_sd = dst_so.security_descriptor(true)
+          rescue Chef::Exceptions::Win32APIError
+            # 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."
+          end
+
+          if dst_sd.dacl_present?
+            apply_dacl = ACL.create(dst_sd.dacl.select { |ace| !ace.inherited? })
+          end
+
+          if dst_sd.sacl_present?
+            apply_sacl = ACL.create(dst_sd.sacl.select { |ace| !ace.inherited? })
+          end
+
+          #
+          # Then deploy the file
+          #
+
+          FileUtils.mv(src, dst)
+
+          #
+          # Then apply the cached acls to the new dst file
+          #
+
+          dst_so = Security::SecurableObject.new(dst)
+          dst_so.group = dst_sd.group
+          dst_so.owner = dst_sd.owner
+          dst_so.set_dacl(apply_dacl, dst_sd.dacl_inherits?) if dst_sd.dacl_present?
+          dst_so.set_sacl(apply_sacl, dst_sd.sacl_inherits?) if dst_sd.sacl_present?
+
+        end
+      end
+    end
+  end
+end
+

data/lib/chef/file_content_management/tempfile.rb

@@ -0,0 +1,61 @@
+#
+# Author:: Lamont Granquist (<lamont@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "tempfile"
+
+class Chef
+  class FileContentManagement
+    class Tempfile
+
+      attr_reader :new_resource
+
+      def initialize(new_resource)
+        @new_resource = new_resource
+      end
+
+      def tempfile
+        @tempfile ||= tempfile_open
+      end
+
+      private
+
+      def tempfile_open
+        tf = ::Tempfile.open(tempfile_basename, tempfile_dirname)
+        # We always process the tempfile in binmode so that we
+        # preserve the line endings of the content.
+        tf.binmode
+        tf
+      end
+
+      #
+      # These are important for windows to get permissions right, and may
+      # be useful for SELinux and other ACL approaches.  Please use them
+      # as the arguments to Tempfile.new() consistently.
+      #
+      def tempfile_basename
+        basename = ::File.basename(@new_resource.name)
+        basename.insert 0, "." unless Chef::Platform.windows?  # dotfile if we're not on windows
+        basename
+      end
+
+      def tempfile_dirname
+        Chef::Config[:file_staging_uses_destdir] ? ::File.dirname(@new_resource.path) : Dir::tmpdir
+      end
+    end
+  end
+end

data/lib/chef/formatters/base.rb

@@ -50,7 +50,7 @@ class Chef
     #--
     # TODO: is it too clever to be defining new() on a module like this?
     def self.new(name, out, err)
-      formatter_class = by_name(name) or
+      formatter_class = by_name(name.to_s) or
         raise UnknownFormatter, "No output formatter found for #{name} (available: #{available_formatters.join(', ')})"
 
       formatter_class.new(out, err)
@@ -62,6 +62,9 @@ class Chef
     # TODO: Duplicates functionality from knife, upfactor.
     class Outputter
 
+      attr_reader :out
+      attr_reader :err
+
       def initialize(out, err)
         @out, @err = out, err
       end

data/lib/chef/formatters/doc.rb

@@ -162,7 +162,7 @@ class Chef
       # Called when a resource action has been skipped b/c of a conditional
       def resource_skipped(resource, action, conditional)
         # TODO: more info about conditional
-        puts " (skipped due to #{conditional.positivity})"
+        puts " (skipped due to #{conditional.short_description})"
       end
 
       # Called after #load_current_resource has run.

data/lib/chef/formatters/error_descriptor.rb

@@ -31,7 +31,7 @@ class Chef
       end
 
       def section(heading, text)
-        @sections << [heading, text]
+        @sections << {heading => text}
       end
 
       def display(out)
@@ -40,7 +40,9 @@ class Chef
         out.puts "=" * 80
         out.puts "\n"
         sections.each do |section|
-          display_section(section, out)
+          section.each do |heading, text|
+            display_section(heading, text, out)
+          end
         end
       end
 
@@ -53,8 +55,7 @@ class Chef
 
       private
 
-      def display_section(section, out)
-        heading, text = section
+      def display_section(heading, text, out)
         out.puts heading
         out.puts "-" * heading.size
         out.puts text

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

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -80,6 +80,9 @@ E
         def describe_412_error(error_description)
           explanation = ""
           error_reasons = extract_412_error_message
+
+          # Prepare the error message if there is detailed information
+          # about individual cookbooks.
           if !error_reasons.respond_to?(:key?)
             explanation << error_reasons.to_s
           else
@@ -99,7 +102,24 @@ E
             end
           end
 
-          error_description.section("Missing Cookbooks:", explanation)
+          if !explanation.empty?
+            error_description.section("Missing Cookbooks:", explanation)
+          else
+            # If we don't have any cookbook details print a more
+            # generic error message.
+            if error_reasons.respond_to?(:key?) && error_reasons["message"]
+              explanation << "Error message: #{error_reasons["message"]}\n"
+            end
+
+            explanation << <<EOM
+You might be able to resolve this issue with:
+  1-) Removing cookbook versions that depend on deleted cookbooks.
+  2-) Removing unused cookbook versions.
+  3-) Pinning exact cookbook versions using environments.
+EOM
+            error_description.section("Cookbook dependency resolution error:", explanation)
+          end
+
           error_description.section("Expanded Run List:", expanded_run_list_ul)
         end
 

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

@@ -50,6 +50,14 @@ class Chef
           if exception.respond_to?(:source_listing)
             error_description.section("Template Context:", "#{exception.source_location}\n#{exception.source_listing}")
           end
+
+          if Chef::Platform.windows?
+            require 'chef/win32/security'
+
+            if !Chef::ReservedNames::Win32::Security.has_admin_privileges?
+              error_description.section("Missing Windows Admin Privileges", "chef-client doesn't have administrator privileges. This can be a possible reason for the resource failure.")
+            end
+          end
         end
 
         def recipe_snippet

data/lib/chef/json_compat.rb

@@ -37,10 +37,9 @@ class Chef
     CHEF_SANDBOX            = "Chef::Sandbox".freeze
     CHEF_RESOURCE           = "Chef::Resource".freeze
     CHEF_RESOURCECOLLECTION = "Chef::ResourceCollection".freeze
-    CHEF_WEBUIUSER          = "Chef::WebUIUser".freeze
-    CHEF_OPENIDREGISTRAION  = "Chef::OpenIDRegistration".freeze
 
     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.
@@ -56,8 +55,11 @@ class Chef
       def from_json(source, opts = {})
         obj = ::Yajl::Parser.parse(source)
 
-        unless obj.kind_of?(Hash) || obj.kind_of?(Array)
-          raise JSON::ParserError, "Top level JSON object must be a Hash or Array (actual: #{obj.class})"
+        # 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
+        # same limitation. For compatibility, we re-impose this condition.
+        unless obj.kind_of?(Hash) or obj.kind_of?(Array)
+          raise JSON::ParserError, "Top level JSON object must be a Hash or Array. (actual: #{obj.class})"
         end
 
         # The old default in the json gem (which we are mimicing because we
@@ -69,14 +71,12 @@ class Chef
         else
           obj
         end
-      rescue Yajl::ParseError => e
-        raise JSON::ParserError, e.message
       end
 
       # Look at an object that's a basic type (from json parse) and convert it
       # to an instance of Chef classes if desired.
       def map_to_rb_obj(json_obj)
-        res = case json_obj
+        case json_obj
         when Hash
           mapped_hash = map_hash_to_rb_obj(json_obj)
           if json_obj.has_key?(JSON_CLASS) && (class_to_inflate = class_for_json_class(json_obj[JSON_CLASS]))
@@ -89,7 +89,6 @@ class Chef
         else
           json_obj
         end
-        res
       end
 
       def map_hash_to_rb_obj(json_hash)
@@ -108,6 +107,10 @@ class Chef
       end
 
 
+      # Map +json_class+ to a Class object. We use a +case+ instead of a Hash
+      # assigned to a constant because otherwise this file could not be loaded
+      # until all the constants were defined, which means you'd have to load
+      # the world to get json, which would make knife very slow.
       def class_for_json_class(json_class)
         case json_class
         when CHEF_APICLIENT
@@ -127,15 +130,14 @@ class Chef
         when CHEF_ROLE
           Chef::Role
         when CHEF_SANDBOX
-          Chef::Sandbox
+          # a falsey return here will disable object inflation/"create
+          # additions" in the caller. In Chef 11 this is correct, we just have
+          # a dummy Chef::Sandbox class for compat with Chef 10 servers.
+          false
         when CHEF_RESOURCE
           Chef::Resource
         when CHEF_RESOURCECOLLECTION
           Chef::ResourceCollection
-        when CHEF_WEBUIUSER
-          Chef::WebUIUser
-        when CHEF_OPENIDREGISTRAION
-          Chef::OpenIDRegistration
         when /^Chef::Resource/
           Chef::Resource.find_subclass_by_name(json_class)
         else
@@ -146,4 +148,3 @@ class Chef
     end
   end
 end
-