chef 11.4.4 → 11.6.0.hotfix.1

data/lib/chef/environment.rb

@@ -2,6 +2,7 @@
 # Author:: Stephen Delano (<stephen@opscode.com>)
 # Author:: Seth Falcon (<seth@opscode.com>)
 # Author:: John Keiser (<jkeiser@ospcode.com>)
+# Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
 # Copyright:: Copyright 2010-2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -236,7 +237,32 @@ class Chef
     end
 
     def self.load(name)
-      chef_server_rest.get_rest("environments/#{name}")
+      if Chef::Config[:solo]
+        load_from_file(name)
+      else
+        chef_server_rest.get_rest("environments/#{name}")
+      end
+    end
+
+    def self.load_from_file(name)
+      unless File.directory?(Chef::Config[:environment_path])
+        raise Chef::Exceptions::InvalidEnvironmentPath, "Environment path '#{Chef::Config[:environment_path]}' is invalid"
+      end
+
+      js_file = File.join(Chef::Config[:environment_path], "#{name}.json")
+      rb_file = File.join(Chef::Config[:environment_path], "#{name}.rb")
+
+      if File.exists?(js_file)
+        # from_json returns object.class => json_class in the JSON.
+        Chef::JSONCompat.from_json(IO.read(js_file))
+      elsif File.exists?(rb_file)
+        environment = Chef::Environment.new
+        environment.name(name)
+        environment.from_file(rb_file)
+        environment
+      else
+        raise Chef::Exceptions::EnvironmentNotFound, "Environment '#{name}' could not be loaded from disk"
+      end
     end
 
     def destroy
@@ -276,8 +302,13 @@ class Chef
 
     def self.validate_cookbook_version(version)
       begin
-        Chef::VersionConstraint.new version
-        true
+        if Chef::Config[:solo]
+          raise Chef::Exceptions::IllegalVersionConstraint,
+                "Environment cookbook version constraints not allowed in chef-solo"
+        else
+          Chef::VersionConstraint.new version
+          true
+        end
       rescue ArgumentError
         false
       end

data/lib/chef/event_dispatch/base.rb

@@ -32,6 +32,9 @@ class Chef
       def run_start(version)
       end
 
+      def run_started(run_status)
+      end
+
       # Called at the end a successful Chef run.
       def run_completed(node)
       end

data/lib/chef/exceptions.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Seth Falcon (<seth@opscode.com>)
+# Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
 # Copyright:: Copyright 2008-2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -97,6 +98,8 @@ class Chef
     # Attempting to run windows code on a not-windows node
     class Win32NotWindows < RuntimeError; end
     class WindowsNotAdmin < RuntimeError; end
+    # Attempting to access a 64-bit only resource on a 32-bit Windows system
+    class Win32ArchitectureIncorrect < RuntimeError; end
     class ObsoleteDependencySyntax < ArgumentError; end
     class InvalidDataBagPath < ArgumentError; end
 
@@ -105,12 +108,16 @@ class Chef
     class CookbookVersionConflict < ArgumentError ; end
 
     # does not follow X.Y.Z format. ArgumentError?
+    class InvalidPlatformVersion < ArgumentError; end
     class InvalidCookbookVersion < ArgumentError; end
 
     # version constraint should be a string or array, or it doesn't
     # match OP VERSION. ArgumentError?
     class InvalidVersionConstraint < ArgumentError; end
 
+    # Version constraints are not allowed in chef-solo
+    class IllegalVersionConstraint < NotImplementedError; end
+
     # File operation attempted but no permissions to perform it
     class InsufficientPermissions < RuntimeError; end
 
@@ -130,8 +137,8 @@ class Chef
     # of merged attributes will trigger this error.
     class StaleAttributeRead < StandardError; end
 
-    #Registry Helper throws the following errors
-    class Win32RegArchitectureIncorrect < RuntimeError; end
+    # Registry Helper throws the following errors
+    class Win32RegArchitectureIncorrect < Win32ArchitectureIncorrect; end
     class Win32RegHiveMissing < ArgumentError; end
     class Win32RegKeyMissing < RuntimeError; end
     class Win32RegValueMissing < RuntimeError; end
@@ -143,6 +150,18 @@ class Chef
     class Win32RegBadValueSize < ArgumentError; end
     class Win32RegTypesMismatch < ArgumentError; end
 
