chef 11.14.2-x86-mingw32 → 11.14.6-x86-mingw32

data/spec/data/mac_users/10.9.shadow.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>SALTED-SHA512-PBKDF2</key>
+        <dict>
+                <key>entropy</key>
+                <data>
+                EmAakNsXy/i6SAjmOC+w07nYpsGhkEd79oCrIa+2BlRnE25VzCCKb3QVbj2v
+                IPsTNp70t7r6BH2ANZ+0akikrczVSOuzOFGwk0fMqENBp/k6JxRzQ/ifuEP7
+                RsABfSZK+kl2uqz5QbkVvR7ByiTDCz51ngJAPgL1n+f/WTinY2w=
+                </data>
+                <key>iterations</key>
+                <integer>34482</integer>
+                <key>salt</key>
+                <data>
+                7pVL5HL9xg3fiUhHgUM5k2JfAGr27IEMCPSafkE5RqE=
+                </data>
+        </dict>
+</dict>
+</plist>

data/spec/functional/resource/env_spec.rb

@@ -0,0 +1,137 @@
+#
+# Author:: Adam Edwards (<adamed@getchef.com>)
+# Copyright:: Copyright (c) 2014 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::Resource::Env, :windows_only do
+  context 'when running on Windows' do
+    let(:chef_env_test_lower_case) { 'chefenvtest' }
+    let(:chef_env_test_mixed_case) { 'chefENVtest' }
+    let(:env_value1) { 'value1' }
+    let(:env_value2) { 'value2' }
+    let(:test_run_context) {
+      node = Chef::Node.new
+      node.default['platform'] = 'windows'
+      node.default['platform_version'] = '6.1'
+      empty_events = Chef::EventDispatch::Dispatcher.new
+      Chef::RunContext.new(node, {}, empty_events)
+    }
+    let(:test_resource) { 
+      Chef::Resource::Env.new('unknown', test_run_context) 
+    } 
+
+    before(:each) do
+      resource_lower = Chef::Resource::Env.new(chef_env_test_lower_case, test_run_context)
+      resource_lower.run_action(:delete)
+      resource_mixed = Chef::Resource::Env.new(chef_env_test_mixed_case, test_run_context)
+      resource_mixed.run_action(:delete)
+    end
+
+    context "when the create action is invoked" do
+      it 'should create an environment variable for action create' do
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        test_resource.run_action(:create)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+      end
+
+      it "should modify an existing variable's value to a new value and preserve the original name and preseve the original variable's name" do
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        test_resource.run_action(:create)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+        test_resource.value(env_value2)
+        test_resource.run_action(:create)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value2)
+      end
+
+      it "should modify an existing variable's value to a new value if the variable name case differs from the existing variable" do
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        test_resource.run_action(:create)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+        test_resource.key_name(chef_env_test_mixed_case)
+        test_resource.value(env_value2)
+        test_resource.run_action(:create)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value2)
+      end
+    end
+
+    context "when the modify action is invoked" do
+      it "should raise an exception for modify if the variable doesn't exist" do
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        expect {test_resource.run_action(:modify) }.to raise_error(Chef::Exceptions::Env)
+      end
+
+      it "should modify an existing variable's value to a new value" do
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        test_resource.run_action(:create)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+        test_resource.value(env_value2)
+        test_resource.run_action(:modify)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value2)
+      end
+
+      # This examlpe covers Chef Issue #1754
+      it "should modify an existing variable's value to a new value if the variable name case differs from the existing variable" do
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        test_resource.run_action(:create)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+        test_resource.key_name(chef_env_test_mixed_case)
+        test_resource.value(env_value2)
+        test_resource.run_action(:modify)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value2)
+      end
+    end
+
+    context "when the delete action is invoked" do
+      it "should delete an environment variable" do
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        test_resource.run_action(:create)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+        test_resource.run_action(:delete)
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+      end
+
+      it "should not raise an exception when a non-existent environment variable is deleted" do
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        expect{test_resource.run_action(:delete)}.not_to raise_error
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+      end
+
+      it "should delete an existing variable's value to a new value if the specified variable name case differs from the existing variable" do
+        test_resource.key_name(chef_env_test_lower_case)
+        test_resource.value(env_value1)
+        test_resource.run_action(:create)
+        expect(ENV[chef_env_test_lower_case]).to eq(env_value1)
+        test_resource.key_name(chef_env_test_mixed_case)
+        test_resource.run_action(:delete)
+        expect(ENV[chef_env_test_lower_case]).to eq(nil)
+        expect(ENV[chef_env_test_mixed_case]).to eq(nil)
+      end
+    end
+  end
+end

