puppet 3.8.7 → 4.0.0.rc1

data/lib/puppet/type/augeas.rb

@@ -104,6 +104,7 @@ Puppet::Type.newtype(:augeas) do
     * `remove <PATH>` --- Synonym for `rm`
     * `clear <PATH>` --- Sets the node at `PATH` to `NULL`, creating it if needed
     * `clearm <PATH> <SUB>` --- Sets multiple nodes (matching `SUB` relative to `PATH`) to `NULL`
+    * `touch <PATH>` --- Creates `PATH` with the value `NULL` if it does not exist
     * `ins <LABEL> (before|after) <PATH>` --- Inserts an empty node `LABEL` either before or after `PATH`.
     * `insert <LABEL> <WHERE> <PATH>` --- Synonym for `ins`
     * `mv <PATH> <OTHER PATH>` --- Moves a node at `PATH` to the new location `OTHER PATH`

data/lib/puppet/type/exec.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:exec) do
+  Type.newtype(:exec) do
     include Puppet::Util::Execution
     require 'timeout'
 
@@ -297,7 +297,7 @@ module Puppet
       desc "The number of times execution of the command should be tried.
         Defaults to '1'. This many attempts will be made to execute
         the command until an acceptable return code is returned.
-        Note that the timeout paramater applies to each try rather than
+        Note that the timeout parameter applies to each try rather than
         to the complete set of tries."
 
       munge do |value|

data/lib/puppet/type/file.rb

@@ -90,7 +90,7 @@ Puppet::Type.newtype(:file) do
       filebucket resource and a resource default for the `backup` attribute
       in site.pp:
 
