puppet 3.5.1-x86-mingw32 → 3.6.0.rc1-x86-mingw32

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

@@ -9,25 +9,35 @@ Puppet::Type.type(:file).newparam(:checksum) do
 
     The default checksum type is md5."
 
-  newvalues "md5", "md5lite", "mtime", "ctime", "none"
+  newvalues "md5", "md5lite", "sha256", "sha256lite", "mtime", "ctime", "none"
 
-  defaultto :md5
+  defaultto do
+    Puppet[:digest_algorithm].to_sym
+  end
 
   def sum(content)
-    type = value || :md5 # because this might be called before defaults are set
+    type = digest_algorithm()
     "{#{type}}" + send(type, content)
   end
 
   def sum_file(path)
-    type = value || :md5 # because this might be called before defaults are set
+    type = digest_algorithm()
     method = type.to_s + "_file"
     "{#{type}}" + send(method, path).to_s
   end
 
   def sum_stream(&block)
-    type = value || :md5 # same comment as above
+    type = digest_algorithm()
     method = type.to_s + "_stream"
     checksum = send(method, &block)
     "{#{type}}#{checksum}"
   end
+
+  private
+
+  # Return the appropriate digest algorithm with fallbacks in case puppet defaults have not
+  # been initialized.
+  def digest_algorithm
+    value || Puppet[:digest_algorithm].to_sym
+  end
 end

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

@@ -206,7 +206,9 @@ module Puppet
     end
 
     def get_from_source(source_or_content, &block)
