chef 11.4.4 → 11.6.0.hotfix.1

data/spec/unit/exceptions_spec.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Thomas Bishop (<bishop.thomas@gmail.com>)
 # Author:: Christopher Walters (<cw@opscode.com>)
+# Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
 # Copyright:: Copyright (c) 2010 Thomas Bishop
 # Copyright:: Copyright (c) 2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
@@ -62,7 +63,11 @@ describe Chef::Exceptions do
     Chef::Exceptions::ResourceNotFound => RuntimeError,
     Chef::Exceptions::InvalidResourceSpecification => ArgumentError,
     Chef::Exceptions::SolrConnectionError => RuntimeError,
-    Chef::Exceptions::InvalidDataBagPath => ArgumentError
+    Chef::Exceptions::InvalidDataBagPath => ArgumentError,
+    Chef::Exceptions::InvalidEnvironmentPath => ArgumentError,
+    Chef::Exceptions::EnvironmentNotFound => RuntimeError,
+    Chef::Exceptions::InvalidVersionConstraint => ArgumentError,
+    Chef::Exceptions::IllegalVersionConstraint => NotImplementedError
   }
 
   exception_to_super_class.each do |exception, expected_super_class|

data/spec/unit/file_access_control_spec.rb

@@ -36,7 +36,7 @@ describe Chef::FileAccessControl do
         @run_context = Chef::RunContext.new(@node, {}, @events)
         @current_resource = Chef::Resource::File.new('/tmp/different_file.txt')
         @provider_requirements = Chef::Provider::ResourceRequirements.new(@resource, @run_context)
-        @provider = mock("File provider", :requirements => @provider_requirements)
+        @provider = mock("File provider", :requirements => @provider_requirements, :manage_symlink_access? => false)
 
         @fac = Chef::FileAccessControl.new(@current_resource, @resource, @provider)
       end
@@ -105,7 +105,14 @@ describe Chef::FileAccessControl do
       @fac.target_uid.should == 4294967286
     end
 
+    it "wants to update the owner when the current owner is nil (creating a file)" do
+      @current_resource.owner(nil)
+      @resource.owner(2342)
+      @fac.should_update_owner?.should be_true
+    end
+
     it "wants to update the owner when the current owner doesn't match desired" do
+      @current_resource.owner(3224)
       @resource.owner(2342)
       @fac.should_update_owner?.should be_true
     end
@@ -171,6 +178,12 @@ describe Chef::FileAccessControl do
       lambda { @fac.target_gid; @provider_requirements.run(:create) }.should raise_error(ArgumentError)
     end
 
+    it "wants to update the group when the current group is nil (creating a file)" do
+      @resource.group(2342)
+      @current_resource.group(nil)
+      @fac.should_update_group?.should be_true
+    end
+
     it "wants to update the group when the current group doesn't match the target group" do
       @resource.group(2342)
       @current_resource.group(815)
@@ -232,7 +245,14 @@ describe Chef::FileAccessControl do
       fac.should_update_mode?.should be_false
     end
 
+    it "wants to update the mode when the current mode is nil (creating a file)" do
+      @resource.mode("0400")
+      @current_resource.mode(nil)
+      @fac.should_update_mode?.should be_true
+    end
+
     it "wants to update the mode when the desired mode does not match the current mode" do
+      @resource.mode("0400")
       @current_resource.mode("0644")
       @fac.should_update_mode?.should be_true
     end

data/spec/unit/file_content_management/deploy/cp_spec.rb

@@ -0,0 +1,46 @@
+#
+# Author:: Daniel DeLeo (<dan@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 'spec_helper'
+
+describe Chef::FileContentManagement::Deploy::Cp do
+
+  let(:content_deployer) { described_class.new }
+  let(:target_file_path) { "/etc/my_app.conf" }
+
+  describe "creating the file" do
+
+    it "touches the file to create it" do
+      FileUtils.should_receive(:touch).with(target_file_path)
+      content_deployer.create(target_file_path)
+    end
+  end
+
+  describe "updating the file" do
+
+    let(:staging_file_path) { "/tmp/random-dir/staging-file.tmp" }
+
+    it "copies the staging file's content" do
+      FileUtils.should_receive(:cp).with(staging_file_path, target_file_path)
+      content_deployer.deploy(staging_file_path, target_file_path)
+    end
+
+  end
+end
+
+

