puppet 3.4.3 → 3.5.0.rc1

data/lib/puppet/type/exec.rb

@@ -117,7 +117,7 @@ module Puppet
             end
           end
         rescue Timeout::Error
-          self.fail "Command exceeded timeout" % value.inspect
+          self.fail Puppet::Error, "Command exceeded timeout", $!
         end
 
         if log = @resource[:logoutput]
@@ -207,8 +207,8 @@ module Puppet
       desc "Whether to log command output in addition to logging the
         exit code.  Defaults to `on_failure`, which only logs the output
         when the command has an exit code that does not match any value
-        specified by the `returns` attribute.  In addition to the values
-        below, you may set this attribute to any legal log level."
+        specified by the `returns` attribute. As with any resource type,
+        the log level can be controlled with the `loglevel` metaparameter."
 
       defaultto :on_failure
 
@@ -265,7 +265,7 @@ module Puppet
         begin
           value = Float(value)
         rescue ArgumentError
-          raise ArgumentError, "The timeout must be a number."
+          raise ArgumentError, "The timeout must be a number.", $!.backtrace
         end
         [value, 0.0].max
       end
@@ -375,7 +375,7 @@ module Puppet
       # If the file exists, return false (i.e., don't run the command),
       # else return true
       def check(value)
-        ! Puppet::FileSystem::File.exist?(value)
+        ! Puppet::FileSystem.exist?(value)
       end
     end
 

data/lib/puppet/type/file.rb

@@ -135,7 +135,7 @@ Puppet::Type.newtype(:file) do
         but not the local (destination) directory. Allows copying of
         a few files into a directory containing many
         unmanaged files without scanning all the local files.
-        This can only be used when a source parameter is specified. 
+        This can only be used when a source parameter is specified.
       * `false` --- Default of no recursion.
     "
 
@@ -250,12 +250,44 @@ Puppet::Type.newtype(:file) do
     desc "Whether to display differences when the file changes, defaulting to
         true.  This parameter is useful for files that may contain passwords or
         other secret data, which might otherwise be included in Puppet reports or
-        other insecure outputs.  If the global ``show_diff` configuration parameter
+        other insecure outputs.  If the global ``show_diff` setting
         is false, then no diffs will be shown even if this parameter is true."
 
     defaultto :true
   end
 
+  newparam(:validate_cmd) do
+    desc "A command for validating the file's syntax before replacing it. If
+      Puppet would need to rewrite a file due to new `source` or `content`, it
+      will check the new content's validity first. If validation fails, the file
+      resource will fail.
+
+      This command must have a fully qualified path, and should contain a
+      percent (`%`) token where it would expect an input file. It must exit `0`
+      if the syntax is correct, and non-zero otherwise. The command will be
+      run on the target system while applying the catalog, not on the puppet master.
+
+      Example:
+
+          file { '/etc/apache2/apache2.conf':
+            content      => 'example',
+            validate_cmd => '/usr/sbin/apache2 -t -f %',
+          }
+
+      This would replace apache2.conf only if the test returned true.
+
+      Note that if a validation command requires a `%` as part of its text,
+      you can specify a different placeholder token with the
+      `validate_replacement` attribute."
+  end
+
+  newparam(:validate_replacement) do
+    desc "The replacement string in a `validate_cmd` that will be replaced
+      with an input file name. Defaults to: `%`"
+
+    defaultto '%'
+  end
+
   # Autorequire the nearest ancestor directory found in the catalog.
   autorequire(:file) do
     req = []
@@ -695,7 +727,7 @@ Puppet::Type.newtype(:file) do
     end
 
     @stat = begin
-      Puppet::FileSystem::File.new(self[:path]).send(method)
+      Puppet::FileSystem.send(method, self[:path])
     rescue Errno::ENOENT => error
       nil
     rescue Errno::ENOTDIR => error
@@ -726,6 +758,12 @@ Puppet::Type.newtype(:file) do
         content_checksum = write_content(file)
         file.flush
         fail_if_checksum_is_wrong(file.path, content_checksum) if validate_checksum?
+        if self[:validate_cmd]
+          output = Puppet::Util::Execution.execute(self[:validate_cmd].gsub(self[:validate_replacement], file.path), :failonfail => true, :combine => true)
+          output.split(/\n/).each { |line|
+            self.debug(line)
+          }
+        end
       end
     else
       umask = mode ? 000 : 022