-          # /etc/puppet/manifests/site.pp
+          # /etc/puppetlabs/puppet/manifests/site.pp
           filebucket { 'main':
             path   => false,                # This is required for remote filebuckets.
             server => 'puppet.example.com', # Optional; defaults to the configured puppet master.
@@ -148,20 +148,18 @@ Puppet::Type.newtype(:file) do
         The `source` attribute is not mandatory when using `recurse => true`, so you
         can enable purging in directories where all files are managed individually.
 
-        (Note: `inf` is a deprecated synonym for `true`.)
-
       By default, setting recurse to `remote` or `true` will manage _all_
       subdirectories. You can use the `recurselimit` attribute to limit the
       recursion depth.
     "
 
-    newvalues(:true, :false, :inf, :remote)
+    newvalues(:true, :false, :remote)
 
     validate { |arg| }
     munge do |value|
       newval = super(value)
       case newval
-      when :true, :inf; true
+      when :true; true
       when :false; false
       when :remote; :remote
       else
@@ -381,6 +379,11 @@ Puppet::Type.newtype(:file) do
 
     self.warning "Possible error: recurselimit is set but not recurse, no recursion will happen" if !self[:recurse] and self[:recurselimit]
 
+    if @parameters[:content] && @parameters[:content].actual_content
+      # Now that we know the checksum, update content (in case it was created before checksum was known).
+      @parameters[:content].value = @parameters[:checksum].sum(@parameters[:content].actual_content)
+    end
+
     provider.validate if provider.respond_to?(:validate)
   end
 
@@ -653,10 +656,6 @@ Puppet::Type.newtype(:file) do
       end
       children[meta.relative_path] ||= newchild(meta.relative_path)
       children[meta.relative_path][:source] = meta.source
-      if meta.ftype == "file"
-        children[meta.relative_path][:checksum] = Puppet[:digest_algorithm].to_sym
-      end
-
       children[meta.relative_path].parameter(:source).metadata = meta
     end
 

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

@@ -1,9 +1,11 @@
 require 'net/http'
 require 'uri'
 require 'tempfile'
+require 'date'
 
 require 'puppet/util/checksums'
 require 'puppet/network/http'
+require 'puppet/network/http/api/indirected_routes'
 require 'puppet/network/http/compression'
 
 module Puppet
@@ -72,19 +74,6 @@ module Puppet
       end
     end
 
-    def checksum_type
-      if source = resource.parameter(:source)
-        result = source.checksum
-      else
-        result = resource[:checksum]
-      end
-      if result =~ /^\{(\w+)\}.+/
-        return $1.to_sym
-      else
-        return result
-      end
-    end
-
     def length
       (actual_content and actual_content.length) || 0
     end
@@ -118,6 +107,21 @@ module Puppet
       result
     end
 
+    def property_matches?(current, desired)
+      basic = super
+      # The inherited equality is always accepted, so use it if valid.
+      time_types = [:mtime, :ctime]
+      checksum_type = resource.parameter(:checksum).value
+      return basic if basic || !time_types.include?(checksum_type)
+      return false unless current && desired
+      begin
+        raise if !time_types.include?(sumtype(current).to_sym) || !time_types.include?(sumtype(desired).to_sym)
+        DateTime.parse(sumdata(current)) >= DateTime.parse(sumdata(desired))
+      rescue => detail
+        self.fail Puppet::Error, "Resource with checksum_type #{checksum_type} didn't contain a date in #{current} or #{desired}", detail.backtrace
+      end
+    end
+
     def retrieve
       return :absent unless stat = @resource.stat
       ftype = stat.ftype
@@ -208,11 +212,11 @@ module Puppet
 
     def get_from_source(source_or_content, &block)
       source = source_or_content.metadata.source
-      request = Puppet::Indirector::Request.new(:file_content, :find, source, nil, :environment => resource.catalog.environment)
+      request = Puppet::Indirector::Request.new(:file_content, :find, source, nil, :environment => resource.catalog.environment_instance)
 
       request.do_request(:fileserver) do |req|
         connection = Puppet::Network::HttpPool.http_instance(req.server, req.port)
-        connection.request_get(Puppet::Network::HTTP::API::V1.indirection2uri(req), add_accept_encoding({"Accept" => "raw"}), &block)
+        connection.request_get(Puppet::Network::HTTP::API::IndirectedRoutes.request_to_uri(req), add_accept_encoding({"Accept" => "binary"}), &block)
       end
     end
 

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

@@ -10,7 +10,7 @@ module Puppet
 
     desc <<-'EOT'
       The desired permissions mode for the file, in symbolic or numeric
-      notation. This value should be specified as a quoted string; do not use
+      notation. This value **must** be specified as a string; do not use
       un-quoted numbers to represent file modes.
 
       The `file` type uses traditional Unix permission schemes and translates
@@ -19,16 +19,22 @@ module Puppet
       you can leave `mode` unmanaged and use
       [the puppetlabs/acl module.](https://forge.puppetlabs.com/puppetlabs/acl)
 
-      Numeric modes should use the standard four-digit octal notation of
-      `<setuid/setgid/sticky><owner><group><other>` (e.g. 0644). Each of the
-      "owner," "group," and "other" digits should be a sum of the
-      permissions for that class of users, where read = 4, write = 2, and
-      execute/search = 1. When setting numeric permissions for
-      directories, Puppet sets the search permission wherever the read
-      permission is set.
+      Numeric modes should use the standard octal notation of
+      `<SETUID/SETGID/STICKY><OWNER><GROUP><OTHER>` (e.g. '0644').
+
+      * Each of the "owner," "group," and "other" digits should be a sum of the
+        permissions for that class of users, where read = 4, write = 2, and
+        execute/search = 1.
+      * The setuid/setgid/sticky digit is also a sum, where setuid = 4, setgid = 2,
+        and sticky = 1.
+      * The setuid/setgid/sticky digit is optional. If it is absent, Puppet will
+        clear any existing setuid/setgid/sticky permissions. (So to make your intent
+        clear, you should use at least four digits for numeric modes.)
+      * When specifying numeric permissions for directories, Puppet sets the search
+        permission wherever the read permission is set.
 
       Symbolic modes should be represented as a string of comma-separated
-      permission clauses, in the form `<who><op><perm>`:
+      permission clauses, in the form `<WHO><OP><PERM>`:
 
       * "Who" should be u (user), g (group), o (other), and/or a (all)
       * "Op" should be = (set exact permissions), + (add select permissions),
@@ -66,8 +72,7 @@ module Puppet
 
     validate do |value|
       if !value.is_a?(String)
-        Puppet.deprecation_warning("Non-string values for the file mode property are deprecated. It must be a string, " \
-          "either a symbolic mode like 'o+w,a+r' or an octal representation like '0644' or '755'.")
+        raise Puppet::Error, "The file mode specification must be a string, not '#{value.class.name}'"
       end
       unless value.nil? or valid_symbolic_mode?(value)
         raise Puppet::Error, "The file mode specification is invalid: #{value.inspect}"

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

@@ -6,7 +6,7 @@
 # drwxr-xr-x  root root system_u:object_r:root_t         /
 #
 # The context of '/' here is 'system_u:object_r:root_t'.  This is
-# three seperate fields:
+# three separate fields:
 #
 # system_u is the user context
 # object_r is the role context

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

@@ -26,8 +26,8 @@ module Puppet
 
       This will fetch a file from a module on the puppet master (or from a
       local module when using puppet apply). Given a `modulepath` of
-      `/etc/puppetlabs/puppet/modules`, the example above would resolve to
-      `/etc/puppetlabs/puppet/modules/name_of_module/files/filename`.
+      `/etc/puppetlabs/code/modules`, the example above would resolve to
+      `/etc/puppetlabs/code/modules/name_of_module/files/filename`.
 
       Unlike `content`, the `source` attribute can be used to recursively copy
       directories if the `recurse` attribute is set to `true` or `remote`. If
@@ -100,7 +100,7 @@ module Puppet
       return @content if @content
       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])
