chef 11.4.4 → 11.6.0.hotfix.1

data/lib/chef/provider/link.rb

@@ -112,21 +112,28 @@ class Chef
         end
         if @new_resource.link_type == :symbolic
           if access_controls.requires_changes?
-            converge_by(access_controls.describe_changes) do 
+            converge_by(access_controls.describe_changes) do
               access_controls.set_all
             end
           end
-       end
+        end
       end
 
       def action_delete
         if @current_resource.to # Exists
-          converge_by ("delete link at #{@new_resource.target_file}") do
+          converge_by("delete link at #{@new_resource.target_file}") do
             ::File.delete(@new_resource.target_file)
             Chef::Log.info("#{@new_resource} deleted")
           end
         end
       end
+
+      # Implementation components *should not* follow symlinks when managing
+      # access control (e.g., use lchmod instead of chmod) if the resource is a
+      # symlink.
+      def manage_symlink_access?
+        @new_resource.link_type == :symbolic
+      end
     end
   end
 end

data/lib/chef/provider/mount.rb

@@ -79,7 +79,7 @@ class Chef
       end
 
       def action_enable
-        unless @current_resource.enabled
+        unless @current_resource.enabled && mount_options_unchanged?
           converge_by("remount #{@current_resource.device}") do 
             status = enable_fs
             if status

data/lib/chef/provider/mount/mount.rb

@@ -44,7 +44,7 @@ class Chef
           # only check for existence of non-remote devices
           if (device_should_exist? && !::File.exists?(device_real) )
             raise Chef::Exceptions::Mount, "Device #{@new_resource.device} does not exist"
-          elsif( !::File.exists?(@new_resource.mount_point) )
+          elsif( @new_resource.mount_point != "none" && !::File.exists?(@new_resource.mount_point) )
             raise Chef::Exceptions::Mount, "Mount point #{@new_resource.mount_point} does not exist"
           end
           return true
@@ -177,7 +177,8 @@ class Chef
         end
 
         def device_should_exist?
-          ( not network_device? ) &&
+          ( @new_resource.device != "none" ) && 
+            ( not network_device? ) &&
             ( not %w[ tmpfs fuse ].include? @new_resource.fstype )
         end
 
@@ -225,7 +226,11 @@ class Chef
             # ignore trailing slash
             Regexp.escape(device_real)+"/?"
           elsif ::File.symlink?(device_real)
-            "(?:#{Regexp.escape(device_real)})|(?:#{Regexp.escape(::File.readlink(device_real))})"
+            # This regular expression tries to match device_real. If that does not match it will try to match the target of device_real.
+            # So given a symlink like this:
+            # /dev/mapper/vgroot-tmp.vol -> /dev/dm-9
+            # First it will try to match "/dev/mapper/vgroot-tmp.vol". If there is no match it will try matching for "/dev/dm-9".
+            "(?:#{Regexp.escape(device_real)}|#{Regexp.escape(::File.readlink(device_real))})"
           else
             Regexp.escape(device_real)
           end

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

@@ -59,7 +59,10 @@ class Chef
 
         def mount_fs
           unless @current_resource.mounted
-            @mount.add(@new_resource.device)
+            @mount.add(:remote => @new_resource.device,
+                       :username => @new_resource.username,
+                       :domainname => @new_resource.domain,
+                       :password => @new_resource.password)
             Chef::Log.debug("#{@new_resource} is mounted at #{@new_resource.mount_point}")
           else
             Chef::Log.debug("#{@new_resource} is already mounted at #{@new_resource.mount_point}")

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

@@ -58,14 +58,19 @@ class Chef
 
         def parse_emerge(package, txt)
           availables = {}
-          package_without_category = package.split("/").last
           found_package_name = nil
 
           txt.each_line do |line|
             if line =~ /\*\s+#{PACKAGE_NAME_PATTERN}/
-              found_package_name = $&.strip
-              if found_package_name == package || found_package_name.split("/").last == package_without_category
-                availables[found_package_name] = nil
+              found_package_name = $&.gsub(/\*/, '').strip
+              if package =~ /\// #the category is specified
+                if found_package_name == package
+                  availables[found_package_name] = nil
+                end
+              else #the category is not specified
+                if found_package_name.split("/").last == package
+                  availables[found_package_name] = nil
+                end
               end
             end
 

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

