puppet 3.3.2 → 3.4.0.rc1

data/lib/puppet/type/file/target.rb

@@ -32,7 +32,7 @@ module Puppet
 
     # Create our link.
     def mklink
-      raise Puppet::Error, "Cannot symlink on Microsoft Windows" if Puppet.features.microsoft_windows?
+      raise Puppet::Error, "Cannot symlink on this platform version" if !provider.feature?(:manages_symlinks)
 
       target = self.should
 
@@ -40,17 +40,17 @@ module Puppet
       # it doesn't determine what's removed.
       @resource.remove_existing(target)
 
-      raise Puppet::Error, "Could not remove existing file" if FileTest.exists?(@resource[:path])
+      raise Puppet::Error, "Could not remove existing file" if Puppet::FileSystem::File.exist?(@resource[:path])
 
       Dir.chdir(File.dirname(@resource[:path])) do
         Puppet::Util::SUIDManager.asuser(@resource.asuser) do
           mode = @resource.should(:mode)
           if mode
             Puppet::Util.withumask(000) do
-              File.symlink(target, @resource[:path])
+              Puppet::FileSystem::File.new(target).symlink(@resource[:path])
             end
           else
-            File.symlink(target, @resource[:path])
+            Puppet::FileSystem::File.new(target).symlink(@resource[:path])
           end
         end
 
@@ -63,7 +63,7 @@ module Puppet
     def insync?(currentvalue)
       if [:nochange, :notlink].include?(self.should) or @resource.recurse?
         return true
-      elsif ! @resource.replace? and File.exists?(@resource[:path])
+      elsif ! @resource.replace? and Puppet::FileSystem::File.exist?(@resource[:path])
         return true
       else
         return super(currentvalue)
@@ -74,7 +74,7 @@ module Puppet
     def retrieve
       if stat = @resource.stat
         if stat.ftype == "link"
-          return File.readlink(@resource[:path])
+          return Puppet::FileSystem::File.new(@resource[:path]).readlink
         else
           return :notlink
         end

data/lib/puppet/type/group.rb

@@ -87,6 +87,24 @@ module Puppet
         newvalue = newvalue.join(",")
         super(currentvalue, newvalue)
       end
+
+      def insync?(current)
+        if provider.respond_to?(:members_insync?)
+          return provider.members_insync?(current, @should)
+        end
+
+        super(current)
+      end
+
+      def is_to_s(currentvalue)
+        if provider.respond_to?(:members_to_s)
+          currentvalue = '' if currentvalue.nil?
+          return provider.members_to_s(currentvalue.split(','))
+        end
+
+        super(currentvalue)
+      end
+      alias :should_to_s :is_to_s
     end
 
     newparam(:auth_membership) do

data/lib/puppet/type/k5login.rb

@@ -37,7 +37,7 @@ Puppet::Type.newtype(:k5login) do
 
     # Does this file exist?
     def exists?
-      File.exists?(@resource[:name])
+      Puppet::FileSystem::File.exist?(@resource[:name])
     end
 
     # create the file
@@ -51,12 +51,12 @@ Puppet::Type.newtype(:k5login) do
 
     # remove the file
     def destroy
-      File.unlink(@resource[:name])
+      Puppet::FileSystem::File.unlink(@resource[:name])
     end
 
     # Return the principals
     def principals(dummy_argument=:work_arround_for_ruby_GC_bug)
-      if File.exists?(@resource[:name])
+      if Puppet::FileSystem::File.exist?(@resource[:name])
         File.readlines(@resource[:name]).collect { |line| line.chomp }
       else
         :absent
@@ -70,7 +70,7 @@ Puppet::Type.newtype(:k5login) do
 
     # Return the mode as an octal string, not as an integer
     def mode
-      "%o" % (File.stat(@resource[:name]).mode & 007777)
+      "%o" % (Puppet::FileSystem::File.new(@resource[:name]).stat.mode & 007777)
     end
 
     # Set the file mode, converting from a string to an integer.

