chef 12.1.2-x86-mingw32 → 12.2.0.rc.1-x86-mingw32

data/lib/chef/util/powershell/cmdlet_result.rb

@@ -18,22 +18,35 @@
 
 require 'chef/json_compat'
 
-class Chef::Util::Powershell
+class Chef
+class Util
+class Powershell
   class CmdletResult
     attr_reader :output_format
 
-    def initialize(status, output_format)
+    def initialize(status, streams, output_format)
       @status = status
       @output_format = output_format
+      @streams = streams
     end
 
+    def stdout
+      @status.stdout
+    end
+    
     def stderr
       @status.stderr
     end
 
+    def stream(name)
+      @streams[name].read
+    end
+
     def return_value
       if output_format == :object
-        Chef::JSONCompat.parse(@status.stdout)
+        Chef::JSONCompat.parse(stream(:json))
+      elsif output_format == :json
+        stream(:json)
       else
         @status.stdout
       end
@@ -44,3 +57,5 @@ class Chef::Util::Powershell
     end
   end
 end
+end
+end

data/lib/chef/util/powershell/ps_credential.rb

@@ -0,0 +1,38 @@
+#
+# Author:: Jay Mundrawala (<jdm@chef.io>)
+#
+# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+#
+# 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/win32/crypto' if Chef::Platform.windows?
+
+class Chef::Util::Powershell
+  class PSCredential
+    def initialize(username, password)
+      @username = username
+      @password = password
+    end
+
+    def to_psobject
+      "New-Object System.Management.Automation.PSCredential('#{@username}',('#{encrypt(@password)}' | ConvertTo-SecureString))"
+    end
+
+    private
+
+    def encrypt(str)
+      Chef::ReservedNames::Win32::Crypto.encrypt(str)
+    end
+  end
+end

data/lib/chef/version.rb

@@ -17,7 +17,7 @@
 
 class Chef
   CHEF_ROOT = File.dirname(File.expand_path(File.dirname(__FILE__)))
-  VERSION = '12.1.2'
+  VERSION = '12.2.0.rc.1'
 end
 
 #

data/lib/chef/win32/api.rb

@@ -184,6 +184,8 @@ class Chef
         host.typedef :pointer, :PSTR # Pointer to a null-terminated string of 8-bit Windows (ANSI) characters. For more information, see Character Sets Used By Fonts.
         host.typedef :pointer, :PTBYTE # Pointer to a TBYTE.
         host.typedef :pointer, :PTCHAR # Pointer to a TCHAR.
+        host.typedef :pointer, :PCRYPTPROTECT_PROMPTSTRUCT # Pointer to a CRYPTOPROTECT_PROMPTSTRUCT.
+        host.typedef :pointer, :PDATA_BLOB # Pointer to a DATA_BLOB.
         host.typedef :pointer, :PTSTR # A PWSTR if UNICODE is defined, a PSTR otherwise.
         host.typedef :pointer, :PUCHAR # Pointer to a UCHAR.
         host.typedef :pointer, :PUHALF_PTR # Pointer to a UHALF_PTR.

data/lib/chef/win32/api/crypto.rb

@@ -0,0 +1,63 @@
+#
+# Author:: Jay Mundrawala (<jdm@chef.io>)
+# Copyright:: Copyright 2015 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/win32/api'
+
+class Chef
+  module ReservedNames::Win32
+    module API
+      module Crypto
+        extend Chef::ReservedNames::Win32::API
+
+        ###############################################
+        # Win32 API Bindings
+        ###############################################
+
+        ffi_lib 'Crypt32'
+
+        CRYPTPROTECT_UI_FORBIDDEN  = 0x1
+        CRYPTPROTECT_LOCAL_MACHINE = 0x4
+        CRYPTPROTECT_AUDIT         = 0x10
+
+        class CRYPT_INTEGER_BLOB < FFI::Struct
+          layout :cbData, :DWORD,   # Count, in bytes, of data 
+                 :pbData, :pointer  # Pointer to data buffer
+          def initialize(str=nil)
+            super(nil)
+            if str
+              self[:pbData] = FFI::MemoryPointer.from_string(str)
+              self[:cbData] = str.bytesize
+            end
+          end
+
+        end
+
+        safe_attach_function :CryptProtectData, [
+          :PDATA_BLOB, 
+          :LPCWSTR,
+          :PDATA_BLOB,
+          :pointer,
+          :PCRYPTPROTECT_PROMPTSTRUCT,
+          :DWORD,
+          :PDATA_BLOB
+        ], :BOOL
+
+      end
+    end
+  end
+end

data/lib/chef/win32/api/installer.rb