@@ -31,7 +31,14 @@ require 'rubygems/version'
 require 'rubygems/dependency'
 require 'rubygems/spec_fetcher'
 require 'rubygems/platform'
-require 'rubygems/format'
+
+# Compatibility note: Rubygems 2.0 removes rubygems/format in favor of
+# rubygems/package.
+begin
+  require 'rubygems/format'
+rescue LoadError
+  require 'rubygems/package'
+end
 require 'rubygems/dependency_installer'
 require 'rubygems/uninstaller'
 require 'rubygems/specification'
@@ -105,6 +112,22 @@ class Chef
             Gem.sources = original_sources
           end
 
+          ##
+          # Extracts the gemspec from a (on-disk) gem package.
+          # === Returns
+          # Gem::Specification
+          #
+          #--
+          # Compatibility note: Rubygems 1.x uses Gem::Format, 2.0 moved this
+          # code into Gem::Package.
+          def spec_from_file(file)
+            if defined?(Gem::Format) and Gem::Package.respond_to?(:open)
+              Gem::Format.from_file_by_path(file).spec
+            else
+              Gem::Package.new(file).spec
+            end
+          end
+
           ##
           # Determines the candidate version for a gem from a .gem file on disk
           # and checks if it matches the version contraints in +gem_dependency+
@@ -114,7 +137,7 @@ class Chef
           # nil           returns nil if the gem on disk doesn't match the
           #               version constraints for +gem_dependency+
           def candidate_version_from_file(gem_dependency, source)
-            spec = Gem::Format.from_file_by_path(source).spec
+            spec = spec_from_file(source)
             if spec.satisfies_requirement?(gem_dependency)
               logger.debug {"#{@new_resource} found candidate gem version #{spec.version} from local gem package #{source}"}
               spec.version
@@ -142,17 +165,26 @@ class Chef
           # Find the newest gem version available from Gem.sources that satisfies
           # the constraints of +gem_dependency+
           def find_newest_remote_version(gem_dependency, *sources)
-            # DependencyInstaller sorts the results such that the last one is
-            # always the one it considers best.
-            spec_with_source = dependency_installer.find_gems_with_sources(gem_dependency).last
+            available_gems = dependency_installer.find_gems_with_sources(gem_dependency)
+            spec, source = if available_gems.respond_to?(:last)
+              # DependencyInstaller sorts the results such that the last one is
+              # always the one it considers best.
+              spec_with_source = available_gems.last
+              spec_with_source && spec_with_source
+            else
+              # Rubygems 2.0 returns a Gem::Available set, which is a
+              # collection of AvailableSet::Tuple structs
+              available_gems.pick_best!
+              best_gem = available_gems.set.first
+              best_gem && [best_gem.spec, best_gem.source]
+            end
 
-            spec = spec_with_source && spec_with_source[0]
-            version = spec && spec_with_source[0].version
+            version = spec && spec.version
             if version
-              logger.debug { "#{@new_resource} found gem #{spec.name} version #{version} for platform #{spec.platform} from #{spec_with_source[1]}" }
+              logger.debug { "#{@new_resource} found gem #{spec.name} version #{version} for platform #{spec.platform} from #{source}" }
               version
             else
-              source_list = sources.compact.empty? ? "[#{Gem.sources.join(', ')}]" : "[#{sources.join(', ')}]"
+              source_list = sources.compact.empty? ? "[#{Gem.sources.to_a.join(', ')}]" : "[#{sources.join(', ')}]"
               logger.warn { "#{@new_resource} failed to find gem #{gem_dependency} from #{source_list}" }
               nil
             end
@@ -393,6 +425,9 @@ class Chef
           # URI.parse gets confused by MS Windows paths with forward slashes.
           scheme = nil if scheme =~ /^[a-z]$/
           %w{http https}.include?(scheme)
+        rescue URI::InvalidURIError
+          Chef::Log.debug("#{@new_resource} failed to parse source '#{@new_resource.source}' as a URI, assuming a local path")
+          false
         end
 
         def current_version