data/spec/functional/resource/user/dscl_spec.rb

@@ -0,0 +1,198 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software, 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'
+require 'chef/mixin/shell_out'
+
+metadata = {
+  :unix_only => true,
+  :requires_root => true,
+  :provider => {:user => Chef::Provider::User::Dscl}
+}
+
+describe "Chef::Resource::User with Chef::Provider::User::Dscl provider", metadata do
+  include Chef::Mixin::ShellOut
+
+  def clean_user
+    begin
+      shell_out!("/usr/bin/dscl . -delete '/Users/#{username}'")
+    rescue Mixlib::ShellOut::ShellCommandFailed
+      # Raised when the user is already cleaned
+    end
+  end
+
+  def user_should_exist
+    shell_out("/usr/bin/dscl . -ls /Users").stdout.should include username
+  end
+
+  def check_password(pass)
+    # In order to test the password we use dscl passwd command since
+    # that's the only command that gets the user password from CLI.
+    shell_out("dscl . -passwd /Users/greatchef #{pass} new_password").exitstatus.should == 0
+    # Now reset the password back
+    shell_out("dscl . -passwd /Users/greatchef new_password #{pass}").exitstatus.should == 0
+  end
+
+  let(:node) do
+    n = Chef::Node.new
+    n.consume_external_attrs(OHAI_SYSTEM.data.dup, {})
+    n
+  end
+
+  let(:events) do
+    Chef::EventDispatch::Dispatcher.new
+  end
+
+  let(:run_context) do
+    Chef::RunContext.new(node, {}, events)
+  end
+
+  let(:username) do
+    "greatchef"
+  end
+
+  let(:uid) { nil }
+  let(:gid) { 20 }
+  let(:home) { nil }
+  let(:manage_home) { false }
+  let(:password) { "XXXYYYZZZ" }
+  let(:comment) { "Great Chef" }
+  let(:shell) { "/bin/bash" }
+  let(:salt) { nil }
+  let(:iterations) { nil }
+
+  let(:user_resource) do
+    r = Chef::Resource::User.new("TEST USER RESOURCE", run_context)
+    r.username(username)
+    r.uid(uid)
+    r.gid(gid)
+    r.home(home)
+    r.shell(shell)
+    r.comment(comment)
+    r.manage_home(manage_home)
+    r.password(password)
+    r.salt(salt)
+    r.iterations(iterations)
+    r
+  end
+
+  before do
+    clean_user
+  end
+
+  after(:each) do
+    clean_user
+  end
+
+  describe "action :create" do
+    it "should create the user" do
+      user_resource.run_action(:create)
+      user_should_exist
+      check_password(password)
+    end
+  end
+
+  describe "when user exists" do
+    before do
+      existing_resource = user_resource.dup
+      existing_resource.run_action(:create)
+      user_should_exist
+    end
+
+    describe "when password is updated" do
+      it "should update the password of the user" do
+        user_resource.password("mykitchen")
+        user_resource.run_action(:create)
+        check_password("mykitchen")
+      end
+    end
+  end
+
+  describe "when password is being set via shadow hash" do
+    let(:password) {
+      if node[:platform_version].start_with?("10.7.")
+        # On Mac 10.7 we only need to set the password
+        "c9b3bd1a0cde797eef0eff16c580dab996ba3a21961cccc\
+d0f5e65c61558243e50b1a490088bd4824e3b35562d383ca02260398\
+ef1979b302212ec1c5383d1d05fc8d843"
+      else
+        "c734b6e4787c3727bb35e29fdd92b97c\
+1de12df509577a045728255ec7c6c5f5\
+c18efa05ed02b682ffa7ebc05119900e\
+b1d4880833aa7a190afc13e2bf0936b8\
+20123e8c98f0f9bcac2a629d9163caac\
+9464a8c234f3919082400b4f939bb77b\
+c5adbbac718b7eb99463a7b679571e0f\
+1c9fef2ef08d0b9e9c2bcf644eed2ffc"
+      end
+    }
+
+    let(:iterations) { 25000 }
+    let(:salt) { "9e2e7d5ee473b496fd24cf0bbfcaedfcb291ee21740e570d1e917e874f8788ca" }
+
+    it "action :create should create the user" do
+      user_resource.run_action(:create)
+      user_should_exist
+      check_password("soawesome")
+    end
+
+    describe "when user exists" do
+      before do
+        existing_resource = user_resource.dup
+        existing_resource.run_action(:create)
+        user_should_exist
+      end
+
+      describe "when password is updated" do
+        it "should update the password of the user" do
+          user_resource.password("mykitchen")
+          user_resource.run_action(:create)
+          check_password("mykitchen")
+        end
+      end
+    end
+  end
+
+  describe "when a user is member of some groups" do
+    let(:groups) { ["staff", "operator"] }
+
+    before do
+      existing_resource = user_resource.dup
+      existing_resource.run_action(:create)
+
+      groups.each do |group|
+        shell_out!("/usr/bin/dscl . -append '/Groups/#{group}' GroupMembership #{username}")
+      end
+    end
+
+    after do
+      groups.each do |group|
+        # Do not raise an error when user is correctly removed
+        shell_out("/usr/bin/dscl . -delete '/Groups/#{group}' GroupMembership #{username}")
+      end
+    end
+
+    it ":remove action removes the user from the groups and deletes the user"do
+      user_resource.run_action(:remove)
+      groups.each do |group|
+        # Do not raise an error when group is empty
+        shell_out("dscl . read /Groups/staff GroupMembership").stdout.should_not include(group)
+      end
+    end
+  end
+
+end