data/spec/unit/file_content_management/deploy/mv_unix_spec.rb

@@ -0,0 +1,103 @@
+#
+# Author:: Daniel DeLeo (<dan@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 'spec_helper'
+
+describe Chef::FileContentManagement::Deploy::MvUnix do
+
+  let(:content_deployer) { described_class.new }
+  let(:target_file_path) { "/etc/my_app.conf" }
+
+  describe "creating the file" do
+
+    it "touches the file to create it" do
+      FileUtils.should_receive(:touch).with(target_file_path)
+      content_deployer.create(target_file_path)
+    end
+  end
+
+  describe "updating the file" do
+
+    let(:staging_file_path) { "/tmp/random-dir/staging-file.tmp" }
+
+    let(:target_file_mode) { 0644 }
+    let(:target_file_stat) do
+      mock "File::Stat struct for target file",
+           :mode => target_file_mode,
+           :uid => target_file_uid,
+           :gid => target_file_gid
+    end
+
+    before do
+      File.should_receive(:stat).with(target_file_path).and_return(target_file_stat)
+      File.should_receive(:chmod).with(target_file_mode, staging_file_path).and_return(1)
+      FileUtils.should_receive(:mv).with(staging_file_path, target_file_path)
+    end
+
+    # This context represents the case where:
+    # * Chef runs as root
+    # * The owner and group of the target file match the owner and group of the
+    #   staging file.
+    context "when the user has permissions to set file ownership" do
+
+      # For the purposes of this test, the uid/gid can be anything. These
+      # values are just chosen because (assuming chef-client's euid == 1001 and
+      # egid == 1001), the `chown` call is allowed by the OS. See the
+      # description of `EPERM` in `man 2 chown` for reference.
+      let(:target_file_uid) { 1001 }
+      let(:target_file_gid) { 1001 }
+
+      before do
+        File.should_receive(:chown).with(target_file_uid, nil, staging_file_path).and_return(1)
+        File.should_receive(:chown).with(nil, target_file_gid, staging_file_path).and_return(1)
+      end
+
+      it "fixes up permissions and moves the file into place" do
+        content_deployer.deploy(staging_file_path, target_file_path)
+      end
+
+    end
+
+    context "when the user does not have permissions to set file ownership" do
+
+      # The test code does not care what these values are. These values are
+      # chosen because they're representitive of the case that chef-client is
+      # running as non-root and is managing a file that got ownership set to
+      # root somehow. In this example, gid==20 is something like "staff" which
+      # the user running chef-client is a member of (but it's not that user's
+      # primary group).
+      let(:target_file_uid) { 0 }
+      let(:target_file_gid) { 20 }
+
+      before do
+        File.should_receive(:chown).with(target_file_uid, nil, staging_file_path).and_raise(Errno::EPERM)
+        File.should_receive(:chown).with(nil, target_file_gid, staging_file_path).and_raise(Errno::EPERM)
+
+        Chef::Log.should_receive(:warn).with(/^Could not set uid/)
+        Chef::Log.should_receive(:warn).with(/^Could not set gid/)
+      end
+
+      it "fixes up permissions and moves the file into place" do
+        content_deployer.deploy(staging_file_path, target_file_path)
+      end
+    end
+
+  end
+end
+
+

data/spec/unit/file_content_management/deploy/mv_windows_spec.rb