@@ -777,7 +815,7 @@ Puppet::Type.newtype(:file) do
   # @api private
   def remove_file(current_type, wanted_type)
     debug "Removing existing #{current_type} for replacement with #{wanted_type}"
-    Puppet::FileSystem::File.unlink(self[:path])
+    Puppet::FileSystem.unlink(self[:path])
     stat_needed
     true
   end

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

@@ -3,14 +3,13 @@ require 'uri'
 require 'tempfile'
 
 require 'puppet/util/checksums'
-require 'puppet/network/http/api/v1'
+require 'puppet/network/http'
 require 'puppet/network/http/compression'
 
 module Puppet
   Puppet::Type.type(:file).newproperty(:content) do
     include Puppet::Util::Diff
     include Puppet::Util::Checksums
-    include Puppet::Network::HTTP::API::V1
     include Puppet::Network::HTTP::Compression.module
 
     attr_reader :actual_content
@@ -112,7 +111,7 @@ module Puppet
 
       if ! result and Puppet[:show_diff] and resource.show_diff?
         write_temporarily do |path|
-          notice "\n" + diff(@resource[:path], path)
+          send @resource[:loglevel], "\n" + diff(@resource[:path], path)
         end
       end
       result
@@ -127,7 +126,7 @@ module Puppet
       begin
         resource.parameter(:checksum).sum_file(resource[:path])
       rescue => detail
-        raise Puppet::Error, "Could not read #{ftype} #{@resource.title}: #{detail}"
+        raise Puppet::Error, "Could not read #{ftype} #{@resource.title}: #{detail}", detail.backtrace
       end
     end
 
@@ -211,7 +210,7 @@ module Puppet
 
       request.do_request(:fileserver) do |req|
         connection = Puppet::Network::HttpPool.http_instance(req.server, req.port)
-        connection.request_get(indirection2uri(req), add_accept_encoding({"Accept" => "raw"}), &block)
+        connection.request_get(Puppet::Network::HTTP::API::V1.indirection2uri(req), add_accept_encoding({"Accept" => "raw"}), &block)
       end
     end
 
@@ -234,7 +233,7 @@ module Puppet
 
       dipper.getfile(sum)
     rescue => detail
-      fail "Could not retrieve content for #{should} from filebucket: #{detail}"
+      self.fail Puppet::Error, "Could not retrieve content for #{should} from filebucket: #{detail}", detail
     end
   end
 end

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

@@ -54,7 +54,7 @@ module Puppet
     nodefault
 
     newvalue(:absent) do
-      Puppet::FileSystem::File.unlink(@resource[:path])
+      Puppet::FileSystem.unlink(@resource[:path])
     end
 
     aliasvalue(:false, :absent)
@@ -79,7 +79,7 @@ module Puppet
     newvalue(:directory, :event => :directory_created) do
       mode = @resource.should(:mode)
       parent = File.dirname(@resource[:path])
-      unless Puppet::FileSystem::File.exist? parent
+      unless Puppet::FileSystem.exist? parent
         raise Puppet::Error,
           "Cannot create #{@resource[:path]}; parent directory #{parent} does not exist"
       end
@@ -139,7 +139,7 @@ module Puppet
     def check
       basedir = File.dirname(@resource[:path])
 
-      if ! Puppet::FileSystem::File.exist?(basedir)
+      if ! Puppet::FileSystem.exist?(basedir)
         raise Puppet::Error,
           "Can not create #{@resource.title}; parent directory does not exist"
       elsif ! FileTest.directory?(basedir)

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

@@ -58,7 +58,7 @@ module Puppet
         begin
           uri = URI.parse(URI.escape(source))
         rescue => detail
-          self.fail "Could not understand source #{source}: #{detail}"
+          self.fail Puppet::Error, "Could not understand source #{source}: #{detail}", detail
         end
 
         self.fail "Cannot use relative URLs '#{source}'" unless uri.absolute?
@@ -101,7 +101,7 @@ module Puppet
       raise Puppet::DevError, "No source for content was stored with the metadata" unless metadata.source
 
       unless tmp = Puppet::FileServing::Content.indirection.find(metadata.source, :environment => resource.catalog.environment, :links => resource[:links])
-        fail "Could not find any content at %s" % metadata.source
+        self.fail "Could not find any content at %s" % metadata.source
       end
       @content = tmp.content
     end
@@ -141,7 +141,7 @@ module Puppet
         when :ignore
           next
         when :use_when_creating
