chef 11.14.0.alpha.4 → 11.14.0.rc.2

data/lib/chef/provider/package/yum.rb

@@ -704,6 +704,8 @@ class Chef
               opts << " #{@extra_repo_control}"
             end
 
+            opts << " --yum-lock-timeout #{Chef::Config[:yum_lock_timeout]}"
+
             one_line = false
             error = nil
 

data/lib/chef/provider/registry_key.rb

@@ -54,7 +54,7 @@ class Chef
         if registry.key_exists?(@new_resource.key)
           @current_resource.values(registry.get_values(@new_resource.key))
         end
-        values_to_hash(@current_resource.values)
+        values_to_hash(@current_resource.unscrubbed_values)
         @current_resource
       end
 
@@ -99,7 +99,7 @@ class Chef
             registry.create_key(@new_resource.key, @new_resource.recursive)
           end
         end
-        @new_resource.values.each do |value|
+        @new_resource.unscrubbed_values.each do |value|
           if @name_hash.has_key?(value[:name])
             current_value = @name_hash[value[:name]]
             unless current_value[:type] == value[:type] && current_value[:data] == value[:data]
@@ -121,7 +121,7 @@ class Chef
             registry.create_key(@new_resource.key, @new_resource.recursive)
           end
         end
-        @new_resource.values.each do |value|
+        @new_resource.unscrubbed_values.each do |value|
           unless @name_hash.has_key?(value[:name])
             converge_by("create value #{value}") do
               registry.set_value(@new_resource.key, value)
@@ -132,7 +132,7 @@ class Chef
 
       def action_delete
         if registry.key_exists?(@new_resource.key)
-          @new_resource.values.each do |value|
+          @new_resource.unscrubbed_values.each do |value|
             if @name_hash.has_key?(value[:name])
               converge_by("delete value #{value}") do
                 registry.delete_value(@new_resource.key, value)
@@ -153,4 +153,3 @@ class Chef
     end
   end
 end
-

data/lib/chef/provider/remote_file/cache_control_data.rb

@@ -140,7 +140,7 @@ class Chef
 
         def load_data
           Chef::JSONCompat.from_json(load_json_data)
-        rescue Chef::Exceptions::FileNotFound, Yajl::ParseError
+        rescue Chef::Exceptions::FileNotFound, FFI_Yajl::ParseError, JSON::ParserError
           false
         end
 

data/lib/chef/provider/service/solaris.rb

@@ -69,7 +69,7 @@ class Chef
         end
 
         def service_status
-          status = shell_out!("#{@status_command} #{@current_resource.service_name}")
+          status = shell_out!("#{@status_command} #{@current_resource.service_name}", :returns => [0, 1])
           status.stdout.each_line do |line|
             case line
             when /state\s+online/

data/lib/chef/provider/service/upstart.rb

@@ -43,7 +43,8 @@ class Chef
 
           run_context.node
 
-          @job = @new_resource.service_name
+          # dup so we can mutate @job
+          @job = @new_resource.service_name.dup
 
           if @new_resource.parameters
             @new_resource.parameters.each do |key, value|

data/lib/chef/provider/service/windows.rb

@@ -28,11 +28,21 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
 
   include Chef::Mixin::ShellOut
 
-  RUNNING = 'running'
-  STOPPED = 'stopped'
+  #Win32::Service.get_start_type
   AUTO_START = 'auto start'
   DISABLED = 'disabled'
 
+  #Win32::Service.get_current_state
+  RUNNING = 'running'
+  STOPPED = 'stopped'
+  CONTINUE_PENDING = 'continue pending'
+  PAUSE_PENDING = 'pause pending'
+  PAUSED = 'paused'
+  START_PENDING = 'start pending'
+  STOP_PENDING  = 'stop pending'
+
+  TIMEOUT  = 60
+
   def whyrun_supported?
     false
   end
@@ -49,9 +59,15 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
 
   def start_service
     if Win32::Service.exists?(@new_resource.service_name)
-      if current_state == RUNNING
+      state = current_state
+      if state == RUNNING
         Chef::Log.debug "#{@new_resource} already started - nothing to do"
-      else
+      elsif state == START_PENDING
+        Chef::Log.debug "#{@new_resource} already sent start signal - waiting for start"
+        spawn_command_thread do
+          wait_for_state(RUNNING)
+        end
+      elsif state == STOPPED
         if @new_resource.start_command
           Chef::Log.debug "#{@new_resource} starting service using the given start_command"
           shell_out!(@new_resource.start_command)
@@ -62,15 +78,18 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
           end
         end
         @new_resource.updated_by_last_action(true)
+      else
+        raise Chef::Exceptions::Service, "Service #{@new_resource} can't be started from state [#{state}]"
       end
     else
-        Chef::Log.debug "#{@new_resource} does not exist - nothing to do"
+      Chef::Log.debug "#{@new_resource} does not exist - nothing to do"
     end
   end
 
   def stop_service
     if Win32::Service.exists?(@new_resource.service_name)