@@ -0,0 +1,179 @@
+#
+# Author:: Daniel DeLeo (<dan@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 'spec_helper'
+
+unless Chef::Platform.windows?
+  class Chef
+    module ReservedNames
+      module Win32
+        module Security
+          ACL = Object.new
+          SecurableObject = Object.new
+        end
+      end
+    end
+  end
+end
+
+require 'chef/file_content_management/deploy/mv_windows'
+
+describe Chef::FileContentManagement::Deploy::MvWindows do
+
+  let(:content_deployer) { described_class.new }
+  let(:target_file_path) { "/etc/my_app.conf" }
+
+  describe "creating the file" do
+
+    it "touches the file to create it" do
+      FileUtils.should_receive(:touch).with(target_file_path)
+      content_deployer.create(target_file_path)
+    end
+  end
+
+  describe "updating the file" do
+
+    let(:staging_file_path) { "/tmp/random-dir/staging-file.tmp" }
+
+    let(:target_file_security_object) do
+      mock "Securable Object for target file"
+    end
+
+    let(:updated_target_security_object) do
+      mock "Securable Object for target file after staging file deploy"
+    end
+
+    before do
+      Chef::ReservedNames::Win32::Security::SecurableObject.
+        stub(:new).
+        with(target_file_path).
+        and_return(target_file_security_object, updated_target_security_object)
+
+    end
+
+    context "when run without adminstrator privileges" do
+      before do
+        target_file_security_object.should_receive(:security_descriptor).and_raise(Chef::Exceptions::Win32APIError)
+      end
+
+      it "errors out with a WindowsNotAdmin error" do
+        lambda { content_deployer.deploy(staging_file_path, target_file_path)}.should raise_error(Chef::Exceptions::WindowsNotAdmin)
+      end
+
+    end
+
+    context "when run with administrator privileges" do
+
+      let(:original_target_file_owner) { mock("original target file owner") }
+      let(:original_target_file_group) { mock("original target file group") }
+
+      let(:target_file_security_descriptor) do
+        mock "security descriptor for target file",
+             :group => original_target_file_group,
+             :owner => original_target_file_owner
+      end
+
+      let(:updated_target_security_descriptor) do
+        mock "security descriptor for target file"
+      end
+
+
+      before do
+        target_file_security_object.stub(:security_descriptor).and_return(target_file_security_descriptor)
+
+        FileUtils.should_receive(:mv).with(staging_file_path, target_file_path)
+
+        updated_target_security_object.should_receive(:group=).with(original_target_file_group)
+        updated_target_security_object.should_receive(:owner=).with(original_target_file_owner)
+      end
+
+      context "and the target file has no dacl or sacl" do
+
+        before do
+          target_file_security_descriptor.stub(:dacl_present?).and_return(false)
+          target_file_security_descriptor.stub(:sacl_present?).and_return(false)
+        end
+
+        it "fixes up permissions and moves the file into place" do
+          content_deployer.deploy(staging_file_path, target_file_path)
+        end
+
+      end
+
+      context "and the target has a dacl and sacl" do
+        let(:inherited_dacl_ace) { mock("Windows dacl ace (inherited)", :inherited? => true) }
+        let(:not_inherited_dacl_ace) { mock("Windows dacl ace (not inherited)", :inherited? => false) }
+
+        let(:original_target_file_dacl) { [inherited_dacl_ace, not_inherited_dacl_ace] }
+
+        let(:inherited_sacl_ace) { mock("Windows sacl ace (inherited)", :inherited? => true) }
+        let(:not_inherited_sacl_ace) { mock("Windows sacl ace (not inherited)", :inherited? => false) }
+        let(:original_target_file_sacl) { [inherited_sacl_ace, not_inherited_sacl_ace] }
+
+        let(:custom_dacl) { mock("Windows ACL for non-inherited dacl aces") }
+        let(:custom_sacl) { mock("Windows ACL for non-inherited sacl aces") }
+
+        before do
+          target_file_security_descriptor.stub(:dacl_present?).and_return(true)
+          target_file_security_descriptor.stub(:dacl_inherits?).and_return(dacl_inherits?)
+
+          target_file_security_descriptor.stub(:dacl).and_return(original_target_file_dacl)
+          Chef::ReservedNames::Win32::Security::ACL.
+            should_receive(:create).
+            with([not_inherited_dacl_ace]).
+            and_return(custom_dacl)
+
+          target_file_security_descriptor.stub(:sacl_present?).and_return(true)
+          target_file_security_descriptor.stub(:sacl_inherits?).and_return(sacl_inherits?)
+
+          target_file_security_descriptor.stub(:sacl).and_return(original_target_file_sacl)
+          Chef::ReservedNames::Win32::Security::ACL.
+            should_receive(:create).
+            with([not_inherited_sacl_ace]).
+            and_return(custom_sacl)
+
+          updated_target_security_object.should_receive(:set_dacl).with(custom_dacl, dacl_inherits?)
+          updated_target_security_object.should_receive(:set_sacl).with(custom_sacl, sacl_inherits?)
+        end
+
+        context "and the dacl and sacl don't inherit" do
+          let(:dacl_inherits?) { false }
+          let(:sacl_inherits?) { false }
+
+          it "fixes up permissions and moves the file into place" do
+            content_deployer.deploy(staging_file_path, target_file_path)
+          end
+        end
+
+        context "and the dacl and sacl inherit" do
+          let(:dacl_inherits?) { true }
+          let(:sacl_inherits?) { true }
+
+          it "fixes up permissions and moves the file into place" do
+            content_deployer.deploy(staging_file_path, target_file_path)
+          end
+        end
+
+      end
+
+    end
+
+  end
+end
+
+

