puppet 2.7.13 → 2.7.14

data/lib/puppet/type.rb

@@ -123,6 +123,13 @@ class Type
     }
   end
 
+  # These `apply_to` methods are horrible.  They should really be implemented
+  # as part of the usual system of constraints that apply to a type and
+  # provider pair, but were implemented as a separate shadow system.
+  #
+  # We should rip them out in favour of a real constraint pattern around the
+  # target device - whatever that looks like - and not have this additional
+  # magic here. --daniel 2012-03-08
   def self.apply_to_device
     @apply_to = :device
   end
@@ -905,9 +912,10 @@ class Type
 
   # Return a list of one suitable provider per source, with the default provider first.
   def self.providers_by_source
-    # Put the default provider first, then the rest of the suitable providers.
+    # Put the default provider first (can be nil), then the rest of the suitable providers.
     sources = []
     [defaultprovider, suitableprovider].flatten.uniq.collect do |provider|
+      next if provider.nil?
       next if sources.include?(provider.source)
 
       sources << provider.source

data/lib/puppet/type/file.rb

@@ -210,8 +210,12 @@ Puppet::Type.newtype(:file) do
   end
 
   newparam(:force, :boolean => true) do
-    desc "Force the file operation.  Currently only used when replacing
-      directories with links."
+    desc "Perform the file operation even if it will destroy one or more directories.
+      You must use `force` in order to:
+
+      * `purge` subdirectories
+      * Replace directories with files or links
+      * Remove a directory when `ensure => absent`"
     newvalues(:true, :false)
     defaultto false
   end
@@ -244,14 +248,18 @@ Puppet::Type.newtype(:file) do
   end
 
   newparam(:purge, :boolean => true) do
-    desc "Whether unmanaged files should be purged.  If you have a filebucket
-      configured the purged files will be uploaded, but if you do not,
-      this will destroy data.  Only use this option for generated
-      files unless you really know what you are doing.  This option only
-      makes sense when recursively managing directories.
-
-      Note that when using `purge` with `source`, Puppet will purge any files
-      that are not on the remote system."
+    desc "Whether unmanaged files should be purged. This option only makes
+      sense when managing directories with `recurse => true`.
+
+      * When recursively duplicating an entire directory with the `source`
+        attribute, `purge => true` will automatically purge any files
+        that are not in the source directory.
+      * When managing files in a directory as individual resources,
+        setting `purge => true` will purge any files that aren't being
+        specifically managed.
+
+      If you have a filebucket configured, the purged files will be uploaded,
+      but if you do not, this will destroy data."
 
     defaultto :false
 

data/lib/puppet/type/package.rb

@@ -141,16 +141,20 @@ module Puppet
               end
             end
 
-            case is
-            when @latest
-              return true
-            when :present
-              # This will only happen on retarded packaging systems
-              # that can't query versions.
-              return true
-            else
-              self.debug "#{@resource.name} #{is.inspect} is installed, latest is #{@latest.inspect}"
+            case
+              when is.is_a?(Array) && is.include?(@latest)
+                return true
+              when is == @latest
+                return true
+              when is == :present
+                # This will only happen on retarded packaging systems
+                # that can't query versions.
+                return true
+              else
+                self.debug "#{@resource.name} #{is.inspect} is installed, latest is #{@latest.inspect}"
             end
+
+
           when :absent
             return true if is == :absent or is == :purged
           when :purged

data/lib/puppet/type/resources.rb

@@ -118,10 +118,10 @@ Puppet::Type.newtype(:resources) do
     return true unless self[:unless_system_user]
 
     resource[:audit] = :uid
-    current_values = resource.retrieve_resource
 
     return false if system_users.include?(resource[:name])
 
+    current_values = resource.retrieve_resource
     current_values[resource.property(:uid)] > self[:unless_system_user]
   end
 

data/lib/puppet/type/ssh_authorized_key.rb

@@ -20,11 +20,10 @@ module Puppet
     newproperty(:type) do
       desc "The encryption type used: ssh-dss or ssh-rsa."
 