-      if current_state == RUNNING
+      state = current_state
+      if state == RUNNING
         if @new_resource.stop_command
           Chef::Log.debug "#{@new_resource} stopping service using the given stop_command"
           shell_out!(@new_resource.stop_command)
@@ -81,8 +100,15 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
           end
         end
         @new_resource.updated_by_last_action(true)
-      else
+      elsif state == STOPPED
         Chef::Log.debug "#{@new_resource} already stopped - nothing to do"
+      elsif state == STOP_PENDING
+        Chef::Log.debug "#{@new_resource} already sent stop signal - waiting for stop"
+        spawn_command_thread do
+          wait_for_state(STOPPED)
+        end
+      else
+        raise Chef::Exceptions::Service, "Service #{@new_resource} can't be stopped from state [#{state}]"
       end
     else
       Chef::Log.debug "#{@new_resource} does not exist - nothing to do"
@@ -151,12 +177,14 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
     sleep 1 until current_state == desired_state
   end
 
-  # There ain't no party like a thread party...
   def spawn_command_thread
     worker = Thread.new do
       yield
     end
-    Timeout.timeout(60) do
+
+    resource_timeout = @new_resource.timeout if @new_resource.timeout
+    resource_timeout ||= TIMEOUT
+    Timeout.timeout(resource_timeout) do
       worker.join
     end
   end

data/lib/chef/provider/user/pw.rb

@@ -93,7 +93,7 @@ class Chef
         end
 
         def modify_password
-          if @current_resource.password != @new_resource.password
+          if (not @new_resource.password.nil?) && (@current_resource.password != @new_resource.password)
             Chef::Log.debug("#{new_resource} updating password")
             command = "pw usermod #{@new_resource.username} -H 0"
             status = popen4(command, :waitlast => true) do |pid, stdin, stdout, stderr|

data/lib/chef/provider/user/useradd.rb

@@ -38,7 +38,7 @@ class Chef
         end
 
         def manage_user
-          if universal_options != ""
+          unless universal_options.empty?
             command = compile_command("usermod") do |u|
               u.concat(universal_options)
             end

data/lib/chef/provider/windows_script.rb

@@ -36,7 +36,8 @@ class Chef
 
         @is_wow64 = wow64_architecture_override_required?(run_context.node, target_architecture)
 
-        if ( target_architecture == :i386 ) && ! is_i386_windows_process?
+        # if the user wants to run the script 32 bit && we are on a 64bit windows system && we are running a 64bit ruby ==> fail
+        if ( target_architecture == :i386 ) && node_windows_architecture(run_context.node) == :x86_64 && !is_i386_process_on_x86_64_windows?
           raise Chef::Exceptions::Win32ArchitectureIncorrect,
           "Support for the i386 architecture from a 64-bit Ruby runtime is not yet implemented"
         end

data/lib/chef/providers.rb

@@ -62,6 +62,7 @@ require 'chef/provider/package/ips'
 require 'chef/provider/package/macports'
 require 'chef/provider/package/pacman'
 require 'chef/provider/package/portage'
+require 'chef/provider/package/paludis'
 require 'chef/provider/package/rpm'
 require 'chef/provider/package/rubygems'
 require 'chef/provider/package/yum'

data/lib/chef/resource.rb

@@ -253,6 +253,7 @@ F
       @source_line = nil
       @guard_interpreter = :default
       @elapsed_time = 0
+      @sensitive = false
 
       @node = run_context ? deprecated_ivar(run_context.node, :node, :warn) : nil
     end
@@ -400,6 +401,14 @@ F
       )
     end
 
+    def sensitive(arg=nil)
+      set_or_return(
+        :sensitive,
+        arg,
+        :kind_of => [ TrueClass, FalseClass ]
+      )
+    end
+
     def epic_fail(arg=nil)
       ignore_failure(arg)
     end
@@ -494,6 +503,7 @@ F
     end
 
     def to_text
+      return "suppressed sensitive resource output" if sensitive
       ivars = instance_variables.map { |ivar| ivar.to_sym } - HIDDEN_IVARS
       text = "# Declared in #{@source_line}\n\n"
       text << self.class.dsl_name + "(\"#{name}\") do\n"

data/lib/chef/resource/file.rb

@@ -52,7 +52,6 @@ class Chef
         @force_unlink = false
         @manage_symlink_source = nil
         @diff = nil
-        @sensitive = false
       end
 
       def content(arg=nil)
@@ -118,14 +117,6 @@ class Chef
           :kind_of => [ TrueClass, FalseClass ]
         )
       end
-
-      def sensitive(arg=nil)
-        set_or_return(
-          :sensitive,
-          arg,
-          :kind_of => [ TrueClass, FalseClass ]
-        )
-      end
     end
   end
 end

data/lib/chef/resource/package.rb

@@ -39,6 +39,7 @@ class Chef
         @response_file_variables = Hash.new
         @source = nil
         @version = nil
+        @timeout = 900
       end
 
       def package_name(arg=nil)
@@ -83,11 +84,20 @@ class Chef
 
       def options(arg=nil)
         set_or_return(
-	  :options,
-	  arg,
-	  :kind_of => [ String ]
-	)
+      	  :options,
+      	  arg,
+      	  :kind_of => [ String ]
+      	)
       end