data/spec/unit/formatters/error_inspectors/cookbook_resolve_error_inspector_spec.rb

@@ -24,8 +24,9 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
     @expanded_run_list = Chef::RunList.new("recipe[annoyances]", "recipe[apache2]", "recipe[users]", "recipe[chef::client]")
 
     @description = Chef::Formatters::ErrorDescription.new("Error Resolving Cookbooks for Run List:")
-    @outputter = Chef::Formatters::Outputter.new(StringIO.new, STDERR)
-    #@outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
+    @outputter_output = StringIO.new
+    @outputter = Chef::Formatters::Outputter.new(@outputter_output, STDERR)
+    # @outputter = Chef::Formatters::Outputter.new(STDOUT, STDERR)
   end
 
   describe "when explaining a 403 error" do
@@ -63,6 +64,36 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
 
     it "prints a pretty message" do
       @description.display(@outputter)
+      @outputter_output.rewind
+      observed_output = @outputter_output.read
+      observed_output.should include("apache2")
+      observed_output.should include("users")
+      observed_output.should_not include("Run list contains invalid items: no such cookbook nope.")
+    end
+
+  end
+
+  describe "when explaining a PreconditionFailed (412) error with current error message style without cookbook details" do
+    # Chef currently returns error messages with some fields as JSON strings,
+    # which must be re-parsed to get the actual data.
+    # In some cases the error message doesn't contain any cookbook
+    # details. But we should still print a pretty error message.
+
+    before do
+
+      @response_body = "{\"error\":[{\"non_existent_cookbooks\":[],\"cookbooks_with_no_versions\":[],\"message\":\"unable to solve dependencies in alotted time.\"}]}"
+      @response = Net::HTTPPreconditionFailed.new("1.1", "412", "(response) unauthorized")
+      @response.stub!(:body).and_return(@response_body)
+      @exception = Net::HTTPServerException.new("(exception) precondition failed", @response)
+
+      @inspector = Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector.new(@expanded_run_list, @exception)
+      @inspector.add_explanation(@description)
+    end
+
+    it "prints a pretty message" do
+      @description.display(@outputter)
+      @outputter_output.rewind
+      @outputter_output.read.should include("unable to solve dependencies in alotted time.")
     end
 
   end
@@ -84,6 +115,11 @@ describe Chef::Formatters::ErrorInspectors::CookbookResolveErrorInspector do
 
     it "prints a pretty message" do
       @description.display(@outputter)
+      @outputter_output.rewind
+      observed_output = @outputter_output.read
+      observed_output.should include("apache2")
+      observed_output.should include("users")
+      observed_output.should_not include("Run list contains invalid items: no such cookbook nope.")
     end
 
   end