puppet 3.3.2 → 3.4.0.rc1

data/lib/puppet/provider/confine.rb

@@ -1,80 +1,6 @@
-# The class that handles testing whether our providers
-# actually work or not.
-require 'puppet/util'
+# Confines have been moved out of the provider as they are also used for other things.
+# This provides backwards compatibility for people still including this old location.
+require 'puppet/provider'
+require 'puppet/confine'
 
-class Puppet::Provider::Confine
-  include Puppet::Util
-
-  @tests = {}
-
-  class << self
-    attr_accessor :name
-  end
-
-  def self.inherited(klass)
-    name = klass.to_s.split("::").pop.downcase.to_sym
-    raise "Test #{name} is already defined" if @tests.include?(name)
-
-    klass.name = name
-
-    @tests[name] = klass
-  end
-
-  def self.test(name)
-    unless @tests[name]
-      begin
-        require "puppet/provider/confine/#{name}"
-      rescue LoadError => detail
-        unless detail.to_s =~ /No such file|cannot load such file/i
-          warn "Could not load confine test '#{name}': #{detail}"
-        end
-        # Could not find file
-      end
-    end
-    @tests[name]
-  end
-
-  attr_reader :values
-
-  # Mark that this confine is used for testing binary existence.
-  attr_accessor :for_binary
-  def for_binary?
-    for_binary
-  end
-
-  # Used for logging.
-  attr_accessor :label
-
-  def initialize(values)
-    values = [values] unless values.is_a?(Array)
-    @values = values
-  end
-
-  # Provide a hook for the message when there's a failure.
-  def message(value)
-    ""
-  end
-
-  # Collect the results of all of them.
-  def result
-    values.collect { |value| pass?(value) }
-  end
-
-  # Test whether our confine matches.
-  def valid?
-    values.each do |value|
-      unless pass?(value)
-        Puppet.debug(label + ": " + message(value))
-        return false
-      end
-    end
-
-    return true
-  ensure
-    reset
-  end
-
-  # Provide a hook for subclasses.
-  def reset
-  end
-end
+Puppet::Provider::Confine = Puppet::Confine

data/lib/puppet/provider/exec.rb

@@ -47,18 +47,17 @@ class Puppet::Provider::Exec < Puppet::Provider
           end
         end
 
-
         Timeout::timeout(resource[:timeout]) do
           # note that we are passing "false" for the "override_locale" parameter, which ensures that the user's
           # default/system locale will be respected.  Callers may override this behavior by setting locale-related
           # environment variables (LANG, LC_ALL, etc.) in their 'environment' configuration.
-          output, status = Puppet::Util::SUIDManager.
-              run_and_capture(command, resource[:user], resource[:group],
-                              :override_locale => false,
-                              :custom_environment => environment)
+          output = Puppet::Util::Execution.execute(command, :failonfail => false, :combine => true,
+                                  :uid => resource[:user], :gid => resource[:group],
+                                  :override_locale => false,
+                                  :custom_environment => environment)
         end
         # The shell returns 127 if the command is missing.
-        if status.exitstatus == 127
+        if output.exitstatus == 127
           raise ArgumentError, output
         end
 
@@ -67,7 +66,10 @@ class Puppet::Provider::Exec < Puppet::Provider
       self.fail detail.to_s
     end
 
-    return output, status
+    # Return output twice as processstatus was returned before, but only exitstatus was ever called.
+    # Output has the exitstatus on it so it is returned instead. This is here twice as changing this
+    #  would result in a change to the underlying API.
+    return output, output
   end
 
   def extractexe(command)

data/lib/puppet/provider/exec/posix.rb

@@ -1,6 +1,7 @@
 require 'puppet/provider/exec'
 
 Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
+  has_feature :umask
   confine :feature => :posix
   defaultfor :feature => :posix
 
@@ -16,7 +17,7 @@ Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
     exe = extractexe(command)
 
     if File.expand_path(exe) == exe
-      if !File.exists?(exe)
+      if !Puppet::FileSystem::File.exist?(exe)
         raise ArgumentError, "Could not find command '#{exe}'"
       elsif !File.file?(exe)
         raise ArgumentError, "'#{exe}' is a #{File.ftype(exe)}, not a file"
@@ -36,4 +37,12 @@ Puppet::Type.type(:exec).provide :posix, :parent => Puppet::Provider::Exec do
     # distinguish not found from not executable
     raise ArgumentError, "Could not find command '#{exe}'"
   end
+
+  def run(command, check = false)
+    if resource[:umask]
+      Puppet::Util::withumask(resource[:umask]) { super(command, check) }
+    else
+      super(command, check)
+    end
+  end
 end

data/lib/puppet/provider/exec/windows.rb