-      newvalue("ssh-dss")
-      newvalue("ssh-rsa")
+      newvalues :'ssh-dss', :'ssh-rsa', :'ecdsa-sha2-nistp256', :'ecdsa-sha2-nistp384', :'ecdsa-sha2-nistp521'
 
-      aliasvalue(:dsa, "ssh-dss")
-      aliasvalue(:rsa, "ssh-rsa")
+      aliasvalue(:dsa, :'ssh-dss')
+      aliasvalue(:rsa, :'ssh-rsa')
     end
 
     newproperty(:key) do

data/lib/puppet/type/sshkey.rb

@@ -9,10 +9,10 @@ module Puppet
     newproperty(:type) do
       desc "The encryption type used.  Probably ssh-dss or ssh-rsa."
 
-      newvalue("ssh-dss")
-      newvalue("ssh-rsa")
-      aliasvalue(:dsa, "ssh-dss")
-      aliasvalue(:rsa, "ssh-rsa")
+      newvalues :'ssh-dss', :'ssh-rsa', :'ecdsa-sha2-nistp256', :'ecdsa-sha2-nistp384', :'ecdsa-sha2-nistp521'
+
+      aliasvalue(:dsa, :'ssh-dss')
+      aliasvalue(:rsa, :'ssh-rsa')
     end
 
     newproperty(:key) do

data/lib/puppet/type/user.rb

@@ -250,6 +250,7 @@ module Puppet
           raise ArgumentError, "Group names must be provided, not GID numbers."
         end
         raise ArgumentError, "Group names must be provided as an array, not a comma-separated list." if value.include?(",")
+        raise ArgumentError, "Group names must not be empty. If you want to specify \"no groups\" pass an empty array" if value.empty?
       end
     end
 

data/lib/puppet/type/vlan.rb

@@ -23,4 +23,4 @@ Puppet::Type.newtype(:vlan) do
     newparam(:device_url) do
       desc "The URL of the router or switch maintaining this VLAN."
     end
-end
+end

data/lib/puppet/util.rb

@@ -196,8 +196,17 @@ module Util
       :windows => %r!^(([A-Z]:#{slash})|(#{slash}#{slash}#{name}#{slash}#{name})|(#{slash}#{slash}\?#{slash}#{name}))!i,
       :posix   => %r!^/!,
     }
+
+    # Due to weird load order issues, I was unable to remove this require.
+    # This is fixed in Telly so it can be removed there.
     require 'puppet'
-    platform ||= Puppet.features.microsoft_windows? ? :windows : :posix
+
+    # Ruby only sets File::ALT_SEPARATOR on Windows and the Ruby standard
+    # library uses that to test what platform it's on.  Normally in Puppet we
+    # would use Puppet.features.microsoft_windows?, but this method needs to
+    # be called during the initialization of features so it can't depend on
+    # that.
+    platform ||= File::ALT_SEPARATOR ? :windows : :posix
 
     !! (path =~ regexes[platform])
   end
@@ -292,7 +301,7 @@ module Util
   end
 
   def execute_posix(command, arguments, stdin, stdout, stderr)
-    child_pid = Kernel.fork do
+    child_pid = safe_posix_fork(stdin, stdout, stderr) do
       # We can't just call Array(command), and rely on it returning
       # things like ['foo'], when passed ['foo'], because
       # Array(command) will call command.to_a internally, which when
@@ -301,12 +310,6 @@ module Util
       command = [command].flatten
       Process.setsid
       begin
-        $stdin.reopen(stdin)
-        $stdout.reopen(stdout)
-        $stderr.reopen(stderr)
-
-        3.upto(256){|fd| IO::new(fd).close rescue nil}
-
         Puppet::Util::SUIDManager.change_privileges(arguments[:uid], arguments[:gid], true)
 
         ENV['LANG'] = ENV['LC_ALL'] = ENV['LC_MESSAGES'] = ENV['LANGUAGE'] = 'C'
@@ -320,6 +323,20 @@ module Util
   end
   module_function :execute_posix
 
+  def safe_posix_fork(stdin=$stdin, stdout=$stdout, stderr=$stderr, &block)
+    child_pid = Kernel.fork do
+      $stdin.reopen(stdin)
+      $stdout.reopen(stdout)
+      $stderr.reopen(stderr)
+
+      3.upto(256){|fd| IO::new(fd).close rescue nil}
+
+      block.call if block
+    end
+    child_pid
+  end
+  module_function :safe_posix_fork
+
   def execute_windows(command, arguments, stdin, stdout, stderr)
     command = command.map do |part|
       part.include?(' ') ? %Q["#{part.gsub(/"/, '\"')}"] : part