@@ -502,7 +537,7 @@ class Chef
           if version
             shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri -v \"#{version}\"#{src}#{opts}", :env=>nil)
           else
-            shell_out!("#{gem_binary_path} install #{name} -q --no-rdoc --no-ri #{src}#{opts}", :env=>nil)
+            shell_out!("#{gem_binary_path} install \"#{name}\" -q --no-rdoc --no-ri #{src}#{opts}", :env=>nil)
           end
         end
 

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

@@ -2,6 +2,7 @@
 # Authors:: Trevor O (trevoro@joyent.com)
 #           Bryan McLellan (btm@loftninjas.org)
 #           Matthew Landauer (matthew@openaustralia.org)
+#           Ben Rockwood (benr@joyent.com)
 # Copyright:: Copyright (c) 2009 Bryan McLellan, Matthew Landauer
 # License:: Apache License, Version 2.0
 #
@@ -17,10 +18,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Notes
-#
-#  * Supports installing using a local package name
-#  * Otherwise reverts to installing from the pkgsrc repositories URL
 
 require 'chef/provider/package'
 require 'chef/mixin/shell_out'
@@ -36,47 +33,61 @@ class Chef
 
 
         def load_current_resource
-					Chef::Log.debug("#{@new_resource} loading current resource")
-					@current_resource = Chef::Resource::Package.new(@new_resource.name)
-					@current_resource.package_name(@new_resource.package_name)
-					@current_resource.version(nil)
+          Chef::Log.debug("#{@new_resource} loading current resource")
+          @current_resource = Chef::Resource::Package.new(@new_resource.name)
+          @current_resource.package_name(@new_resource.package_name)
+          @current_resource.version(nil)
           check_package_state(@new_resource.package_name)