@@ -36,7 +36,7 @@ Puppet::Type.type(:exec).provide :windows, :parent => Puppet::Provider::Exec do
     exe = extractexe(command)
 
     if absolute_path?(exe)
-      if !File.exists?(exe)
+      if !Puppet::FileSystem::File.exist?(exe)
         raise ArgumentError, "Could not find command '#{exe}'"
       elsif !File.file?(exe)
         raise ArgumentError, "'#{exe}' is a #{File.ftype(exe)}, not a file"

data/lib/puppet/provider/file/posix.rb

@@ -2,6 +2,7 @@ Puppet::Type.type(:file).provide :posix do
   desc "Uses POSIX functionality to manage file ownership and permissions."
 
   confine :feature => :posix
+  has_features :manages_symlinks
 
   include Puppet::Util::POSIX
   include Puppet::Util::Warnings

data/lib/puppet/provider/file/windows.rb

@@ -2,6 +2,7 @@ Puppet::Type.type(:file).provide :windows do
   desc "Uses Microsoft Windows functionality to manage file ownership and permissions."
 
   confine :operatingsystem => :windows
+  has_feature :manages_symlinks if Puppet.features.manages_symlinks?
 
   include Puppet::Util::Warnings
 
@@ -35,33 +36,37 @@ Puppet::Type.type(:file).provide :windows do
   alias :name2uid :name2id
 
   def owner
-    return :absent unless resource.exist?
+    return :absent unless resource.stat
     get_owner(resource[:path])
   end
 
   def owner=(should)
     begin
-      set_owner(should, resource[:path])
+      path = resource[:links] == :manage ? file.path.to_s : file.readlink
+
+      set_owner(should, path)
     rescue => detail
       raise Puppet::Error, "Failed to set owner to '#{should}': #{detail}"
     end
   end
 
   def group
-    return :absent unless resource.exist?
+    return :absent unless resource.stat
     get_group(resource[:path])
   end
 
   def group=(should)
     begin
-      set_group(should, resource[:path])
+      path = resource[:links] == :manage ? file.path.to_s : file.readlink
+
+      set_group(should, path)
     rescue => detail
       raise Puppet::Error, "Failed to set group to '#{should}': #{detail}"
     end
   end
 
   def mode
-    if resource.exist?
+    if resource.stat
       mode = get_mode(resource[:path])
       mode ? mode.to_s(8) : :absent
     else
@@ -85,4 +90,10 @@ Puppet::Type.type(:file).provide :windows do
       resource.fail("Can only manage owner, group, and mode on filesystems that support Windows ACLs, such as NTFS")
     end
   end
+
+  attr_reader :file
+  private
+  def file
+    @file ||= Puppet::FileSystem::File.new(resource[:path])
+  end
 end

data/lib/puppet/provider/group/windows_adsi.rb

@@ -1,13 +1,45 @@
 require 'puppet/util/adsi'
 
 Puppet::Type.type(:group).provide :windows_adsi do
-  desc "Local group management for Windows. Nested groups are not supported."
+  desc "Local group management for Windows. Group members can be both users and groups.
+    Additionally, local groups can contain domain users."
 
   defaultfor :operatingsystem => :windows
   confine    :operatingsystem => :windows
 
   has_features :manages_members
 
+  def members_insync?(current, should)
+    return false unless current
+
+    # By comparing account SIDs we don't have to worry about case
+    # sensitivity, or canonicalization of account names.
+
+    # Cannot use munge of the group property to canonicalize @should
+    # since the default array_matching comparison is not commutative
+    should_empty = should.nil? or should.empty?
+
+    return false if current.empty? != should_empty
+
+    # dupes automatically weeded out when hashes built
+    Puppet::Util::ADSI::Group.name_sid_hash(current) == Puppet::Util::ADSI::Group.name_sid_hash(should)
+  end
+
+  def members_to_s(users)
+    return '' if users.nil? or !users.kind_of?(Array)
+    users = users.map do |user_name|
+      sid = Puppet::Util::Windows::Security.name_to_sid_object(user_name)
+      if sid.account =~ /\\/
+        account, _ = Puppet::Util::ADSI::User.parse_name(sid.account)
+      else
+        account = sid.account
+      end
+      resource.debug("#{sid.domain}\\#{account} (#{sid.to_s})")
+      "#{sid.domain}\\#{account}"
+    end
+    return users.join(',')
+  end
+
   def group
     @group ||= Puppet::Util::ADSI::Group.new(@resource[:name])
   end

data/lib/puppet/provider/macauthorization/macauthorization.rb

@@ -17,7 +17,7 @@ Puppet::Type.type(:macauthorization).provide :macauthorization, :parent => Puppe
   # This should be confined based on macosx_productversion
   # but puppet resource doesn't make the facts available and
   # that interface is heavily used with this provider.