+
+      def timeout(arg=nil)
+        set_or_return(
+          :timeout,
+          arg,
+          :kind_of => [String, Integer]
+        )
+      end
+
     end
   end
 end

data/lib/chef/resource/paludis_package.rb

@@ -0,0 +1,33 @@
+#
+# Author:: Vasiliy Tolstov (<v.tolstov@selfip.ru>)
+# 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 'chef/resource/package'
+require 'chef/provider/package/paludis'
+
+class Chef
+  class Resource
+    class PaludisPackage < Chef::Resource::Package
+      def initialize(name, run_context=nil)
+        super(name, run_context)
+        @resource_name = :paludis_package
+        @provider = Chef::Provider::Package::Paludis
+        @allowed_actions = [ :install, :remove, :upgrade ]
+      end
+    end
+  end
+end

data/lib/chef/resource/registry_key.rb

@@ -17,6 +17,7 @@
 #
 require 'chef/provider/registry_key'
 require 'chef/resource'
+require 'chef/digester'
 
 class Chef
   class Resource
@@ -25,6 +26,37 @@ class Chef
       identity_attr :key
       state_attrs :values
 
+      # Some registry key data types may not be safely reported as json.
+      # Example (CHEF-5323):
+      #
+      # registry_key 'HKEY_CURRENT_USER\\ChefTest2014' do
+      #   values [{
+      #     :name => "ValueWithBadData",
+      #     :type => :binary,
+      #     :data => 255.chr * 1
+      #   }]
+      #   action :create
+      # end
+      #
+      # will raise Encoding::UndefinedConversionError: "\xFF" from ASCII-8BIT to UTF-8.
+      #
+      # To avoid sending data that cannot be nicely converted for json, we have
+      # the values method return "safe" data if the data type is "unsafe". Known "unsafe"
+      # data types are :binary, :dword, :dword-big-endian, and :qword. If other
+      # criteria generate data that cannot reliably be sent as json, add that criteria
+      # to the needs_checksum? method. When unsafe data is detected, the values method
+      # returns an md5 checksum of the listed data.
+      #
+      # :unscrubbed_values returns the values exactly as provided in the resource (i.e.,
+      # data is not checksummed, regardless of the data type/"unsafe" criteria).
+      #
+      # Future:
+      # If we have conflicts with other resources reporting json incompatible state, we
+      # may want to extend the state_attrs API with the ability to rename POST'd attrs.
+      #
+      # See lib/chef/resource_reporter.rb for more information.
+      attr_reader :unscrubbed_values
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :registry_key
@@ -32,7 +64,7 @@ class Chef
         @architecture = :machine
         @recursive = false
         @key = name
-        @values = []
+        @values, @unscrubbed_values = [], []
         @allowed_actions.push(:create, :create_if_missing, :delete, :delete_key)
       end
 
@@ -43,6 +75,7 @@ class Chef
           :kind_of => String
         )
       end
+
       def values(arg=nil)
         if not arg.nil?
           if arg.is_a?(Hash)
@@ -52,6 +85,7 @@ class Chef
           else
             raise ArgumentError, "Bad type for RegistryKey resource, use Hash or Array"
           end
+
           @values.each do |v|
             raise ArgumentError, "Missing name key in RegistryKey values hash" unless v.has_key?(:name)
             raise ArgumentError, "Missing type key in RegistryKey values hash" unless v.has_key?(:type)
@@ -62,10 +96,12 @@ class Chef
             raise ArgumentError, "Type of name => #{v[:name]} should be string" unless v[:name].is_a?(String)
             raise Argument Error "Type of type => #{v[:name]} should be symbol" unless v[:type].is_a?(Symbol)
           end
-        elsif self.instance_variable_defined?(:@values) == true
-          @values
+          @unscrubbed_values = @values
+        elsif self.instance_variable_defined?(:@values)
+          scrub_values(@values)
         end
       end
+
       def recursive(arg=nil)
         set_or_return(
           :recursive,
@@ -73,6 +109,7 @@ class Chef
           :kind_of => [TrueClass, FalseClass]
         )
       end
+
       def architecture(arg=nil)
         set_or_return(
           :architecture,
@@ -81,6 +118,28 @@ class Chef
         )
       end
 
+      private
+
+      def scrub_values(values)
+        scrubbed = []
+        values.each do |value|
+          scrubbed_value = value.dup
+          if needs_checksum?(scrubbed_value)
+            data_io = StringIO.new(scrubbed_value[:data].to_s)
+            scrubbed_value[:data] = Chef::Digester.instance.generate_md5_checksum(data_io)
+          end
+          scrubbed << scrubbed_value
+        end
+        scrubbed
+      end
+
+      # Some data types may raise errors when sent as json. Returns true if this
+      # value's data may need to be converted to a checksum.
+      def needs_checksum?(value)
+        unsafe_types = [:binary, :dword, :dword_big_endian, :qword]
+        unsafe_types.include?(value[:type])
+      end
+
     end
   end
 end