-      request = Puppet::Indirector::Request.new(:file_content, :find, source_or_content.full_path.sub(/^\//,''), nil, :environment => resource.catalog.environment)
+      source = source_or_content.uri
+
+      request = Puppet::Indirector::Request.new(:file_content, :find, source.to_s, nil, :environment => resource.catalog.environment)
 
       request.do_request(:fileserver) do |req|
         connection = Puppet::Network::HttpPool.http_instance(req.server, req.port)

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

@@ -207,17 +207,17 @@ module Puppet
     def port
       (uri and uri.port) or Puppet.settings[:masterport]
     end
-    private
-
-    def scheme
-      (uri and uri.scheme)
-    end
 
     def uri
       @uri ||= URI.parse(URI.escape(metadata.source))
     end
 
     private
+
+    def scheme
+      (uri and uri.scheme)
+    end
+
     def found?
       ! (metadata.nil? or metadata.ftype.nil?)
     end

data/lib/puppet/type/package.rb

@@ -239,30 +239,25 @@ module Puppet
     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.
+      desc "Settings that can change the contents or configuration of a package.
 
-        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.
+        The formatting and effects of package_settings are provider-specific; any
+        provider that implements them must explain how to use them in its
+        documentation. (Our general expectation is that if a package is
+        installed but its settings are out of sync, the provider should
+        re-install that package with the desired settings.)
 
-        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:
+        An example of how package_settings could be used is FreeBSD's port build
+        options --- a future version of the provider could accept a hash of options,
+        and would reinstall the port if the installed version lacked the correct
+        settings.
 
             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.
-        "
+        Again, check the documentation of your platform's package provider to see
+        the actual usage."
 
       validate do |value|
         if provider.respond_to?(:package_settings_validate)

data/lib/puppet/type/resources.rb

@@ -21,7 +21,9 @@ Puppet::Type.newtype(:resources) do
   newparam(:purge, :boolean => true, :parent => Puppet::Parameter::Boolean) do
     desc "Purge unmanaged resources.  This will delete any resource
       that is not specified in your configuration
-      and is not required by any specified resources."
+      and is not required by any specified resources.
+      Purging ssh_authorized_keys this way is deprecated; see the
+      purge_ssh_keys parameter of the user type for a better alternative."
 
     defaultto :false
 

data/lib/puppet/type/scheduled_task.rb

@@ -98,9 +98,8 @@ Puppet::Type.newtype(:scheduled_task) do
             first become active. Several time formats will work, but we
             suggest 24-hour time formatted as HH:MM.
           * `start_date` ---  The date when the trigger should first become active.
-            Defaults to "today." Several date formats will work, including
-            special dates like "today," but we suggest formatting dates as
-            YYYY-MM-DD.
+            Defaults to the current date. You should format dates as YYYY-MM-DD,
+            although other date formats may work. (Under the hood, this uses `Date.parse`.)
       * For daily triggers:
           * `every` --- How often the task should run, as a number of days. Defaults
             to 1. ("2" means every other day, "3" means every three days, etc.)
@@ -132,7 +131,7 @@ Puppet::Type.newtype(:scheduled_task) do
           # May, July, September, and November, starting after August 31st, 2011.
           trigger => {
             schedule   => monthly,
-            start_date => '2011-08-31',   # Defaults to 'today'
+            start_date => '2011-08-31',   # Defaults to current date
             start_time => '08:00',        # Must be specified
             months     => [1,3,5,7,9,11], # Defaults to all
             on         => [1, 15, last],  # Must be specified
@@ -142,7 +141,7 @@ Puppet::Type.newtype(:scheduled_task) do
           # starting after August 31st, 2011.
           trigger => {
             schedule         => monthly,
-            start_date       => '2011-08-31', # Defaults to 'today'
+            start_date       => '2011-08-31', # Defaults to current date
             start_time       => '08:00',      # Must be specified
             months           => [1,3,5],      # Defaults to all
             which_occurrence => first,        # Must be specified

data/lib/puppet/type/service.rb

@@ -17,7 +17,10 @@ module Puppet
       Puppet 2.7 and newer expect init scripts to have a working status command.
       If this isn't the case for any of your services' init scripts, you will
       need to set `hasstatus` to false and possibly specify a custom status
-      command in the `status` attribute.
+      command in the `status` attribute. As a last resort, Puppet will attempt to
+      search the process table by calling whatever command is listed in the `ps`
+      fact. The default search pattern is the name of the service, but you can
+      specify it with the `pattern` attribute.
 
       **Refresh:** `service` resources can respond to refresh events (via
       `notify`, `subscribe`, or the `~>` arrow). If a `service` receives an
@@ -37,6 +40,8 @@ module Puppet
 
     feature :controllable, "The provider uses a control variable."
 
+    feature :flaggable, "The provider can pass flags to the service."
+
     newproperty(:enable, :required_features => :enableable) do
       desc "Whether a service should be enabled to start at boot.
         This property behaves quite differently depending on the platform;
@@ -97,6 +102,10 @@ module Puppet
       end
     end
 
+    newproperty(:flags, :required_features => :flaggable) do
+      desc "Specify a string of flags to pass to the startup script."
+    end
+
     newparam(:binary) do
       desc "The path to the daemon.  This is only used for
         systems that do not support init scripts.  This binary will be
@@ -158,7 +167,8 @@ module Puppet
         command.
 
         Defaults to the name of the service. The pattern can be a simple string
-        or any legal Ruby pattern."
+        or any legal Ruby pattern, including regular expressions (which should
+        be quoted without enclosing slashes)."
 
       defaultto { @resource[:binary] || @resource[:name] }
     end

data/lib/puppet/type/user.rb

@@ -571,5 +571,111 @@ module Puppet
             being managed by some other NSS"
       defaultto false
     end
+
+    def eval_generate
+      return [] if self[:purge_ssh_keys].empty?
+      find_unmanaged_keys
+    end
+
+    newparam(:purge_ssh_keys) do
+      desc "Purge ssh keys authorized for the user
+            if they are not managed via ssh_authorized_keys. When true,
+            looks for keys in .ssh/authorized_keys in the user's home
+            directory. Possible values are true, false, or an array of
+            paths to file to search for authorized keys. If a path starts
+            with ~ or %h, this token is replaced with the user's home directory."
+
+      defaultto :false
+
+      # Use Symbols instead of booleans until PUP-1967 is resolved.
+      newvalues(:true, :false)
+
+      validate do |value|
+        if [ :true, :false ].include? value.to_s.intern
+          return
+        end
+        value = [ value ] if value.is_a?(String)
+        if value.is_a?(Array)
+          value.each do |entry|
+
+            raise ArgumentError, "Each entry for purge_ssh_keys must be a string, not a #{entry.class}" unless entry.is_a?(String)
+
+            valid_home = Puppet::Util.absolute_path?(entry) || entry =~ %r{^~/|^%h/}
+            raise ArgumentError, "Paths to keyfiles must be absolute, not #{entry}" unless valid_home
+          end
+          return
+        end
+        raise ArgumentError, "purge_ssh_keys must be true, false, or an array of file names, not #{value.inspect}"
+      end
+
+      munge do |value|
+        # Resolve string, boolean and symbol forms of true and false to a
+        # single representation.
+        test_sym = value.to_s.intern
+        value = test_sym if [:true, :false].include? test_sym
+
+        return [] if value == :false
+        home = resource[:home]
+        if value == :true and not home
+          raise ArgumentError, "purge_ssh_keys can only be true for users with a defined home directory"
+        end
+
+        return [ "#{home}/.ssh/authorized_keys" ] if value == :true
+        # value is an array - munge each value
+        [ value ].flatten.map do |entry|
+          if entry =~ /^~|^%h/ and not home
+            raise ArgumentError, "purge_ssh_keys value '#{value}' meta character ~ or %h only allowed for users with a defined home directory"
+          end
+          entry.gsub!(/^~\//, "#{home}/")
+          entry.gsub!(/^%h\//, "#{home}/")
+          entry
+        end
+      end
+    end
+
+    # Generate ssh_authorized_keys resources for purging. The key files are
+    # taken from the purge_ssh_keys parameter. The generated resources inherit
+    # all metaparameters from the parent user resource.
+    #
+    # @return [Array<Puppet::Type::Ssh_authorized_key] a list of resources
+    #   representing the found keys
+    # @see eval_generate
+    # @api private
+    def find_unmanaged_keys
+      self[:purge_ssh_keys].
+        select { |f| File.readable?(f) }.
+        map { |f| unknown_keys_in_file(f) }.
+        flatten.each do |res|
+          res[:ensure] = :absent
+          @parameters.each do |name, param|
+            res[name] = param.value if param.metaparam?
+          end
+        end
+    end
+
+    # Parse an ssh authorized keys file superficially, extract the comments
+    # on the keys. These are considered names of possible ssh_authorized_keys
+    # resources. Keys that are managed by the present catalog are ignored.
+    #
+    # @see eval_generate
+    # @api private
+    # @return [Array<Puppet::Type::Ssh_authorized_key] a list of resources
+    #   representing the found keys
+    def unknown_keys_in_file(keyfile)
+      names = []
+      File.new(keyfile).each do |line|
+        next if line.strip.empty?
+        next if line =~ /^\s*#/
+        names << line.strip.split.last
+      end
+
+      names.map { |keyname|
+        Puppet::Type.type(:ssh_authorized_key).new(
+          :name => keyname,
+          :target => keyfile)
+      }.reject { |res|
+        catalog.resource_refs.include? res.ref
+      }
+    end
   end
 end

data/lib/puppet/type/yumrepo.rb

@@ -211,7 +211,8 @@ Puppet::Type.newtype(:yumrepo) do
 
     newvalues(/.*/, :absent)
     validate do |value|
-      unless value == :absent or (1..99).include?(value.to_i)
+      next if value.to_s == 'absent'
+      unless (1..99).include?(value.to_i)
         fail("Must be within range 1-99")
       end
     end
@@ -301,4 +302,11 @@ Puppet::Type.newtype(:yumrepo) do
     end
   end
 
+  newproperty(:skip_if_unavailable) do
+    desc "Should yum skip this repository if unable to reach it.
+      #{YUM_BOOLEAN_DOC}
+      #{ABSENT_DOC}"
+
+    newvalues(YUM_BOOLEAN, :absent)
+  end
 end

data/lib/puppet/util/checksums.rb

@@ -4,6 +4,18 @@ require 'digest/sha1'
 # A stand-alone module for calculating checksums
 # in a generic way.
 module Puppet::Util::Checksums
+  # @deprecated
+  # In Puppet 4 we should switch this to `module_function` to make these methods
+  # private when this class is included.
+  extend self
+
+  # It's not a good idea to use some of these in some contexts: for example, I
+  # wouldn't try bucketing a file using the :none checksum type.
+  def known_checksum_types
+    [:sha256, :sha256lite, :md5, :md5lite, :sha1, :sha1lite,
+      :mtime, :ctime, :none]
+  end
+
   class FakeChecksum
     def <<(*args)
       self
@@ -12,7 +24,8 @@ module Puppet::Util::Checksums
 
   # Is the provided string a checksum?
   def checksum?(string)
-    string =~ /^\{(\w{3,5})\}\S+/
+    # 'sha256lite'.length == 10
+    string =~ /^\{(\w{3,10})\}\S+/
   end
 
   # Strip the checksum type from an existing checksum
@@ -25,6 +38,41 @@ module Puppet::Util::Checksums
     checksum =~ /^\{(\w+)\}/ ? $1 : nil
   end
 
+  # Calculate a checksum using Digest::SHA256.
+  def sha256(content)
+    require 'digest/sha2'
+    Digest::SHA256.hexdigest(content)
+  end
+
+  def sha256lite(content)
+    sha256(content[0..511])
+  end
+
+  def sha256_file(filename, lite = false)
+    require 'digest/sha2'
+
+    digest = Digest::SHA256.new
+    checksum_file(digest, filename,  lite)
+  end
+
+  def sha256lite_file(filename)
+    sha256_file(filename, true)
+  end
+
+  def sha256_stream(&block)
+    require 'digest/sha2'
+    digest = Digest::SHA256.new
+    yield digest
+    digest.hexdigest
+  end
+
+  def sha256_hex_length
+    64
+  end
+
+  alias :sha256lite_stream :sha256_stream
+  alias :sha256lite_hex_length :sha256_hex_length
+
   # Calculate a checksum using Digest::MD5.
   def md5(content)
     Digest::MD5.hexdigest(content)
@@ -52,7 +100,12 @@ module Puppet::Util::Checksums
     digest.hexdigest
   end
 
+  def md5_hex_length
+    32
+  end
+
   alias :md5lite_stream :md5_stream
+  alias :md5lite_hex_length :md5_hex_length
 
   # Return the :mtime timestamp of a file.
   def mtime_file(filename)
@@ -98,7 +151,12 @@ module Puppet::Util::Checksums
     digest.hexdigest
   end
 
+  def sha1_hex_length
+    40
+  end
+
   alias :sha1lite_stream :sha1_stream
+  alias :sha1lite_hex_length :sha1_hex_length
 
   # Return the :ctime of a file.
   def ctime_file(filename)
@@ -140,4 +198,5 @@ module Puppet::Util::Checksums
 
     digest.hexdigest
   end
+
 end

data/lib/puppet/util/diff.rb

@@ -10,7 +10,9 @@ module Puppet::Util::Diff
 
     command = [diff_cmd]
     if args = Puppet[:diff_args] and args != ""
-      command << args
+      args.split(' ').each do|arg|
+        command << arg
+      end
     end
     command << old << new
     Puppet::Util::Execution.execute(command, :failonfail => false, :combine => false)