@@ -447,15 +464,15 @@ module Util
         newhash[name] = val
       end
     end
+    newhash
   end
 
   def symbolizehash!(hash)
-    hash.each do |name, val|
-      if name.is_a? String
-        hash[name.intern] = val
-        hash.delete(name)
-      end
-    end
+    # this is not the most memory-friendly way to accomplish this, but the
+    #  code re-use and clarity seems worthwhile.
+    newhash = symbolizehash(hash)
+    hash.clear
+    hash.merge!(newhash)
 
     hash
   end

data/lib/puppet/util/autoload.rb

@@ -48,7 +48,7 @@ class Puppet::Util::Autoload
 
   def initialize(obj, path, options = {})
     @path = path.to_s
-    raise ArgumentError, "Autoload paths cannot be fully qualified" if @path !~ /^\w/
+    raise ArgumentError, "Autoload paths cannot be fully qualified" if absolute_path?(@path)
     @object = obj
 
     self.class[obj] = self

data/lib/puppet/util/command_line.rb

@@ -67,10 +67,7 @@ module Puppet
           end
 
           app.run
-        elsif execute_external_subcommand then
-          # Logically, we shouldn't get here, but we do, so whatever.  We just
-          # return to the caller.  How strange we are. --daniel 2011-04-11
-        else
+        elsif ! execute_external_subcommand then
           unless subcommand_name.nil? then
             puts "Error: Unknown Puppet subcommand '#{subcommand_name}'"
           end
@@ -85,8 +82,7 @@ module Puppet
         path_to_subcommand = Puppet::Util.which(external_command)
         return false unless path_to_subcommand
 
-        system(path_to_subcommand, *args)
-        true
+        exec(path_to_subcommand, *args)
       end
 
       def legacy_executable_name

data/lib/puppet/util/instrumentation/indirection_probe.rb

@@ -26,4 +26,4 @@ class Puppet::Util::Instrumentation::IndirectionProbe
   def self.from_pson(data)
     self.new(data["name"])
   end
-end
+end

data/lib/puppet/util/instrumentation/instrumentable.rb

@@ -140,4 +140,4 @@ module Puppet::Util::Instrumentation::Instrumentable
     }
     nil # do not leak our probes to the exterior world
   end
-end
+end

data/lib/puppet/util/instrumentation/listeners/log.rb

@@ -26,4 +26,4 @@ Puppet::Util::Instrumentation.new_listener(:log) do
       @last_logs.dup
     }
   end
-end
+end

data/lib/puppet/util/instrumentation/listeners/performance.rb

@@ -27,4 +27,4 @@ Puppet::Util::Instrumentation.new_listener(:performance) do
       @samples.dup
     end
   end
-end
+end

data/lib/puppet/util/log.rb

@@ -196,7 +196,9 @@ class Puppet::Util::Log
   end
 
   def self.setup_default
-    Log.newdestination(Puppet.features.syslog? ? :syslog : Puppet[:puppetdlog])
+    Log.newdestination(
+      (Puppet.features.syslog?   ? :syslog   :
+      (Puppet.features.eventlog? ? :eventlog : Puppet[:puppetdlog])))
   end
 
   # Is the passed level a valid log level?

data/lib/puppet/util/log/destinations.rb

@@ -228,3 +228,41 @@ Puppet::Util::Log.newdesttype :array do
   end
 end
 