-          next if Puppet::FileSystem::File.exist?(resource[:path])
+          next if Puppet::FileSystem.exist?(resource[:path])
         end
 
         copy_source_value(metadata_method)
@@ -169,16 +169,22 @@ module Puppet
       return nil unless value
       value.each do |source|
         begin
-          if data = Puppet::FileServing::Metadata.indirection.find(source, :environment => resource.catalog.environment, :links => resource[:links])
+          options = {
+            :environment          => resource.catalog.environment,
+            :links                => resource[:links],
+            :source_permissions   => resource[:source_permissions]
+          }
+
+          if data = Puppet::FileServing::Metadata.indirection.find(source, options)
             @metadata = data
             @metadata.source = source
             break
           end
         rescue => detail
-          fail detail, "Could not retrieve file metadata for #{source}: #{detail}"
+          self.fail Puppet::Error, "Could not retrieve file metadata for #{source}: #{detail}", detail
         end
       end
-      fail "Could not retrieve information from environment #{resource.catalog.environment} source(s) #{value.join(", ")}" unless @metadata
+      self.fail "Could not retrieve information from environment #{resource.catalog.environment} source(s) #{value.join(", ")}" unless @metadata
       @metadata
     end
 

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

@@ -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 Puppet::FileSystem::File.exist?(@resource[:path])
+      raise Puppet::Error, "Could not remove existing file" if Puppet::FileSystem.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
-              Puppet::FileSystem::File.new(target).symlink(@resource[:path])
+              Puppet::FileSystem.symlink(target, @resource[:path])
             end
           else
-            Puppet::FileSystem::File.new(target).symlink(@resource[:path])
+            Puppet::FileSystem.symlink(target, @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 Puppet::FileSystem::File.exist?(@resource[:path])
+      elsif ! @resource.replace? and Puppet::FileSystem.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 Puppet::FileSystem::File.new(@resource[:path]).readlink
+          return Puppet::FileSystem.readlink(@resource[:path])
         else
           return :notlink
         end

data/lib/puppet/type/k5login.rb

@@ -37,7 +37,7 @@ Puppet::Type.newtype(:k5login) do
 
     # Does this file exist?
     def exists?
-      Puppet::FileSystem::File.exist?(@resource[:name])
+      Puppet::FileSystem.exist?(@resource[:name])
     end
 
     # create the file
@@ -51,12 +51,12 @@ Puppet::Type.newtype(:k5login) do
 
     # remove the file
     def destroy
-      Puppet::FileSystem::File.unlink(@resource[:name])
+      Puppet::FileSystem.unlink(@resource[:name])
     end
 
     # Return the principals
     def principals(dummy_argument=:work_arround_for_ruby_GC_bug)
-      if Puppet::FileSystem::File.exist?(@resource[:name])
+      if Puppet::FileSystem.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" % (Puppet::FileSystem::File.new(@resource[:name]).stat.mode & 007777)
+      "%o" % (Puppet::FileSystem.stat(@resource[:name]).mode & 007777)
     end
 
     # Set the file mode, converting from a string to an integer.

data/lib/puppet/type/mount.rb

@@ -255,7 +255,7 @@ module Puppet
       newvalues(:true, :false)
       defaultto do
         case Facter.value(:operatingsystem)
-        when "FreeBSD", "Darwin", "AIX", "DragonFly"
+        when "FreeBSD", "Darwin", "AIX", "DragonFly", "OpenBSD"
           false
         else
           true

data/lib/puppet/type/package.rb

@@ -50,6 +50,11 @@ module Puppet
       passed to the installer command."
     feature :uninstall_options, "The provider accepts options to be
       passed to the uninstaller command."
+    feature :package_settings, "The provider accepts package_settings to be
+      ensured for the given package. The meaning and format of these settings is
+      provider-specific.",
+      :methods => [:package_settings_insync?, :package_settings, :package_settings=]
+
 
     ensurable do
       desc <<-EOT
@@ -90,7 +95,7 @@ module Puppet
         begin
           provider.update
         rescue => detail
-          self.fail "Could not update: #{detail}"
+          self.fail Puppet::Error, "Could not update: #{detail}", detail
         end
 
         if current == :absent
@@ -104,7 +109,7 @@ module Puppet
         begin
           provider.install
         rescue => detail
-          self.fail "Could not update: #{detail}"
+          self.fail Puppet::Error, "Could not update: #{detail}", detail
         end
 
         if self.retrieve == :absent
@@ -233,8 +238,79 @@ module Puppet
       end
     end
 
+    newproperty(:package_settings, :required_features=>:package_settings) do
+      desc "Package settings. The definition of package settings is provider
+        specific. In general, these are certain properties which alter contents
+        of a package being installed. An example of package settings are the
+        FreeBSD ports options.
+
+        The package_settings attribute is a property. This means that the options
+        can be enforced during package installation and verified/retrieved
+        for packages that are already installed.
+
+        For example, ports provider on FreeBSD implements the package settings
+        as port build options (the ones you normally set with make config).
+        There is a simple usage example for this particular provider:
+
+            package { 'www/apache22':
+              package_settings => { 'SUEXEC' => false }
+            }
+
+        The above manifest ensures, that apache22 is compiled without SUEXEC
+        module.
+
+        Despite the package_settings are provider specific, the typical
+        behavior, when you change package's package_settings in your manifest,
+        is to reinstall package with new settings.
+        "
+
+      validate do |value|
+        if provider.respond_to?(:package_settings_validate)
+          provider.package_settings_validate(value)
+        else
+          super(value)
+        end
+      end
+
+      munge do |value|
+        if provider.respond_to?(:package_settings_munge)
+          provider.package_settings_munge(value)
+        else
+          super(value)
+        end
+      end
+
+      def insync?(is)
+        provider.package_settings_insync?(should, is)
+      end
+
+      def should_to_s(newvalue)
+        if provider.respond_to?(:package_settings_should_to_s)
+          provider.package_settings_should_to_s(should, newvalue)
+        else
+          super(newvalue)
+        end
+      end
+
+      def is_to_s(currentvalue)
+        if provider.respond_to?(:package_settings_is_to_s)
+          provider.package_settings_is_to_s(should, currentvalue)
+        else
+          super(currentvalue)
+        end
+      end
+
+      def change_to_s(currentvalue, newvalue)
+        if provider.respond_to?(:package_settings_change_to_s)
+          provider.package_settings_change_to_s(currentvalue, newvalue)
+        else
+          super(currentvalue,newvalue)
+        end
+      end
+    end
+
     newparam(:source) do
-      desc "Where to find the actual package.  This must be a local file
+      desc "Where to find the actual package. This must be a local file
         (or on a network file system) or a URL that your specific
         packaging type understands; Puppet will not retrieve files for you,
         although you can manage packages as `file` resources."

data/lib/puppet/type/resources.rb

@@ -65,6 +65,28 @@ Puppet::Type.newtype(:resources) do
     }
   end
 