data/lib/puppet/type/mount.rb

@@ -8,7 +8,11 @@ module Puppet
       on the value of the 'ensure' parameter.
 
       Note that if a `mount` receives an event from another resource,
-      it will try to remount the filesystems if `ensure` is set to `mounted`."
+      it will try to remount the filesystems if `ensure` is set to `mounted`.
+
+      **Autorequires:** If Puppet is managing any parents of a mount resource ---
+      that is, other mount points higher up in the filesystem --- the child
+      mount will autorequire them."
 
     feature :refreshable, "The provider can remount the filesystem.",
       :methods => [:remount]
@@ -268,5 +272,15 @@ module Puppet
         return property.value
       end
     end
+
+    # Ensure that mounts higher up in the filesystem are mounted first
+    autorequire(:mount) do
+      dependencies = []
+      Pathname.new(@parameters[:name].value).ascend do |parent|
+        dependencies.unshift parent.to_s
+      end
+      dependencies[0..-2]
+    end
+
   end
 end

data/lib/puppet/type/package.rb

@@ -58,7 +58,7 @@ module Puppet
         retrieve by specifying a version number or `latest` as the ensure
         value. On packaging systems that manage configuration files separately
         from "normal" system files, you can uninstall config files by
-        specifying `purged` as the ensure value.
+        specifying `purged` as the ensure value. This defaults to `installed`.
       EOT
 
       attr_accessor :latest
@@ -225,6 +225,12 @@ module Puppet
 
       "
       isnamevar
+
+      validate do |value|
+        if !value.is_a?(String)
+          raise ArgumentError, "Name must be a String not #{value.class}"
+        end
+      end
     end
 
     newparam(:source) do

data/lib/puppet/type/schedule.rb

@@ -356,10 +356,10 @@ module Puppet
         of the range, not necessarily the day that it is when it matches.
         For example, consider this schedule:
 
-          schedule { 'maintenance_window':
-            range   => '22:00 - 04:00',
-            weekday => 'Saturday',
-          }
+            schedule { 'maintenance_window':
+              range   => '22:00 - 04:00',
+              weekday => 'Saturday',
+            }
 
         This will match at 11 PM on Saturday and 2 AM on Sunday, but not
         at 2 AM on Saturday.
@@ -418,6 +418,11 @@ module Puppet
 
     def self.mkdefaultschedules
       result = []