+      unless tmp = Puppet::FileServing::Content.indirection.find(metadata.source, :environment => resource.catalog.environment_instance, :links => resource[:links])
         self.fail "Could not find any content at %s" % metadata.source
       end
       @content = tmp.content
@@ -127,11 +127,10 @@ module Puppet
           if [:use, :use_when_creating].include?(resource[:source_permissions]) &&
             (resource[:owner] == nil || resource[:group] == nil || resource[:mode] == nil)
 
-            warning = "Copying %s from the source" <<
-                      " file on Windows is deprecated;" <<
+            err_msg = "Copying %s from the source" <<
+                      " file on Windows is not supported;" <<
                       " use source_permissions => ignore."
-            Puppet.deprecation_warning(warning % 'owner/mode/group')
-            resource.debug(warning % metadata_method.to_s)
+            self.fail Puppet::Error, err_msg % 'owner/mode/group'
           end
           # But never try to copy remote owner/group on Windows
           next if [:owner, :group].include?(metadata_method) && !local?
@@ -172,6 +171,7 @@ module Puppet
           options = {
             :environment          => resource.catalog.environment_instance,
             :links                => resource[:links],
+            :checksum_type        => resource[:checksum],
             :source_permissions   => resource[:source_permissions]
           }
 
@@ -240,20 +240,20 @@ module Puppet
       specified. (In all cases, explicit permissions will take precedence.)
       Valid values are `use`, `use_when_creating`, and `ignore`:
 
-      * `use` (the default) will cause Puppet to apply the owner, group,
+      * `ignore` (the default) will never apply the owner, group, or mode from
+        the `source` when managing a file. When creating new files without explicit
+        permissions, the permissions they receive will depend on platform-specific
+        behavior. On POSIX, Puppet will use the umask of the user it is running as.
+        On Windows, Puppet will use the default DACL associated with the user it is
+        running as.
+      * `use` will cause Puppet to apply the owner, group,
         and mode from the `source` to any files it is managing.
       * `use_when_creating` will only apply the owner, group, and mode from the
         `source` when creating a file; existing files will not have their permissions
         overwritten.
-      * `ignore` will never apply the owner, group, or mode from the `source` when
-        managing a file. When creating new files without explicit permissions,
-        the permissions they receive will depend on platform-specific behavior.
-        On POSIX, Puppet will use the umask of the user it is running as. On
-        Windows, Puppet will use the default DACL associated with the user it is
-        running as.
     EOT
 
-    defaultto :use
+    defaultto :ignore
     newvalues(:use, :use_when_creating, :ignore)
   end
 end

data/lib/puppet/type/filebucket.rb

@@ -1,7 +1,7 @@
 module Puppet
   require 'puppet/file_bucket/dipper'
 
-  newtype(:filebucket) do
+  Type.newtype(:filebucket) do
     @doc = <<-EOT
       A repository for storing and retrieving file content by MD5 checksum. Can
       be local to each agent node, or centralized on a puppet master server. All
@@ -27,7 +27,7 @@ module Puppet
       a filebucket resource and a resource default for the `backup` attribute
       in site.pp:
 