+  newparam(:unless_uid) do
+     desc "This keeps specific uids or ranges of uids from being purged when purge is true.
+       Accepts ranges, integers and (mixed) arrays of both."
+
+     munge do |value|
+       case value
+       when /^\d+/
+         [Integer(value)]
+       when Integer
+         [value]
+       when Range
+         [value]
+       when Array
+         value
+       when /^\[\d+/
+         value.split(',').collect{|x| x.include?('..') ? Integer(x.split('..')[0])..Integer(x.split('..')[1]) : Integer(x) }
+       else
+         raise ArgumentError, "Invalid value #{value.inspect}"
+       end
+     end
+   end
+
   def check(resource)
     @checkmethod ||= "#{self[:name]}_check"
     @hascheck ||= respond_to?(@checkmethod)
@@ -112,18 +134,25 @@ Puppet::Type.newtype(:resources) do
     @resource_type
   end
 
-  # Make sure we don't purge users below a certain uid, if the check
-  # is enabled.
+  # Make sure we don't purge users with specific uids
   def user_check(resource)
     return true unless self[:name] == "user"
     return true unless self[:unless_system_user]
-
     resource[:audit] = :uid
+    current_values = resource.retrieve_resource
+    current_uid = current_values[resource.property(:uid)]
+    unless_uids = self[:unless_uid]
 
     return false if system_users.include?(resource[:name])
 
-    current_values = resource.retrieve_resource
-    current_values[resource.property(:uid)] > self[:unless_system_user]
+    if unless_uids && unless_uids.length > 0
+      unless_uids.each do |unless_uid|
+        return false if unless_uid == current_uid
+        return false if unless_uid.respond_to?('include?') && unless_uid.include?(current_uid)
+      end
+    end
+
+    current_uid > self[:unless_system_user]
   end
 
   def system_users