+      unless Puppet[:default_schedules]
+        Puppet.debug "Not creating default schedules: default_schedules is false"
+        return result
+      end
+
       Puppet.debug "Creating default schedules"
 
             result << self.new(

data/lib/puppet/type/service.rb

@@ -180,7 +180,7 @@ module Puppet
         automatically, usually by looking for the service in the process
         table.
 
-        [lsb-exit-codes]: http://refspecs.freestandards.org/LSB_3.1.1/LSB-Core-generic/LSB-Core-generic/iniscrptact.html"
+        [lsb-exit-codes]: http://refspecs.linuxfoundation.org/LSB_4.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html"
     end
 
     newparam(:stop) do

data/lib/puppet/type/tidy.rb

@@ -312,7 +312,7 @@ Puppet::Type.newtype(:tidy) do
 
   def stat(path)
     begin
-      ::File.lstat(path)
+      Puppet::FileSystem::File.new(path).lstat
     rescue Errno::ENOENT => error
       info "File does not exist"
       return nil

data/lib/puppet/type/user.rb

@@ -164,6 +164,9 @@ module Puppet
 
     newproperty(:comment) do
       desc "A description of the user.  Generally the user's full name."
+      munge do |v|
+        v.respond_to?(:encode) ? v.encode(Encoding::ASCII_8BIT) : v
+      end
     end
 
     newproperty(:shell) do

data/lib/puppet/type/yumrepo.rb

@@ -170,7 +170,7 @@ module Puppet
       unless Puppet[:noop]
         target_mode = 0644 # FIXME: should be configurable
         inifile.each_file do |file|
-          current_mode = ::File.stat(file).mode & 0777
+          current_mode = Puppet::FileSystem::File.new(file).stat.mode & 0777
           unless current_mode == target_mode
             Puppet::info "changing mode of #{file} from %03o to %03o" % [current_mode, target_mode]
             ::File.chmod(target_mode, file)
@@ -332,7 +332,7 @@ module Puppet
     end
 
     newproperty(:cost, :parent => Puppet::IniProperty) do
-      desc "Cost of this repository.\n#{ABSENT_DOC}"
+      desc "Cost of this repository. #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(%r{\d+}) { }
     end
@@ -364,28 +364,30 @@ module Puppet
 
     newproperty(:sslcacert, :parent => Puppet::IniProperty) do
       desc "Path to the directory containing the databases of the
-        certificate authorities yum should use to verify SSL certificates.\n#{ABSENT_DOC}"
+        certificate authorities yum should use to verify SSL certificates.
+        #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(/.*/) { }
     end
 
     newproperty(:sslverify, :parent => Puppet::IniProperty) do
       desc "Should yum verify SSL certificates/hosts at all.
-        Possible values are 'True' or 'False'.\n#{ABSENT_DOC}"
+        Possible values are 'True' or 'False'.
+        #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(%r(True|False)) { }
     end
 
     newproperty(:sslclientcert, :parent => Puppet::IniProperty) do
       desc "Path  to the SSL client certificate yum should use to connect
-        to repos/remote sites.\n#{ABSENT_DOC}"
+        to repos/remote sites. #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(/.*/) { }
     end
 
     newproperty(:sslclientkey, :parent => Puppet::IniProperty) do
       desc "Path to the SSL client key yum should use to connect
-        to repos/remote sites.\n#{ABSENT_DOC}"
+        to repos/remote sites. #{ABSENT_DOC}"
       newvalue(:absent) { self.should = :absent }
       newvalue(/.*/) { }
     end

data/lib/puppet/util.rb

@@ -1,12 +1,9 @@
 # A module to collect utility functions.
 
 require 'English'
-require 'puppet/external/lock'
 require 'puppet/error'
 require 'puppet/util/execution_stub'
 require 'uri'
-require 'sync'
-require 'monitor'
 require 'tempfile'
 require 'pathname'
 require 'ostruct'
@@ -26,9 +23,6 @@ module Util
 
   extend Puppet::Util::SymbolicFileMode
 
-  @@sync_objects = {}.extend MonitorMixin
-
-
   def self.activerecord_version
     if (defined?(::ActiveRecord) and defined?(::ActiveRecord::VERSION) and defined?(::ActiveRecord::VERSION::MAJOR) and defined?(::ActiveRecord::VERSION::MINOR))
       ([::ActiveRecord::VERSION::MAJOR, ::ActiveRecord::VERSION::MINOR].join('.').to_f)
@@ -67,20 +61,6 @@ module Util
   end
 
 
-  def self.synchronize_on(x,type)
-    sync_object,users = 0,1
-    begin
-      @@sync_objects.synchronize {
-        (@@sync_objects[x] ||= [Sync.new,0])[users] += 1
-      }
-      @@sync_objects[x][sync_object].synchronize(type) { yield }
-    ensure
-      @@sync_objects.synchronize {
-        @@sync_objects.delete(x) unless (@@sync_objects[x][users] -= 1) > 0
-      }
-    end
-  end
-
   # Change the process to a different user
   def self.chuser
     if group = Puppet[:group]
@@ -154,7 +134,6 @@ module Util
     end
   end
 
-
   def benchmark(*args)
     msg = args.pop
     level = args.pop
@@ -187,6 +166,7 @@ module Util
       yield
     end
   end
+  module_function :benchmark
 
   # Resolve a path for an executable to the absolute path. This tries to behave
   # in the same manner as the unix `which` command and uses the `PATH`
@@ -270,7 +250,7 @@ module Util
     if Puppet.features.microsoft_windows?
       path = path.gsub(/\\/, '/')
 
-      if unc = /^\/\/([^\/]+)(\/[^\/]+)/.match(path)
+      if unc = /^\/\/([^\/]+)(\/.+)/.match(path)
         params[:host] = unc[1]
         path = unc[2]
       elsif path =~ /^[a-z]:\//i
@@ -320,13 +300,6 @@ module Util
   end
   module_function :safe_posix_fork
 
-  # Create an exclusive lock.
-  def threadlock(resource, type = Sync::EX)
-    Puppet::Util.synchronize_on(resource,type) { yield }
-  end
-
-  module_function :benchmark
-
   def memory
     unless defined?(@pmap)
       @pmap = which('pmap')
@@ -361,6 +334,7 @@ module Util
 
   # Because IO#binread is only available in 1.9
   def binread(file)
+    Puppet.deprecation_warning("Puppet::Util.binread is deprecated. Read the file without this method as it will be removed in a future version.")
     File.open(file, 'rb') { |f| f.read }
   end
   module_function :binread
@@ -467,7 +441,7 @@ module Util
         # This might race, but there are enough possible cases that there
         # isn't a good, solid "better" way to do this, and the next call
         # should fail in the same way anyhow.
-        raise if have_retried or File.exist?(file)
+        raise if have_retried or Puppet::FileSystem::File.exist?(file)
         have_retried = true
 
         # OK, so, we can't replace a file that doesn't exist, so let us put
@@ -499,7 +473,6 @@ module Util
   end
   module_function :replace_file
 
-
   # Executes a block of code, wrapped with some special exception handling.  Causes the ruby interpreter to
   #  exit if the block throws an exception.
   #

data/lib/puppet/util/adsi.rb

@@ -41,6 +41,11 @@ module Puppet::Util::ADSI
       "winmgmts:{impersonationLevel=impersonate}!//#{host}/root/cimv2"
     end
 
+    def sid_uri(sid)
+      raise Puppet::Error.new( "Must use a valid SID object" ) if !sid.kind_of?(Win32::Security::SID)
+      "WinNT://#{sid.to_s}"
+    end
+
     def uri(resource_name, resource_type, host = '.')
       "#{computer_uri(host)}/#{resource_name},#{resource_type}"
     end
@@ -64,22 +69,40 @@ module Puppet::Util::ADSI
     extend Enumerable
 
     attr_accessor :native_user
-    attr_reader :name
+    attr_reader :name, :sid
     def initialize(name, native_user = nil)
       @name = name
       @native_user = native_user
     end
 
+    def self.parse_name(name)
+      if name =~ /\//
+        raise Puppet::Error.new( "Value must be in DOMAIN\\user style syntax" )
+      end
+
+      matches = name.scan(/((.*)\\)?(.*)/)
+      domain = matches[0][1] || '.'
+      account = matches[0][2]
+
+      return account, domain
+    end
+
     def native_user
-      @native_user ||= Puppet::Util::ADSI.connect(uri)
+      @native_user ||= Puppet::Util::ADSI.connect(self.class.uri(*self.class.parse_name(@name)))
+    end
+
+    def sid
+      @sid ||= Puppet::Util::Windows::Security.octet_string_to_sid_object(native_user.objectSID)
     end
 
     def self.uri(name, host = '.')
+      host = '.' if ['NT AUTHORITY', 'BUILTIN', Socket.gethostname].include?(host)
+
       Puppet::Util::ADSI.uri(name, 'user', host)
     end
 
     def uri
-      self.class.uri(name)
+      self.class.uri(sid.account, sid.domain)
     end
 
     def self.logon(name, password)
@@ -131,14 +154,14 @@ module Puppet::Util::ADSI
 
     def add_to_groups(*group_names)
       group_names.each do |group_name|
-        Puppet::Util::ADSI::Group.new(group_name).add_member(@name)
+        Puppet::Util::ADSI::Group.new(group_name).add_member_sids(sid)
       end
     end
     alias add_to_group add_to_groups
 
     def remove_from_groups(*group_names)
       group_names.each do |group_name|
-        Puppet::Util::ADSI::Group.new(group_name).remove_member(@name)
+        Puppet::Util::ADSI::Group.new(group_name).remove_member_sids(sid)
       end
     end
     alias remove_from_group remove_from_groups
@@ -167,7 +190,7 @@ module Puppet::Util::ADSI
     end
 
     def self.exists?(name)
-      Puppet::Util::ADSI::connectable?(User.uri(name))
+      Puppet::Util::ADSI::connectable?(User.uri(*User.parse_name(name)))
     end
 
     def self.delete(name)
@@ -233,20 +256,44 @@ module Puppet::Util::ADSI
       self
     end
 
-    def add_members(*names)
-      names.each do |name|
-        native_group.Add(Puppet::Util::ADSI::User.uri(name, Puppet::Util::ADSI.computer_name))
+    def self.name_sid_hash(names)
+      return [] if names.nil? or names.empty?
+
+      sids = names.map do |name|
+        sid = Puppet::Util::Windows::Security.name_to_sid_object(name)
+        raise Puppet::Error.new( "Could not resolve username: #{name}" ) if !sid
+        [sid.to_s, sid]
       end
+
+      Hash[ sids ]
+    end
+
+    def add_members(*names)
+      Puppet.deprecation_warning('Puppet::Util::ADSI::Group#add_members is deprecated; please use Puppet::Util::ADSI::Group#add_member_sids')
+      sids = self.class.name_sid_hash(names)
+      add_member_sids(*sids.values)
     end
     alias add_member add_members
 
     def remove_members(*names)
-      names.each do |name|
-        native_group.Remove(Puppet::Util::ADSI::User.uri(name, Puppet::Util::ADSI.computer_name))
-      end
+      Puppet.deprecation_warning('Puppet::Util::ADSI::Group#remove_members is deprecated; please use Puppet::Util::ADSI::Group#remove_member_sids')
+      sids = self.class.name_sid_hash(names)
+      remove_member_sids(*sids.values)
     end
     alias remove_member remove_members
 
+    def add_member_sids(*sids)
+      sids.each do |sid|
+        native_group.Add(Puppet::Util::ADSI.sid_uri(sid))
+      end
+    end
+
+    def remove_member_sids(*sids)
+      sids.each do |sid|
+        native_group.Remove(Puppet::Util::ADSI.sid_uri(sid))
+      end
+    end
+
     def members
       # WIN32OLE objects aren't enumerable, so no map
       members = []
@@ -254,18 +301,27 @@ module Puppet::Util::ADSI
       members
     end
 
+    def member_sids
+      sids = []
+      native_group.Members.each do |m|
+        sids << Puppet::Util::Windows::Security.octet_string_to_sid_object(m.objectSID)
+      end
+      sids
+    end
+
     def set_members(desired_members)
       return if desired_members.nil? or desired_members.empty?
 
-      current_members = self.members
+      current_hash = Hash[ self.member_sids.map { |sid| [sid.to_s, sid] } ]
+      desired_hash = self.class.name_sid_hash(desired_members)
 
       # First we add all missing members
-      members_to_add = desired_members - current_members
-      add_members(*members_to_add)
+      members_to_add = (desired_hash.keys - current_hash.keys).map { |sid| desired_hash[sid] }
+      add_member_sids(*members_to_add)
 
       # Then we remove all extra members
-      members_to_remove = current_members - desired_members
-      remove_members(*members_to_remove)
+      members_to_remove = (current_hash.keys - desired_hash.keys).map { |sid| current_hash[sid] }
+      remove_member_sids(*members_to_remove)
     end
 
     def self.create(name)