data/spec/functional/resource/{user_spec.rb → user/useradd_spec.rb}

@@ -25,7 +25,7 @@ metadata = { :unix_only => true,
   :provider => {:user => Chef::Provider::User::Useradd}
 }
 
-describe Chef::Resource::User, metadata do
+describe Chef::Provider::User::Useradd, metadata do
 
   include Chef::Mixin::ShellOut
 

data/spec/support/lib/chef/resource/zen_follower.rb

@@ -0,0 +1,46 @@
+#
+# Copyright:: Copyright (c) 2014 Chef Software, 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/knife'
+require 'chef/json_compat'
+
+class Chef
+  class Resource
+    class ZenFollower < Chef::Resource
+      attr_accessor :created_as_type
+
+      provides :follower, :on_platforms => ["zen"]
+
+      def initialize(name, run_context=nil)
+        @resource_name = :zen_follower
+        @created_as_type = "zen_follower"
+        super
+      end
+
+      def to_s
+        "#{created_as_type}[#{name}]"
+      end
+
+      def master(arg=nil)
+        if !arg.nil?
+          @master = arg
+        end
+        @master
+      end
+    end
+  end
+end

data/spec/unit/application_spec.rb

@@ -255,7 +255,12 @@ describe Chef::Application do
 
       it "should set ENV['http_proxy']" do
         @app.configure_proxy_environment_variables
-        @env['http_proxy'].should == "http://#{address}:#{port}"
+        @env['http_proxy'].should == "#{scheme}://#{address}:#{port}"
+      end
+
+      it "should set ENV['HTTP_PROXY']" do
+        @app.configure_proxy_environment_variables
+        @env['HTTP_PROXY'].should == "#{scheme}://#{address}:#{port}"
       end
 
       describe "when Chef::Config[:http_proxy_user] is set" do
@@ -265,7 +270,8 @@ describe Chef::Application do
 
         it "should set ENV['http_proxy'] with the username" do
           @app.configure_proxy_environment_variables