+    class InvalidEnvironmentPath < ArgumentError; end
+    class EnvironmentNotFound < RuntimeError; end
+
+    # File-like resource found a non-file (socket, pipe, directory, etc) at its destination
+    class FileTypeMismatch < RuntimeError; end
+
+    # File (or descendent) resource configured to manage symlink source, but
+    # the symlink that is there either loops or points to a nonexistent file
+    class InvalidSymlink < RuntimeError; end
+
+    class ChildConvergeError < RuntimeError; end
+
     class MissingRole < RuntimeError
       NULL = Object.new
 
@@ -271,5 +290,11 @@ class Chef
 
     end # CookbookVersionSelection
 
+    # When the server sends a redirect, RFC 2616 states a user-agent should
+    # not follow it with a method other than GET or HEAD, unless a specific
+    # action is taken by the user. A redirect received as response to a
+    # non-GET and non-HEAD request will thus raise an InvalidRedirect.
+    class InvalidRedirect < StandardError; end
+
   end
 end

data/lib/chef/file_access_control/unix.rb

@@ -43,6 +43,11 @@ class Chef
         should_update_mode? || should_update_owner? || should_update_group?
       end
 
+      def define_resource_requirements
+        uid_from_resource(resource)
+        gid_from_resource(resource)
+      end
+
       def describe_changes
         changes = []
         changes << "change mode from '#{mode_to_s(current_mode)}' to '#{mode_to_s(target_mode)}'" if should_update_mode?
@@ -60,7 +65,23 @@ class Chef
       end
 
       def should_update_owner?
-        !target_uid.nil? && target_uid != current_uid
+        if target_uid.nil?
+          # the user has not specified a permission on the new resource, so we never manage it with FAC
+          Chef::Log.debug("found target_uid == nil, so no owner was specified on resource, not managing owner")
+          return false
+        elsif current_uid.nil?
+          # the user has specified a permission, and we are creating a file, so always enforce permissions
+          Chef::Log.debug("found current_uid == nil, so we are creating a new file, updating owner")
+          return true
+        elsif target_uid != current_uid
+          # the user has specified a permission, and it does not match the file, so fix the permission
+          Chef::Log.debug("found target_uid != current_uid, updating owner")
+          return true
+        else
+          Chef::Log.debug("found target_uid == current_uid, not updating owner")
+          # the user has specified a permission, but it matches the file, so behave idempotently
+          return false
+        end
       end
 
       def set_owner!
@@ -103,7 +124,23 @@ class Chef
       end
 
       def should_update_group?
-        !target_gid.nil? && target_gid != current_gid
+        if target_gid.nil?
+          # the user has not specified a permission on the new resource, so we never manage it with FAC
+          Chef::Log.debug("found target_gid == nil, so no group was specified on resource, not managing group")
+          return false
+        elsif current_gid.nil?
+          # the user has specified a permission, and we are creating a file, so always enforce permissions
+          Chef::Log.debug("found current_gid == nil, so we are creating a new file, updating group")
+          return true
+        elsif target_gid != current_gid
+          # the user has specified a permission, and it does not match the file, so fix the permission
+          Chef::Log.debug("found target_gid != current_gid, updating group")
+          return true
+        else
+          Chef::Log.debug("found target_gid == current_gid, not updating group")
+          # the user has specified a permission, but it matches the file, so behave idempotently
+          return false
+        end
       end
 
       def set_group!
@@ -136,7 +173,23 @@ class Chef
       end
 
       def should_update_mode?
-        !target_mode.nil? && current_mode != target_mode 
+        if target_mode.nil?
+          # the user has not specified a permission on the new resource, so we never manage it with FAC
+          Chef::Log.debug("found target_mode == nil, so no mode was specified on resource, not managing mode")
+          return false
+        elsif current_mode.nil?
+          # the user has specified a permission, and we are creating a file, so always enforce permissions
+          Chef::Log.debug("found current_mode == nil, so we are creating a new file, updating mode")
+          return true
+        elsif target_mode != current_mode
+          # the user has specified a permission, and it does not match the file, so fix the permission
+          Chef::Log.debug("found target_mode != current_mode, updating mode")
+          return true
+        else
+          Chef::Log.debug("found target_mode == current_mode, not updating mode")
+          # the user has specified a permission, but it matches the file, so behave idempotently
+          return false
+        end
       end
 
       def set_mode!