-  if FileTest.exists?("/usr/bin/sw_vers")
+  if Puppet::FileSystem::File.exist?("/usr/bin/sw_vers")
     product_version = sw_vers "-productVersion"
 
     confine :true => unless /^10\.[0-4]/.match(product_version)

data/lib/puppet/provider/nameservice/directoryservice.rb

@@ -251,7 +251,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
              Please check your password and try again.")
       end
 
-      if File.exists?("#{users_plist_dir}/#{resource_name}.plist")
+      if Puppet::FileSystem::File.exist?("#{users_plist_dir}/#{resource_name}.plist")
         # If a plist already exists in /var/db/dslocal/nodes/Default/users, then
         # we will need to extract the binary plist from the 'ShadowHashData'
         # key, log the new password into the resultant plist's 'SALTED-SHA512'
@@ -296,7 +296,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
     if (Puppet::Util::Package.versioncmp(get_macosx_version_major, '10.7') == -1)
       password_hash = nil
       password_hash_file = "#{password_hash_dir}/#{guid}"
-      if File.exists?(password_hash_file) and File.file?(password_hash_file)
+      if Puppet::FileSystem::File.exist?(password_hash_file) and File.file?(password_hash_file)
         fail("Could not read password hash file at #{password_hash_file}") if not File.readable?(password_hash_file)
         f = File.new(password_hash_file)
         password_hash = f.read
@@ -304,7 +304,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       end
       password_hash
     else
-      if File.exists?("#{users_plist_dir}/#{username}.plist")
+      if Puppet::FileSystem::File.exist?("#{users_plist_dir}/#{username}.plist")
         # If a plist exists in /var/db/dslocal/nodes/Default/users, we will
         # extract the binary plist from the 'ShadowHashData' key, decode the
         # salted-SHA512 password hash, and then return it.

data/lib/puppet/provider/package/appdmg.rb

@@ -93,7 +93,7 @@ Puppet::Type.type(:package).provide(:appdmg, :parent => Puppet::Provider::Packag
   end
 
   def query
-    FileTest.exists?("/var/db/.puppet_appdmg_installed_#{@resource[:name]}") ? {:name => @resource[:name], :ensure => :present} : nil
+    Puppet::FileSystem::File.exist?("/var/db/.puppet_appdmg_installed_#{@resource[:name]}") ? {:name => @resource[:name], :ensure => :present} : nil
   end
 
   def install

data/lib/puppet/provider/package/apple.rb

@@ -33,7 +33,7 @@ Puppet::Type.type(:package).provide :apple, :parent => Puppet::Provider::Package
   end
 
   def query
-    FileTest.exists?("/Library/Receipts/#{@resource[:name]}.pkg") ? {:name => @resource[:name], :ensure => :present} : nil
+    Puppet::FileSystem::File.exist?("/Library/Receipts/#{@resource[:name]}.pkg") ? {:name => @resource[:name], :ensure => :present} : nil
   end
 
   def install

data/lib/puppet/provider/package/apt.rb

@@ -84,7 +84,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
   # preseeds answers to dpkg-set-selection from the "responsefile"
   #
   def run_preseed
-    if response = @resource[:responsefile] and FileTest.exist?(response)
+    if response = @resource[:responsefile] and Puppet::FileSystem::File.exist?(response)
       self.info("Preseeding #{response} to debconf-set-selections")
 
       preseed response

data/lib/puppet/provider/package/blastwave.rb

@@ -18,7 +18,7 @@ Puppet::Type.type(:package).provide :blastwave, :parent => :sun, :source => :sun
         "The pkg-get command is missing; blastwave packaging unavailable"
     end
 
-    unless FileTest.exists?("/var/pkg-get/admin")
+    unless Puppet::FileSystem::File.exist?("/var/pkg-get/admin")
       Puppet.notice "It is highly recommended you create '/var/pkg-get/admin'."
       Puppet.notice "See /var/pkg-get/admin-fullauto"
     end

data/lib/puppet/provider/package/dpkg.rb

@@ -40,7 +40,7 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
   private
 
   # Note: self:: is required here to keep these constants in the context of what will
-  # eventually become this Puppet:Type::Package::ProviderDpkg class.
+  # eventually become this Puppet::Type::Package::ProviderDpkg class.
   self::DPKG_DESCRIPTION_DELIMITER = ':DESC:'
   self::DPKG_QUERY_FORMAT_STRING = %Q{'${Status} ${Package} ${Version} #{self::DPKG_DESCRIPTION_DELIMITER} ${Description}\\n#{self::DPKG_DESCRIPTION_DELIMITER}\\n'}
   self::FIELDS_REGEX = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*) #{self::DPKG_DESCRIPTION_DELIMITER} (.*)$}

data/lib/puppet/provider/package/fink.rb