-          @env['http_proxy'].should == "http://username@#{address}:#{port}"
+          @env['http_proxy'].should == "#{scheme}://username@#{address}:#{port}"
+          @env['HTTP_PROXY'].should == "#{scheme}://username@#{address}:#{port}"
         end
 
         context "when :http_proxy_user contains '@' and/or ':'" do
@@ -275,7 +281,8 @@ describe Chef::Application do
 
           it "should set ENV['http_proxy'] with the escaped username" do
             @app.configure_proxy_environment_variables
-            @env['http_proxy'].should == "http://my%3Ausern%40me@#{address}:#{port}"
+            @env['http_proxy'].should == "#{scheme}://my%3Ausern%40me@#{address}:#{port}"
+            @env['HTTP_PROXY'].should == "#{scheme}://my%3Ausern%40me@#{address}:#{port}"
           end
         end
 
@@ -286,7 +293,8 @@ describe Chef::Application do
 
           it "should set ENV['http_proxy'] with the password" do
             @app.configure_proxy_environment_variables
-            @env['http_proxy'].should == "http://username:password@#{address}:#{port}"
+            @env['http_proxy'].should == "#{scheme}://username:password@#{address}:#{port}"
+            @env['HTTP_PROXY'].should == "#{scheme}://username:password@#{address}:#{port}"
           end
 
           context "when :http_proxy_pass contains '@' and/or ':'" do
@@ -296,7 +304,8 @@ describe Chef::Application do
 
             it "should set ENV['http_proxy'] with the escaped password" do
               @app.configure_proxy_environment_variables
-              @env['http_proxy'].should == "http://username:%3AP%40ssword101@#{address}:#{port}"
+              @env['http_proxy'].should == "#{scheme}://username:%3AP%40ssword101@#{address}:#{port}"
+              @env['HTTP_PROXY'].should == "#{scheme}://username:%3AP%40ssword101@#{address}:#{port}"
             end
           end
         end
@@ -310,7 +319,8 @@ describe Chef::Application do
 
         it "should set ENV['http_proxy']" do
           @app.configure_proxy_environment_variables
-          @env['http_proxy'].should == "http://#{address}:#{port}"
+          @env['http_proxy'].should == "#{scheme}://#{address}:#{port}"
+          @env['HTTP_PROXY'].should == "#{scheme}://#{address}:#{port}"
         end
       end
     end
@@ -338,30 +348,43 @@ describe Chef::Application do
 
       describe "when Chef::Config[:http_proxy] is set" do
         context "when given an FQDN" do
+          let(:scheme) { "http" }
+          let(:address) { "proxy.example.org" }
+          let(:port) { 8080 }
+          let(:http_proxy) { "#{scheme}://#{address}:#{port}" }
+
+          it_should_behave_like "setting ENV['http_proxy']"
+        end
+
+        context "when given an HTTPS URL" do
+          let(:scheme) { "https" }
           let(:address) { "proxy.example.org" }
           let(:port) { 8080 }
-          let(:http_proxy) { "http://#{address}:#{port}" }
+          let(:http_proxy) { "#{scheme}://#{address}:#{port}" }
 
           it_should_behave_like "setting ENV['http_proxy']"
         end
 
         context "when given an IP" do
+          let(:scheme) { "http" }
           let(:address) { "127.0.0.1" }
           let(:port) { 22 }
-          let(:http_proxy) { "http://#{address}:#{port}" }
+          let(:http_proxy) { "#{scheme}://#{address}:#{port}" }
 
           it_should_behave_like "setting ENV['http_proxy']"
         end
 
         context "when given an IPv6" do
+          let(:scheme) { "http" }
           let(:address) { "[2001:db8::1]" }
           let(:port) { 80 }
-          let(:http_proxy) { "http://#{address}:#{port}" }
+          let(:http_proxy) { "#{scheme}://#{address}:#{port}" }
 
           it_should_behave_like "setting ENV['http_proxy']"
         end
 
         context "when given without including http://" do
+          let(:scheme) { "http" }
           let(:address) { "proxy.example.org" }
           let(:port) { 8181 }
           let(:http_proxy) { "#{address}:#{port}" }