@@ -152,17 +205,21 @@ class Chef
       end
 
       def stat
-        if File.symlink?(file)
+        if manage_symlink_attrs?
           @stat ||= File.lstat(file)
         else
           @stat ||= File.stat(file)
         end
       end
 
+      def manage_symlink_attrs?
+        @provider.manage_symlink_access?
+      end
+
       private
 
       def chmod(mode, file)
-        if File.symlink?(file)
+        if manage_symlink_attrs?
           begin
             File.lchmod(mode, file)
           rescue NotImplementedError
@@ -174,7 +231,7 @@ class Chef
       end
 
       def chown(uid, gid, file)
-        if ::File.symlink?(file)
+        if manage_symlink_attrs?
           File.lchown(uid, gid, file)
         else
           File.chown(uid, gid, file)
@@ -192,7 +249,7 @@ class Chef
         end
       end
 
-      def uid_from_resource(resource) 
+      def uid_from_resource(resource)
         return nil if resource == nil or resource.owner.nil?
         if resource.owner.kind_of?(String)
           diminished_radix_complement( Etc.getpwnam(resource.owner).uid )

data/lib/chef/file_access_control/windows.rb

@@ -41,6 +41,10 @@ class Chef
         set_dacl
       end
 
+      def define_resource_requirements
+        # windows FAC has no assertions
+      end
+
       def requires_changes?
         should_update_dacl? || should_update_owner? || should_update_group?
       end
@@ -214,17 +218,24 @@ class Chef
       def calculate_flags(rights)
         # Handle inheritance flags
         flags = 0
-        case rights[:applies_to_children]
-        when :containers_only
-          flags |= CONTAINER_INHERIT_ACE
-        when :objects_only
-          flags |= OBJECT_INHERIT_ACE
-        when true
-          flags |= CONTAINER_INHERIT_ACE
-          flags |= OBJECT_INHERIT_ACE
-        when nil
-          flags |= CONTAINER_INHERIT_ACE
-          flags |= OBJECT_INHERIT_ACE
+
+        #
+        # Configure child inheritence only if the the resource is some
+        # type of a directory.
+        #
+        if resource.is_a? Chef::Resource::Directory
+          case rights[:applies_to_children]
+          when :containers_only
+            flags |= CONTAINER_INHERIT_ACE
+          when :objects_only
+            flags |= OBJECT_INHERIT_ACE
+          when true
+            flags |= CONTAINER_INHERIT_ACE
+            flags |= OBJECT_INHERIT_ACE
+          when nil
+            flags |= CONTAINER_INHERIT_ACE
+            flags |= OBJECT_INHERIT_ACE
+          end
         end
 
         if rights[:applies_to_self] == false

data/lib/chef/file_content_management/content_base.rb

@@ -0,0 +1,56 @@
+#
+# 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 ContentBase
+
+      attr_reader :run_context
+      attr_reader :new_resource
+      attr_reader :current_resource
+
+      def initialize(new_resource, current_resource, run_context)
+        @new_resource = new_resource
+        @current_resource = current_resource
+        @run_context = run_context
+        @tempfile_loaded = false
+      end
+
+      def tempfile
+        # tempfile may be nil, so we cannot use ||= here
+        if @tempfile_loaded
+          @tempfile
+        else
+          @tempfile_loaded = true
+          @tempfile = file_for_provider
+        end
+      end
+
+      private
+
+      #
+      # Return something that looks like a File or Tempfile and
+      # you must assume the provider will unlink this file.  Copy
+      # the contents to a Tempfile if you need to.
+      #
+      def file_for_provider
+        raise "class must implement file_for_provider!"
+      end
+    end
+  end
+end

data/lib/chef/file_content_management/deploy.rb

@@ -0,0 +1,38 @@
+#
+# 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 'chef/file_content_management/deploy/cp'
+require 'chef/file_content_management/deploy/mv_unix'
+if Chef::Platform.windows?
+  require 'chef/file_content_management/deploy/mv_windows'
+end
+
+class Chef
+  class FileContentManagement
+    class Deploy
+      def self.strategy(atomic_update)
+        if atomic_update
+          Chef::Platform.windows? ? MvWindows.new() : MvUnix.new()
+        else
+          Cp.new()
+        end
+      end
+    end
+  end
+end
+

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