-					@current_resource # modified by check_package_state
-				end
-				
-				def check_package_state(name)
-					Chef::Log.debug("#{@new_resource} checking package #{name}")
-					# XXX
-					version = nil
-					info = shell_out!("pkg_info -E \"#{name}*\"", :env => nil, :returns => [0,1])
-					
-					if info.stdout
-						version = info.stdout[/^#{@new_resource.package_name}-(.+)/, 1]
+          @current_resource # modified by check_package_state
+        end
+
+        def check_package_state(name)
+          Chef::Log.debug("#{@new_resource} checking package #{name}")
+          version = nil
+          info = shell_out!("/opt/local/sbin/pkg_info -E \"#{name}*\"", :env => nil, :returns => [0,1])
+
+          if info.stdout
+            version = info.stdout[/^#{@new_resource.package_name}-(.+)/, 1]
           end
 
-					if !version
-						@current_resource.version(nil)
-					else
-						@current_resource.version(version)
-					end
+          if !version
+            @current_resource.version(nil)
+          else
+            @current_resource.version(version)
+          end
         end
 
+        def candidate_version
+          return @candidate_version if @candidate_version
+          name = nil
+          version = nil
+          pkg = shell_out!("/opt/local/bin/pkgin se #{new_resource.package_name}", :env => nil, :returns => [0,1])
+          pkg.stdout.each_line do |line|
+            case line
+            when /^#{name}/
+              name, version = line.split[0].split(/-([^-]+)$/)
+            end
+          end
+          @candidate_version = version
+          version
+        end
+     
         def install_package(name, version)
-					Chef::Log.debug("#{@new_resource} installing package #{name}-#{version}")
-					package = "#{name}-#{version}"
-          out = shell_out!("pkgin -y install #{package}", :env => nil)
+          Chef::Log.debug("#{@new_resource} installing package #{name} version #{version}")
+          package = "#{name}-#{version}"
+          out = shell_out!("/opt/local/bin/pkgin -y install #{package}", :env => nil)
         end
 
-				def upgrade_package(name, version)
-					Chef::Log.debug("#{@new_resource} upgrading package #{name}-#{version}")
-					install_package(name, version)
-				end
+        def upgrade_package(name, version)
+          Chef::Log.debug("#{@new_resource} upgrading package #{name} version #{version}")
+          install_package(name, version)
+        end
 
-				def remove_package(name, version)
-					Chef::Log.debug("#{@new_resource} removing package #{name}-#{version}")
-					package = "#{name}-#{version}"
-          out = shell_out!("pkgin -y remove #{package}", :env => nil)
-				end
+        def remove_package(name, version)
+          Chef::Log.debug("#{@new_resource} removing package #{name} version #{version}") 
+          package = "#{name}"
+          out = shell_out!("/opt/local/bin/pkgin -y remove #{package}", :env => nil)
+        end
 
       end
     end

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

@@ -16,8 +16,10 @@
 # limitations under the License.
 #
 
+require 'chef/config'
 require 'chef/provider/package'
 require 'chef/mixin/command'
+require 'chef/mixin/shell_out'
 require 'chef/resource/package'
 require 'singleton'
 require 'chef/mixin/get_source_from_package'
@@ -645,6 +647,7 @@ class Chef
         # Cache for our installed and available packages, pulled in from yum-dump.py
         class YumCache
           include Chef::Mixin::Command
+          include Chef::Mixin::ShellOut
           include Singleton
 
           def initialize
@@ -705,9 +708,11 @@ class Chef
             error = nil
 
             helper = ::File.join(::File.dirname(__FILE__), 'yum-dump.py')
+            status = nil
 
-            status = popen4("/usr/bin/python #{helper}#{opts}", :waitlast => true) do |pid, stdin, stdout, stderr|
-              stdout.each do |line|
+            begin
+              status = shell_out!("/usr/bin/python #{helper}#{opts}", :timeout => Chef::Config[:yum_timeout])
+              status.stdout.each_line do |line|
                 one_line = true
 
                 line.chomp!
@@ -754,7 +759,10 @@ class Chef
                 @rpmdb << pkg
               end
 
-              error = stderr.readlines
+              error = status.stderr
+            rescue Mixlib::ShellOut::CommandTimeout => e
+              Chef::Log.error("#{helper} exceeded timeout #{Chef::Config[:yum_timeout]}")
+              raise(e)
             end
 
             if status.exitstatus != 0
@@ -939,6 +947,7 @@ class Chef
         end # YumCache
 
         include Chef::Mixin::GetSourceFromPackage
+        include Chef::Mixin::ShellOut
 
         def initialize(new_resource, run_context)
           super
@@ -981,7 +990,7 @@ class Chef
         end
 
         def yum_command(command)
-          status, stdout, stderr = output_of_command(command, {})
+          status, stdout, stderr = output_of_command(command, {:timeout => Chef::Config[:yum_timeout]})
 
           # This is fun: rpm can encounter errors in the %post/%postun scripts which aren't
           # considered fatal - meaning the rpm is still successfully installed. These issue
@@ -998,7 +1007,7 @@ class Chef
               if l =~ %r{^error: %(post|postun)\(.*\) scriptlet failed, exit status \d+$}
                 Chef::Log.warn("#{@new_resource} caught non-fatal scriptlet issue: \"#{l}\". Can't trust yum exit status " +
                                "so running install again to verify.")
-                status, stdout, stderr = output_of_command(command, {})
+                status, stdout, stderr = output_of_command(command, {:timeout => Chef::Config[:yum_timeout]})
                 break
               end
             end
@@ -1062,13 +1071,11 @@ class Chef
             end
 
             Chef::Log.debug("#{@new_resource} checking rpm status")
-            status = popen4("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}") do |pid, stdin, stdout, stderr|
-              stdout.each do |line|
-                case line
-                when /([\w\d_.-]+)\s([\w\d_.-]+)/
-                  @current_resource.package_name($1)
-                  @new_resource.version($2)
-                end
+            shell_out!("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@new_resource.source}", :timeout => Chef::Config[:yum_timeout]).stdout.each_line do |line|
+              case line
+              when /([\w\d_.-]+)\s([\w\d_.-]+)/
+                @current_resource.package_name($1)
+                @new_resource.version($2)
               end
             end
           end

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

@@ -1,14 +1,17 @@
+# -*- coding: utf-8 -*-
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
+# Authors:: Adam Jacob (<adam@opscode.com>)
+#           Ionuț Arțăriși (<iartarisi@suse.cz>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
+#             Copyright (c) 2013 SUSE Linux GmbH
 # 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.
@@ -19,14 +22,16 @@
 require 'chef/provider/package'
 require 'chef/mixin/command'
 require 'chef/resource/package'
+require 'chef/mixin/shell_out'
 require 'singleton'
 
 class Chef
   class Provider
     class Package
-      class Zypper < Chef::Provider::Package  
-      
- 
+      class Zypper < Chef::Provider::Package
+
+        include Chef::Mixin::ShellOut
+
         def load_current_resource
           @current_resource = Chef::Resource::Package.new(@new_resource.name)
           @current_resource.package_name(@new_resource.package_name)
@@ -36,7 +41,7 @@ class Chef
           version=''
           oud_version=''
           Chef::Log.debug("#{@new_resource} checking zypper")
-          status = popen4("zypper info #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
+          status = popen4("zypper --non-interactive info #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
             stdout.each do |line|
               case line
               when /^Version: (.+)$/
@@ -45,7 +50,7 @@ class Chef
               when /^Installed: Yes$/
                 is_installed=true
                 Chef::Log.debug("#{@new_resource} is installed")
-                
+
               when /^Installed: No$/
                 is_installed=false
                 Chef::Log.debug("#{@new_resource} is not installed")
@@ -61,12 +66,12 @@ class Chef
             @candidate_version=version
             @current_resource.version(nil)
           end
- 
+
           if is_installed==true
             if is_out_of_date==true
               @current_resource.version(oud_version)
               @candidate_version=version
-            else 
+            else
               @current_resource.version(version)
               @candidate_version=version
             end
@@ -75,69 +80,54 @@ class Chef
           unless status.exitstatus == 0
             raise Chef::Exceptions::Package, "zypper failed - #{status.inspect}!"
           end
-          
+
           @current_resource
         end
-        
-        #Gets the zypper Version from command output (Returns Floating Point number)
+
         def zypper_version()
           `zypper -V 2>&1`.scan(/\d+/).join(".").to_f
         end
 
         def install_package(name, version)
-          if zypper_version < 1.0
-            run_command(
-              :command => "zypper install -y #{name}"
-            )
-          elsif version
-            run_command(
-              :command => "zypper -n --no-gpg-checks install -l  #{name}=#{version}"
-            )
-          else
-            run_command(
-              :command => "zypper -n --no-gpg-checks install -l  #{name}"
-            )
-          end
+          zypper_package("install --auto-agree-with-licenses", name, version)
         end
 
         def upgrade_package(name, version)
-          if zypper_version < 1.0
-            run_command(
-              :command => "zypper install -y #{name}"
-            )
-          elsif version
-            run_command(
-              :command => "zypper -n --no-gpg-checks install -l #{name}=#{version}"
-            )
-          else
-            run_command(
-              :command => "zypper -n --no-gpg-checks install -l #{name}"
-            )
-          end
+          install_package(name, version)
         end
 
         def remove_package(name, version)
+          zypper_package("remove", name, version)
+        end
+
+        def purge_package(name, version)
+          zypper_package("remove --clean-deps", name, version)
+        end
+
+        private
+        def zypper_package(command, pkgname, version)
+          version = "=#{version}" unless version.empty?
           if zypper_version < 1.0
-            run_command(
-              :command => "zypper remove -y #{name}"
-            )
-          elsif version
-            run_command(
-              :command => "zypper -n --no-gpg-checks remove  #{name}=#{version}"
-            )
+            shell_out!("zypper#{gpg_checks} #{command} -y #{pkgname}")
           else
-            run_command(
-              :command => "zypper -n --no-gpg-checks remove  #{name}"
-            )
+            shell_out!("zypper --non-interactive#{gpg_checks} "+
+                      "#{command} #{pkgname}#{version}")
           end
-            
-         
         end
-      
-        def purge_package(name, version)
-          remove_package(name, version)
+
+        def gpg_checks()
+          case Chef::Config[:zypper_check_gpg]
+          when true
+            ""
+          when false
+            " --no-gpg-checks"
+          when nil
+            Chef::Log.warn("Chef::Config[:zypper_check_gpg] was not set. " +
+              "All packages will be installed without gpg signature checks. " +
+              "This is a security hazard.")
+            " --no-gpg-checks"
+          end
         end
-      
       end
     end
   end