-          # /etc/puppet/manifests/site.pp
+          # /etc/puppetlabs/puppet/manifests/site.pp
           filebucket { 'main':
             path   => false,                # This is required for remote filebuckets.
             server => 'puppet.example.com', # Optional; defaults to the configured puppet master.

data/lib/puppet/type/group.rb

@@ -4,7 +4,7 @@ require 'puppet/property/keyvalue'
 require 'puppet/parameter/boolean'
 
 module Puppet
-  newtype(:group) do
+  Type.newtype(:group) do
     @doc = "Manage groups. On most platforms this can only create groups.
       Group membership must be managed on individual users.
 
@@ -80,9 +80,7 @@ module Puppet
 
     newproperty(:members, :array_matching => :all, :required_features => :manages_members) do
       desc "The members of the group. For directory services where group
-      membership is stored in the group objects, not the users. Use
-      with auth_membership to determine whether the specified members
-      are inclusive or the minimum."
+      membership is stored in the group objects, not the users."
 
       def change_to_s(currentvalue, newvalue)
         currentvalue = currentvalue.join(",") if currentvalue != :absent
@@ -101,27 +99,17 @@ module Puppet
       def is_to_s(currentvalue)
         if provider.respond_to?(:members_to_s)
           currentvalue = '' if currentvalue.nil?
-          currentvalue = currentvalue.is_a?(Array) ? currentvalue : currentvalue.split(',')
-
-          return provider.members_to_s(currentvalue)
+          return provider.members_to_s(currentvalue.split(','))
         end
 
         super(currentvalue)
       end
       alias :should_to_s :is_to_s
-
-      validate do |value|
-        if provider.respond_to?(:member_valid?)
-          return provider.member_valid?(value)
-        end
-      end
     end
 
     newparam(:auth_membership, :boolean => true, :parent => Puppet::Parameter::Boolean) do
-      desc "Whether the provider is authoritative for group membership. This
-        must be set to true to allow setting the group to no members with
-        `members => [],`."
-      defaultto true
+      desc "whether the provider is authoritative for group membership."
+      defaultto false
     end
 
     newparam(:name) do

data/lib/puppet/type/host.rb

@@ -1,7 +1,7 @@
 require 'puppet/property/ordered_list'
 
 module Puppet
-  newtype(:host) do
+  Type.newtype(:host) do
     ensurable
 
     newproperty(:ip) do
@@ -22,9 +22,13 @@ module Puppet
 
         return false
       end
+      def valid_newline?(addr)
+        return false if (addr =~ /\n/ || addr =~ /\r/)
+        return true
+      end
 
       validate do |value|
-        return true if valid_v4?(value) or valid_v6?(value)
+        return true if ((valid_v4?(value) || valid_v6?(value)) && (valid_newline?(value)))
         raise Puppet::Error, "Invalid IP address #{value.inspect}"
       end
     end
@@ -43,14 +47,18 @@ module Puppet
       end
 
       validate do |value|
+        # This regex already includes newline check.
         raise Puppet::Error, "Host aliases cannot include whitespace" if value =~ /\s/
-        raise Puppet::Error, "Host alias cannot be an empty string. Use an empty array to delete all host_aliases " if value =~ /^\s*$/
+        raise Puppet::Error, "Host aliases cannot be an empty string. Use an empty array to delete all host_aliases " if value =~ /^\s*$/
       end
 
     end
 
     newproperty(:comment) do
       desc "A comment that will be attached to the line with a # character."
+      validate do |value|
+        raise Puppet::Error, "Comment cannot include newline" if (value =~ /\n/ || value =~ /\r/)
+      end
     end
 
     newproperty(:target) do
@@ -76,6 +84,7 @@ module Puppet
             raise Puppet::Error, "Invalid host name"
           end
         end
+        raise Puppet::Error, "Hostname cannot include newline" if (value =~ /\n/ || value =~ /\r/)
       end
     end
 

data/lib/puppet/type/k5login.rb

@@ -55,7 +55,7 @@ Puppet::Type.newtype(:k5login) do
     end
 
     # Return the principals
-    def principals(dummy_argument=:work_arround_for_ruby_GC_bug)
+    def principals
       if Puppet::FileSystem.exist?(@resource[:name])
         File.readlines(@resource[:name]).collect { |line| line.chomp }
       else

data/lib/puppet/type/mailalias.rb

@@ -1,5 +1,5 @@
 module Puppet
-  newtype(:mailalias) do
+  Type.newtype(:mailalias) do
     @doc = "Creates an email alias in the local alias database."
 
     ensurable
@@ -10,7 +10,8 @@ module Puppet
 
     newproperty(:recipient, :array_matching => :all) do
       desc "Where email should be sent.  Multiple values
-        should be specified as an array."
+        should be specified as an array.  The file and the
+        recipient entries are mutually exclusive."
 
       def is_to_s(value)
         if value.include?(:absent)
@@ -20,10 +21,6 @@ module Puppet
         end
       end
 
-      def should
-        @should
-      end
-
       def should_to_s(value)
         if value.include?(:absent)
           super
@@ -33,6 +30,17 @@ module Puppet
       end
     end
 
+    newproperty(:file) do
+      desc "A file containing the alias's contents.  The file and the
+        recipient entries are mutually exclusive."
+
+      validate do |value|
+	unless Puppet::Util.absolute_path?(value)
+	  fail Puppet::Error, "File paths must be fully qualified, not '#{value}'"
+	end
+      end
+    end
+
     newproperty(:target) do
       desc "The file in which to store the aliases.  Only used by
         those providers that write to disk."
@@ -44,5 +52,11 @@ module Puppet
         end
       }
     end
+
+    validate do
+      if self[:recipient] && self[:file]
+	self.fail "You cannot specify both a recipient and a file"
+      end
+    end
   end
 end