+Puppet::Util::Log.newdesttype :eventlog do
+  def self.suitable?(obj)
+    Puppet.features.eventlog?
+  end
+
+  def initialize
+    @eventlog = Win32::EventLog.open("Application")
+  end
+
+  def to_native(level)
+    case level
+    when :debug,:info,:notice
+      [Win32::EventLog::INFO, 0x01]
+    when :warning
+      [Win32::EventLog::WARN, 0x02]
+    when :err,:alert,:emerg,:crit
+      [Win32::EventLog::ERROR, 0x03]
+    end
+  end
+
+  def handle(msg)
+    native_type, native_id = to_native(msg.level)
+
+    @eventlog.report_event(
+      :source      => "Puppet",
+      :event_type  => native_type,
+      :event_id    => native_id,
+      :data        => (msg.source and msg.source != 'Puppet' ? "#{msg.source}: " : '') + msg.to_s
+    )
+  end
+
+  def close
+    if @eventlog
+      @eventlog.close
+      @eventlog = nil
+    end
+  end
+end

data/lib/puppet/util/monkey_patches.rb

@@ -170,3 +170,48 @@ module Kernel
     self
   end unless method_defined?(:tap)
 end
+
+# The mv method in Ruby 1.8.5 can't mv directories across devices
+# File.rename causes "Invalid cross-device link", which is rescued, but in Ruby
+# 1.8.5 it tries to recover with a copy and unlink, but the unlink causes the
+# error "Is a directory".  In newer Rubies remove_entry is used
+# The implementation below is what's used in Ruby 1.8.7 and Ruby 1.9
+if RUBY_VERSION == '1.8.5'
+  require 'fileutils'
+
+  module FileUtils
+    def mv(src, dest, options = {})
+      fu_check_options options, OPT_TABLE['mv']
+      fu_output_message "mv#{options[:force] ? ' -f' : ''} #{[src,dest].flatten.join ' '}" if options[:verbose]
+      return if options[:noop]
+      fu_each_src_dest(src, dest) do |s, d|
+        destent = Entry_.new(d, nil, true)
+        begin
+          if destent.exist?
+            if destent.directory?
+              raise Errno::EEXIST, dest
+            else
+              destent.remove_file if rename_cannot_overwrite_file?
+            end
+          end
+          begin
+            File.rename s, d
+          rescue Errno::EXDEV
+            copy_entry s, d, true
+            if options[:secure]
+              remove_entry_secure s, options[:force]
+            else
+              remove_entry s, options[:force]
+            end
+          end
+        rescue SystemCallError
+          raise unless options[:force]
+        end
+      end
+    end
+    module_function :mv
+
+    alias move mv
+    module_function :move
+  end
+end

data/lib/puppet/util/network_device/base.rb

@@ -24,4 +24,4 @@ class Puppet::Util::NetworkDevice::Base
       @transport.password = @url.password
     end
   end
-end
+end

data/lib/puppet/util/network_device/cisco.rb

@@ -1,4 +1,4 @@
 
 module Puppet::Util::NetworkDevice::Cisco
 
-end
+end

data/lib/puppet/util/network_device/cisco/facts.rb

@@ -69,4 +69,4 @@ class Puppet::Util::NetworkDevice::Cisco::Facts
     end
   end
 
-end
+end

data/lib/puppet/util/network_device/cisco/interface.rb

@@ -79,4 +79,4 @@ class Puppet::Util::NetworkDevice::Cisco::Interface
       Puppet.err "Error while executing #{command}, device returned #{out}" if out =~ /^%/mo
     end
   end
-end
+end

data/lib/puppet/util/network_device/config.rb

@@ -89,4 +89,4 @@ class Puppet::Util::NetworkDevice::Config < Puppet::Util::LoadedFile
     end
   end
 
-end
+end

data/lib/puppet/util/network_device/ipcalc.rb

@@ -65,4 +65,4 @@ module Puppet::Util::NetworkDevice::IPCalc
   def linklocal?(ip)
   end
 
-end
+end

data/lib/puppet/util/network_device/transport.rb

@@ -1,3 +1,3 @@
 # stub
 module Puppet::Util::NetworkDevice::Transport
-end
+end