@@ -108,7 +108,7 @@ UINT MsiCloseHandle(
           end
 
           msi_close_handle(pkg_ptr.read_pointer)
-          return buffer
+          return buffer.chomp(0.chr)
         end
 
         # Opens a Microsoft Installer (MSI) file from an absolute path and returns a pointer to a handle

data/lib/chef/win32/crypto.rb

@@ -0,0 +1,49 @@
+#
+# Author:: Jay Mundrawala (<jdm@chef.io>)
+# Copyright:: Copyright 2015 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/win32/error'
+require 'chef/win32/api/memory'
+require 'chef/win32/api/crypto'
+require 'digest'
+
+class Chef
+  module ReservedNames::Win32
+    class Crypto
+      include Chef::ReservedNames::Win32::API::Crypto
+      extend Chef::ReservedNames::Win32::API::Crypto
+
+      def self.encrypt(str, &block)
+        data_blob = CRYPT_INTEGER_BLOB.new
+        unless CryptProtectData(CRYPT_INTEGER_BLOB.new(str.to_wstring), nil, nil, nil, nil, 0, data_blob)
+          Chef::ReservedNames::Win32::Error.raise!
+        end
+        bytes = data_blob[:pbData].get_bytes(0, data_blob[:cbData])
+        if block
+          block.call(bytes)
+        else
+          Digest.hexencode(bytes)
+        end
+      ensure
+        unless data_blob[:pbData].null?
+          Chef::ReservedNames::Win32::Memory.local_free(data_blob[:pbData])
+        end
+      end
+
+    end
+  end
+end

data/lib/chef/workstation_config_loader.rb

@@ -19,6 +19,7 @@
 require 'chef/config_fetcher'
 require 'chef/config'
 require 'chef/null_logger'
+require 'chef/util/path_helper'
 
 class Chef
 
@@ -112,9 +113,9 @@ class Chef
         candidate_configs << File.join(chef_config_dir, 'knife.rb')
       end
       # Look for $HOME/.chef/knife.rb
-      if env['HOME']
-        candidate_configs << File.join(env['HOME'], '.chef', 'config.rb')
-        candidate_configs << File.join(env['HOME'], '.chef', 'knife.rb')
+      Chef::Util::PathHelper.home('.chef') do |dot_chef_dir|
+        candidate_configs << File.join(dot_chef_dir, 'config.rb')
+        candidate_configs << File.join(dot_chef_dir, 'knife.rb')
       end
 
       candidate_configs.find do | candidate_config |

data/spec/functional/file_content_management/deploy_strategies_spec.rb

@@ -43,7 +43,7 @@ shared_examples_for "a content deploy strategy" do
 
     ##
     # UNIX Context
-    let(:default_mode) { normalize_mode(0100666 - File.umask) }
+    let(:default_mode) { normalize_mode(0666 & ~File.umask) }
 
     it "touches the file to create it (UNIX)", :unix_only do
       content_deployer.create(target_file_path)

data/spec/functional/resource/cookbook_file_spec.rb

@@ -32,7 +32,7 @@ describe Chef::Resource::CookbookFile do
     content
   end
 
-  let(:default_mode) { ((0100666 - File.umask) & 07777).to_s(8) }
+  let(:default_mode) { (0666 & ~File.umask).to_s(8) }
 
   it_behaves_like "a securable resource with reporting"
 

data/spec/functional/resource/deploy_revision_spec.rb

@@ -201,6 +201,41 @@ describe Chef::Resource::DeployRevision, :unix_only => true do
       end
     end
 
+    describe "setting default parameters to nil" do
+      before do
+        FileUtils.mkdir_p(rel_path("releases"))
+        FileUtils.mkdir_p(rel_path("shared"))
+      end
+
+      it "supports setting symlink_before_migrate to nil" do
+        deploy_to_latest_rev.symlink_before_migrate(nil)
+        expect(deploy_to_latest_rev.symlink_before_migrate).to eql(nil)
+        deploy_to_latest_rev.run_action(:deploy)
+        expect(deploy_to_latest_rev).to be_updated_by_last_action
+      end
+
+      it "supports setting symlinks to nil" do
+        deploy_to_latest_rev.symlinks(nil)
+        expect(deploy_to_latest_rev.symlinks).to eql(nil)
+        deploy_to_latest_rev.run_action(:deploy)
+        expect(deploy_to_latest_rev).to be_updated_by_last_action
+      end
+
+      it "supports setting purge_before_symlink to nil" do
+        deploy_to_latest_rev.purge_before_symlink(nil)
+        expect(deploy_to_latest_rev.purge_before_symlink).to eql(nil)
+        deploy_to_latest_rev.run_action(:deploy)
+        expect(deploy_to_latest_rev).to be_updated_by_last_action
+      end
+
+      it "supports setting create_dirs_before_symlink to nil" do
+        deploy_to_latest_rev.create_dirs_before_symlink(nil)
+        expect(deploy_to_latest_rev.create_dirs_before_symlink).to eql(nil)
+        deploy_to_latest_rev.run_action(:deploy)
+        expect(deploy_to_latest_rev).to be_updated_by_last_action
+      end
+    end
+
     describe "back to a previously deployed revision, with the directory structure precreated" do
       before do
         FileUtils.mkdir_p(rel_path("releases"))

data/spec/functional/resource/directory_spec.rb

@@ -23,7 +23,7 @@ describe Chef::Resource::Directory do
 
   let(:directory_base) { "directory_spec" }
 
-  let(:default_mode) { ((0100777 - File.umask) & 07777).to_s(8) }
+  let(:default_mode) { (0777 & ~File.umask).to_s(8) }
 
   def create_resource
     events = Chef::EventDispatch::Dispatcher.new

data/spec/functional/resource/dsc_resource_spec.rb

@@ -0,0 +1,93 @@
+#
+# Author:: Jay Mundrawala (<jdm@chef.io>)
+# Copyright:: Copyright (c) 2015 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'
+
+describe Chef::Resource::DscResource, :windows_powershell_dsc_only do
+  before(:all) do
+    @ohai = Ohai::System.new
+    @ohai.all_plugins(['platform', 'os', 'languages/powershell'])
+  end
+
+  let(:event_dispatch) { Chef::EventDispatch::Dispatcher.new }
+
+  let(:node) {
+    Chef::Node.new.tap do |n|
+      n.consume_external_attrs(@ohai.data, {})
+    end
+  }
+
+  let(:run_context) { Chef::RunContext.new(node, {}, event_dispatch) }
+
+  let(:new_resource) {
+    Chef::Resource::DscResource.new("dsc_resource_test", run_context)
+  }
+
+  context 'when Powershell does not support Invoke-DscResource'
+  context 'when Powershell supports Invoke-DscResource' do
+    before do
+      if !Chef::Platform.supports_dsc_invoke_resource?(node)
+        skip 'Requires Powershell >= 5.0.10018.0'
+      end
+    end
+    context 'with an invalid dsc resource' do
+      it 'raises an exception if the resource is not found' do
+        new_resource.resource 'thisdoesnotexist'
+        expect { new_resource.run_action(:run) }.to raise_error(
+                                            Chef::Exceptions::ResourceNotFound)
+      end
+    end
+
+    context 'with a valid dsc resource' do
+      let(:tmp_file_name) { Dir::Tmpname.create('tmpfile') {} }
+      let(:test_text) { "'\"!@#$%^&*)(}{][\u2713~n"}
+
+      before do
+        new_resource.resource :File
+        new_resource.property :Contents, test_text
+        new_resource.property :DestinationPath, tmp_file_name
+      end
+
+      after do
+        File.delete(tmp_file_name) if File.exists? tmp_file_name
+      end
+
+      it 'converges the resource if it is not converged' do
+        new_resource.run_action(:run)
+        contents = File.open(tmp_file_name, 'rb:bom|UTF-16LE') do |f|
+          f.read.encode('UTF-8')
+        end
+        expect(contents).to eq(test_text)
+        expect(new_resource).to be_updated
+      end
+
+      it 'does not converge the resource if it is already converged' do
+        new_resource.run_action(:run)
+        expect(new_resource).to be_updated
+        reresource =
+           Chef::Resource::DscResource.new("dsc_resource_retest", run_context)
+        reresource.resource :File
+        reresource.property :Contents, test_text
+        reresource.property :DestinationPath, tmp_file_name
+        reresource.run_action(:run)
+        expect(reresource).not_to be_updated
+      end
+    end
+
+  end
+end

data/spec/functional/resource/env_spec.rb

@@ -29,14 +29,15 @@ describe Chef::Resource::Env, :windows_only do
     let(:env_value_expandable) { '%SystemRoot%' }
     let(:test_run_context) {
       node = Chef::Node.new
+      node.default['os'] = 'windows'
       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) 
-    } 
+    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)

data/spec/functional/resource/file_spec.rb

@@ -64,7 +64,7 @@ describe Chef::Resource::File do
     provider.current_resource
   end
 
-  let(:default_mode) { ((0100666 - File.umask) & 07777).to_s(8) }
+  let(:default_mode) { (0666 & ~File.umask).to_s(8) }
 
   it_behaves_like "a file resource"
 

data/spec/functional/resource/powershell_spec.rb

@@ -56,7 +56,8 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
       resource.run_action(:run)
     end
 
-    it "returns the -27 for a powershell script that exits with -27" do
+    it "returns the -27 for a powershell script that exits with -27", :windows_powershell_dsc_only do
+      # This is broken on Powershell < 4.0
       file = Tempfile.new(['foo', '.ps1'])
       begin
         file.write "exit -27"