@@ -56,7 +56,7 @@ Puppet::Type.type(:package).provide :fink, :parent => :dpkg, :source => :dpkg do
   # preseeds answers to dpkg-set-selection from the "responsefile"
   #
   def run_preseed
-    if response = @resource[:responsefile] and FileTest.exists?(response)
+    if response = @resource[:responsefile] and Puppet::FileSystem::File.exist?(response)
       self.info("Preseeding #{response} to debconf-set-selections")
 
       preseed response

data/lib/puppet/provider/package/msi.rb

@@ -74,22 +74,18 @@ Puppet::Type.type(:package).provide(:msi, :parent => Puppet::Provider::Package)
     # because of the special quoting we need to do around the MSI
     # properties to use.
     command = ['msiexec.exe', '/qn', '/norestart', '/i', shell_quote(resource[:source]), install_options].flatten.compact.join(' ')
-    execute(command, :failonfail => false, :combine => true)
+    output = execute(command, :failonfail => false, :combine => true)
 
-    check_result(exit_status)
+    check_result(output.exitstatus)
   end
 
   def uninstall
     fail("The productcode property is missing.") unless properties[:productcode]
 
     command = ['msiexec.exe', '/qn', '/norestart', '/x', properties[:productcode], uninstall_options].flatten.compact.join(' ')
-    execute(command, :failonfail => false, :combine => true)
+    output = execute(command, :failonfail => false, :combine => true)
 
-    check_result(exit_status)
-  end
-
-  def exit_status
-    $CHILD_STATUS.exitstatus
+    check_result(output.exitstatus)
   end
 
   # (Un)install may "fail" because the package requested a reboot, the system requested a
@@ -102,8 +98,6 @@ Puppet::Type.type(:package).provide(:msi, :parent => Puppet::Provider::Package)
     case hr
     when 0
       # yeah
-    when 194
-      warning("The package requested a reboot to finish the operation.")
     when 1641
       warning("The package #{operation}ed successfully and the system is rebooting now.")
     when 3010

data/lib/puppet/provider/package/nim.rb

@@ -151,10 +151,10 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
   # I spent a lot of time trying to figure out a solution that didn't
   # require parsing the `nimclient -o showres` output and was unable to
   # do so.
-  HEADER_LINE_REGEX      = /^([^\s]+)\s+[^@]+@@(I|R):(\1)\s+[^\s]+$/
-  PACKAGE_LINE_REGEX     = /^.*@@(I|R):(.*)$/
-  RPM_PACKAGE_REGEX      = /^(.*)-(.*-\d+) \2$/
-  INSTALLP_PACKAGE_REGEX = /^(.*) (.*)$/
+  self::HEADER_LINE_REGEX      = /^([^\s]+)\s+[^@]+@@(I|R):(\1)\s+[^\s]+$/
+  self::PACKAGE_LINE_REGEX     = /^.*@@(I|R):(.*)$/
+  self::RPM_PACKAGE_REGEX      = /^(.*)-(.*-\d+) \2$/
+  self::INSTALLP_PACKAGE_REGEX = /^(.*) (.*)$/
 
   # Here is some sample output that shows what the above regexes will be up
   # against:
@@ -205,13 +205,13 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
     # meant to validate that the header line for the package listing output
     # looks sane, so we know we're dealing with the kind of output that we
     # are capable of handling.
-    unless line.match(HEADER_LINE_REGEX)
+    unless line.match(self.class::HEADER_LINE_REGEX)
       self.fail "Unable to parse output from nimclient showres: line does not match expected package header format:\n'#{line}'"
     end
   end
 
   def parse_installp_package_string(package_string)
-    unless match = package_string.match(INSTALLP_PACKAGE_REGEX)
+    unless match = package_string.match(self.class::INSTALLP_PACKAGE_REGEX)
       self.fail "Unable to parse output from nimclient showres: package string does not match expected installp package string format:\n'#{package_string}'"
     end
     package_name = match.captures[0]
@@ -220,7 +220,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
   end
 
   def parse_rpm_package_string(package_string)
-    unless match = package_string.match(RPM_PACKAGE_REGEX)
+    unless match = package_string.match(self.class::RPM_PACKAGE_REGEX)
       self.fail "Unable to parse output from nimclient showres: package string does not match expected rpm package string format:\n'#{package_string}'"
     end
     package_name = match.captures[0]
@@ -229,7 +229,7 @@ Puppet::Type.type(:package).provide :nim, :parent => :aix, :source => :aix do
   end
 
   def parse_showres_package_line(line)
-    unless match = line.match(PACKAGE_LINE_REGEX)
+    unless match = line.match(self.class::PACKAGE_LINE_REGEX)
       self.fail "Unable to parse output from nimclient showres: line does not match expected package line format:\n'#{line}'"
     end