puppet 5.5.22 → 6.0.0

data/lib/puppet/type/exec.rb

@@ -150,13 +150,9 @@ module Puppet
             end
           end
           unless log == :false
-            if @resource.parameter(:command).sensitive
-              self.send(log, "[output redacted]")
-            else
-              @output.split(/\n/).each { |line|
-                self.send(log, line)
-              }
-            end
+            @output.split(/\n/).each { |line|
+              self.send(log, line)
+            }
           end
         end
 
@@ -214,7 +210,7 @@ module Puppet
         this attribute."
 
       validate do |user|
-        if Puppet.features.microsoft_windows?
+        if Puppet::Util::Platform.windows?
           self.fail _("Unable to execute commands as other users on Windows")
         elsif !Puppet.features.root? && resource.current_username() != user
           self.fail _("Only root can execute commands as other users")
@@ -459,13 +455,9 @@ module Puppet
           return false
         end
 
-        if sensitive
-          self.debug("[output redacted]")
-        else
-          output.split(/\n/).each { |line|
-            self.debug(line)
-          }
-        end
+        output.split(/\n/).each { |line|
+          self.debug(line)
+        }
 
         status.exitstatus != 0
       end
@@ -515,13 +507,9 @@ module Puppet
           return false
         end
 
-        if sensitive
-          self.debug("[output redacted]")
-        else
-          output.split(/\n/).each { |line|
-            self.debug(line)
-          }
-        end
+        output.split(/\n/).each { |line|
+          self.debug(line)
+        }
 
         status.exitstatus == 0
       end
@@ -541,7 +529,7 @@ module Puppet
       # Stick the cwd in there if we have it
       reqs << self[:cwd] if self[:cwd]
 
-      file_regex = Puppet.features.microsoft_windows? ? %r{^([a-zA-Z]:[\\/]\S+)} : %r{^(/\S+)}
+      file_regex = Puppet::Util::Platform.windows? ? %r{^([a-zA-Z]:[\\/]\S+)} : %r{^(/\S+)}
 
       self[:command].scan(file_regex) { |str|
         reqs << str
@@ -593,15 +581,7 @@ module Puppet
           val = @parameters[check].value
           val = [val] unless val.is_a? Array
           val.each do |value|
-            if !@parameters[check].check(value)
-              # Give a debug message so users can figure out what command would have been
-              # but don't print sensitive commands or parameters in the clear
-              cmdstring = @parameters[:command].sensitive ? "[command redacted]" : @parameters[:command].value
-
-              debug(_("'%{cmd}' won't be executed because of failed check '%{check}'") % { cmd: cmdstring, check: check })
-
-              return false 
-            end
+            return false unless @parameters[check].check(value)
           end
         end
       }
@@ -634,25 +614,11 @@ module Puppet
 
     private
     def set_sensitive_parameters(sensitive_parameters)
-      # If any are sensitive, mark all as sensitive
-      sensitive = false
-      parameters_to_check = [:command, :unless, :onlyif]
-
-      parameters_to_check.each do |p| 
-        if sensitive_parameters.include?(p)
-          sensitive_parameters.delete(p)
-          sensitive = true
-        end
-      end
-
-      if sensitive
-        parameters_to_check.each do |p|
-          if parameters.include?(p)
-            parameter(p).sensitive = true
-          end
-        end
+      # Respect sensitive commands
+      if sensitive_parameters.include?(:command)
+        sensitive_parameters.delete(:command)
+        parameter(:command).sensitive = true
       end
-
       super(sensitive_parameters)
     end
   end

data/lib/puppet/type/file.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'digest/md5'
 require 'cgi'
 require 'etc'
@@ -12,7 +13,6 @@ require 'puppet/util/backups'
 require 'puppet/util/symbolic_file_mode'
 
 Puppet::Type.newtype(:file) do
-  include Puppet::Util::MethodHelper
   include Puppet::Util::Checksums
   include Puppet::Util::Backups
   include Puppet::Util::SymbolicFileMode
@@ -105,19 +105,6 @@ Puppet::Type.newtype(:file) do
       balancer to direct all filebucket traffic to a single master, or use
       something like an out-of-band rsync task to synchronize the content on all
       masters.
-
-      > **Note**: Enabling and using the backup option, and by extension the 
-        filebucket resource, requires appropriate planning and management to ensure 
-        that sufficient disk space is available for the file backups. Generally, you 
-        can implement this using one of the following two options:
-        - Use a `find` command and `crontab` entry to retain only the last X days 
-        of file backups. For example,
-        
-        ```shell script
-        find /opt/puppetlabs/server/data/puppetserver/bucket -type f -mtime +45 -atime +45 -print0 | xargs -0 rm
-        ```
-        
-        - Restrict the directory to a maximum size after which the oldest items are removed.
     EOT
 
     defaultto "puppet"
@@ -585,7 +572,8 @@ Puppet::Type.newtype(:file) do
     # remote system.
     mark_children_for_purging(children) if self.purge?
 
-    result = children.values.sort_by { |a| a[:path] }
+    # REVISIT: sort_by is more efficient?
+    result = children.values.sort { |a, b| a[:path] <=> b[:path] }
     remove_less_specific_files(result)
   end
 
@@ -761,7 +749,7 @@ Puppet::Type.newtype(:file) do
     # This check is done in retrieve to ensure it happens before we try to use
     # metadata in `copy_source_values`, but so it only fails the resource and not
     # catalog validation (because that would be a breaking change from Puppet 4).
-    if Puppet.features.microsoft_windows? && parameter(:source) &&
+    if Puppet::Util::Platform.windows? && parameter(:source) &&
       [:use, :use_when_creating].include?(self[:source_permissions])
       #TRANSLATORS "source_permissions => ignore" should not be translated
       err_msg = _("Copying owner/mode/group from the source file on Windows is not supported; use source_permissions => ignore.")
@@ -847,6 +835,9 @@ Puppet::Type.newtype(:file) do
     rescue Errno::EACCES
       warning _("Could not stat; permission denied")
       nil
+    rescue Errno::EINVAL
+      warning _("Could not stat; invalid pathname")
+      nil
     end
   end
 

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

@@ -122,9 +122,8 @@ module Puppet
 
     # Make sure we're also managing the checksum property.
     def should=(value)
-      # treat the value as a bytestring, in Ruby versions that support it, regardless of the encoding
-      # in which it has been supplied
-      value = value.dup.force_encoding(Encoding::ASCII_8BIT) if value.respond_to?(:force_encoding)
+      # treat the value as a bytestring
+      value = value.b if value.is_a?(String)
       @resource.newattr(:checksum) unless @resource.parameter(:checksum)
       super
     end

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

@@ -42,11 +42,7 @@ module Puppet
           send resource[:loglevel], "[diff redacted]"
         else
           write_temporarily(param) do |path|
-            diff_output = diff(resource[:path], path)
-            if diff_output.encoding == Encoding::BINARY || !diff_output.valid_encoding?
-              diff_output = "Binary files #{resource[:path]} and #{path} differ"
-            end
-            send resource[:loglevel], "\n" + diff_output
+            send resource[:loglevel], "\n" + diff(resource[:path], path)
           end
         end
       end

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

@@ -40,7 +40,7 @@ module Puppet
       Symbolic modes should be represented as a string of comma-separated
       permission clauses, in the form `<WHO><OP><PERM>`:
 
-      * "Who" should be u (user), g (group), o (other), and/or a (all)
+      * "Who" should be any combination of u (user), g (group), and o (other), or a (all)
       * "Op" should be = (set exact permissions), + (add select permissions),
         or - (remove select permissions)
       * "Perm" should be one or more of:
@@ -116,13 +116,8 @@ module Puppet
     # If we're not following links and we're a link, then we just turn
     # off mode management entirely.
     def insync?(currentvalue)
-      if provider.respond_to?(:munge_windows_system_group)
-        munged_mode = provider.munge_windows_system_group(currentvalue, @should)
-        return false if munged_mode.nil?
-        currentvalue = munged_mode
-      end
       if stat = @resource.stat and stat.ftype == "link" and @resource[:links] != :follow
-        self.debug _("Not managing symlink mode")
+        self.debug "Not managing symlink mode"
         return true
       else
         return super(currentvalue)

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

@@ -258,7 +258,7 @@ module Puppet
     def copy_source_value(metadata_method)
       param_name = (metadata_method == :checksum) ? :content : metadata_method
       if resource[param_name].nil? or resource[param_name] == :absent
-        if Puppet.features.microsoft_windows? && [:owner, :group, :mode].include?(metadata_method)
+        if Puppet::Util::Platform.windows? && [:owner, :group, :mode].include?(metadata_method)
           devfail "Should not have tried to use source owner/mode/group on Windows"
         end
 
@@ -320,6 +320,7 @@ module Puppet
       end
     end
 
+
     def chunk_file_from_source
       get_from_source do |response|
         case response.code

data/lib/puppet/type/filebucket.rb

@@ -42,23 +42,19 @@ module Puppet
     end
 
     newparam(:server) do
-      desc "The server providing the remote filebucket service.
+      desc "The server providing the remote filebucket service. Defaults to the
+        value of the `server` setting (that is, the currently configured
+        puppet master server).
 
-        This setting is _only_ consulted if the `path` attribute is set to `false`.
-
-        If this attribute is not specified, the first entry in the `server_list`
-        configuration setting is used, followed by the value of the `server` setting
-        if `server_list` is not set."
+        This setting is _only_ consulted if the `path` attribute is set to `false`."
+      defaultto { Puppet[:server] }
     end
 
     newparam(:port) do
-      desc "The port on which the remote server is listening.
-
-        This setting is _only_ consulted if the `path` attribute is set to `false`.
+      desc "The port on which the remote server is listening. Defaults to the
+        value of the `masterport` setting, which is usually %s." % Puppet[:masterport]
 
-        If this attribute is not specified, the first entry in the `server_list`
-        configuration setting is used, followed by the value of the `masterport`
-        setting if `server_list` is not set."
+      defaultto { Puppet[:masterport] }
     end
 
     newparam(:path) do

data/lib/puppet/type/group.rb

@@ -87,8 +87,6 @@ module Puppet
         behavior can be configured with `auth_membership`."
 
       def change_to_s(currentvalue, newvalue)
-        newvalue = actual_should(currentvalue, newvalue)
-
         currentvalue = currentvalue.join(",") if currentvalue != :absent
         newvalue = newvalue.join(",")
         super(currentvalue, newvalue)
@@ -112,33 +110,7 @@ module Puppet
 
         super(currentvalue)
       end
-
-      def should_to_s(newvalue)
-        is_to_s(actual_should(retrieve, newvalue))
-      end
-
-      # Calculates the actual should value given the current and
-      # new values. This is only used in should_to_s and change_to_s
-      # to fix the change notification issue reported in PUP-6542.
-      def actual_should(currentvalue, newvalue)
-        currentvalue = munge_members_value(currentvalue)
-        newvalue = munge_members_value(newvalue)
-
-        if @resource[:auth_membership]
-          newvalue.uniq.sort 
-        else
-          (currentvalue + newvalue).uniq.sort
-        end
-      end
-
-      # Useful helper to handle the possible property value types that we can
-      # both pass-in and return. It munges the value into an array
-      def munge_members_value(value)
-        return [] if value == :absent
-        return value.split(',') if value.is_a?(String)
-
-        value
-      end
+      alias :should_to_s :is_to_s
 
       validate do |value|
         if provider.respond_to?(:member_valid?)
@@ -175,8 +147,7 @@ module Puppet
     end
 
     newparam(:ia_load_module, :required_features => :manages_aix_lam) do
-      desc "The name of the I&A module to use to manage this group.
-        This should be set to `files` if managing local groups."
+      desc "The name of the I&A module to use to manage this user"
     end
 
     newproperty(:attributes, :parent => Puppet::Property::KeyValue, :required_features => :manages_aix_lam) do
@@ -217,8 +188,7 @@ module Puppet
              :required_features => :libuser,
              :parent => Puppet::Parameter::Boolean) do
       desc "Forces the management of local accounts when accounts are also
-            being managed by some other NSS. For AIX, refer to the
-            `ia_load_module` parameter."
+            being managed by some other NSS"
       defaultto false
     end
 

data/lib/puppet/type/notify.rb

@@ -11,12 +11,11 @@ module Puppet
     newproperty(:message, :idempotent => false) do
       desc "The message to be sent to the log."
       def sync
-        message = @sensitive ? 'Sensitive [value redacted]' : self.should
         case @resource["withpath"]
         when :true
-          send(@resource[:loglevel], message)
+          send(@resource[:loglevel], self.should)
         else
-          Puppet.send(@resource[:loglevel], message)
+          Puppet.send(@resource[:loglevel], self.should)
         end
         return
       end

data/lib/puppet/type/package.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # Define the different packaging systems.  Each package system is implemented
 # in a module, which then gets used to individually extend each package object.
 # This allows packages to exist on the same machine using different packaging
@@ -21,8 +20,8 @@ module Puppet
       requires in order to function, and you must meet those requirements
       to use a given provider.
 
-      You can declare multiple package resources with the same `name` as long
-      as they have unique titles, and specify different providers and commands.
+      You can declare multiple package resources with the same `name`, as long
+      as they specify different providers and have unique titles.
 
       Note that you must use the _title_ to make a reference to a package
       resource; `Package[<NAME>]` is not a synonym for `Package[<TITLE>]` like
@@ -54,25 +53,19 @@ module Puppet
     feature :holdable, "The provider is capable of placing packages on hold
         such that they are not automatically upgraded as a result of
         other package dependencies unless explicit action is taken by
-        a user or another package.",
-      :methods => [:hold, :unhold]
-    feature :install_only, "The provider accepts options to only install packages never update (kernels, etc.)"
+        a user or another package. Held is considered a superset of
+        installed.",
+      :methods => [:hold]
     feature :install_options, "The provider accepts options to be
       passed to the installer command."
     feature :uninstall_options, "The provider accepts options to be
       passed to the uninstaller command."
-    feature :disableable, "The provider can disable packages. This feature is used by specifying `disabled` as the
-      desired value for the package.",
-      :methods => [:disable]
-    feature :supports_flavors, "The provider accepts flavors, which are specific variants of packages."
     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=]
     feature :virtual_packages, "The provider accepts virtual package names for install and uninstall."
 
-    feature :targetable, "The provider accepts a targeted package management command."
-
     ensurable do
       desc <<-EOT
         What state the package should be in. On packaging systems that can
@@ -104,11 +97,7 @@ module Puppet
       end
 
       newvalue(:held, :event => :package_held, :required_features => :holdable) do
-        provider.deprecated_hold
-      end
-
-      newvalue(:disabled, :required_features => :disableable) do
-        provider.disable
+        provider.hold
       end
 
       # Alias the 'present' value.
@@ -158,7 +147,7 @@ module Puppet
         @should.each { |should|
           case should
           when :present
-            return true unless [:absent, :purged, :held, :disabled].include?(is)
+            return true unless [:absent, :purged, :held].include?(is)
           when :latest
             # Short-circuit packages that are not present
             return false if is == :absent || is == :purged
@@ -183,7 +172,7 @@ module Puppet
               when is == @latest
                 return true
               when is == :present
-                # This will only happen on packaging systems
+                # This will only happen on retarded packaging systems
                 # that can't query versions.
                 return true
               else
@@ -282,55 +271,20 @@ module Puppet
     providify
     paramclass(:provider).isnamevar
 
-    # Specify a targeted package management command.
-    newparam(:command, :required_features => :targetable) do
-      desc <<-EOT
-        The targeted command to use when managing a package:
-
-          package { 'mysql':
-            provider => gem,
-          }
-
-          package { 'mysql-opt':
-            name     => 'mysql',
-            provider => gem,
-            command  => '/opt/ruby/bin/gem',
-          }
-
-        Each provider defines a package management command; and uses the first
-        instance of the command found in the PATH.
-
-        Providers supporting the targetable feature allow you to specify the
-        absolute path of the package management command; useful when multiple
-        instances of the command are installed, or the command is not in the PATH.
-      EOT
-
-      isnamevar
-      defaultto :default
-    end
-
-    # We have more than one namevar, so we need title_patterns.
-    # However, we cheat and set the patterns to map to name only
-    # and completely ignore provider (and command, for targetable providers).
-    # So far, the logic that determines uniqueness appears to just
-    # "Do The Right Thing™" when provider (and command) are explicitly set.
+    # We have more than one namevar, so we need title_patterns. However, we
+    # cheat and set the patterns to map to name only and completely ignore
+    # provider. So far, the logic that determines uniqueness appears to just
+    # "Do The Right Thing™" when the provider is explicitly set by the user.
     #
     # The following resources will be seen as unique by puppet:
     #
     #     # Uniqueness Key: ['mysql', nil]
-    #     package {'mysql': }
+    #     package{'mysql': }
     #
-    #     # Uniqueness Key: ['mysql', 'gem', nil]
-    #     package {'gem-mysql':
-    #       name     => 'mysql,
-    #       provider => gem,
-    #     }
-    #
-    #     # Uniqueness Key: ['mysql', 'gem', '/opt/ruby/bin/gem']
-    #     package {'gem-mysql-opt':
+    #     # Uniqueness Key: ['mysql', 'gem']
+    #     package{'gem-mysql':
     #       name     => 'mysql,
     #       provider => gem
-    #       command  => '/opt/ruby/bin/gem',
     #     }
     #
     # This does not handle the case where providers like 'yum' and 'rpm' should
@@ -408,16 +362,6 @@ module Puppet
       end
     end
 
-    newproperty(:flavor, :required_features => :supports_flavors) do
-      desc "OpenBSD and DNF modules support 'flavors', which are
-        further specifications for which type of package you want."
-      validate do |value|
-        if [:disabled, "disabled"].include?(@resource[:ensure]) && value
-          raise ArgumentError, _('Cannot have both `ensure => disabled` and `flavor`')
-        end
-      end
-    end
-
     newparam(:source) do
       desc "Where to find the package file. This is only used by providers that don't
         automatically download packages from a central repository. (For example:
@@ -497,35 +441,9 @@ module Puppet
       newvalues(:true, :false)
     end
 
-    newparam(:enable_only, :boolean => false, :parent => Puppet::Parameter::Boolean) do
-      desc <<-EOT
-        Tells `dnf module` to only enable a specific module, instead
-        of installing its default profile.
-
-        Modules with no default profile will be enabled automatically
-        without the use of this parameter.
-
-        Conflicts with the `flavor` property, which selects a profile
-        to install.
-      EOT
-      defaultto false
-
-      validate do |value|
-        if [true, :true, "true"].include?(value) && @resource[:flavor]
-          raise ArgumentError, _('Cannot have both `enable_only => true` and `flavor`')
-        end
-        if [:disabled, "disabled"].include?(@resource[:ensure])
-          raise ArgumentError, _('Cannot have both `ensure => disabled` and `enable_only => true`')
-        end
-      end
-    end
-
-    newparam(:install_only, :boolean => false, :parent => Puppet::Parameter::Boolean, :required_features => :install_only) do
-      desc <<-EOT
-        It should be set for packages that should only ever be installed,
-        never updated. Kernels in particular fall into this category.
-      EOT
-      defaultto false
+    newparam(:flavor) do
+      desc "OpenBSD supports 'flavors', which are further specifications for
+        which type of package you want."
     end
 
     newparam(:install_options, :parent => Puppet::Parameter::PackageOptions, :required_features => :install_options) do
@@ -646,59 +564,5 @@ module Puppet
         provider.reinstall
       end
     end
-
-    newproperty(:mark, :required_features => :holdable) do
-      mark_doc='Valid values are: hold/none'
-      desc <<-EOT
-        Set to hold to tell Debian apt/Solaris pkg to hold the package version
-
-        #{mark_doc}
-        Default is "none". Mark can be specified with or without `ensure`,
-        if `ensure` is missing will default to "present".
-
-        Mark cannot be specified together with "purged", "absent" or "held"
-        values for `ensure`.
-      EOT
-      newvalues(:hold, :none)
-      munge do |value|
-        case value
-        when "hold", :hold
-          :hold
-        when "none", :none
-          :none
-        else
-          raise ArgumentError, _('Invalid hold value %{value}. %{doc}') % { value: value.inspect, doc: mark_doc}
-        end
-      end
-
-      def insync?(is)
-        @should[0] == is
-      end
-
-      def should
-        @should[0] if @should && @should.is_a?(Array) && @should.size == 1
-      end
-
-      def retrieve
-        provider.properties[:mark]
-      end
-
-      def sync
-        if @should[0] == :hold
-          provider.hold
-        else
-          provider.unhold
-        end
-      end
-    end
-
-    validate do
-      if :held == @parameters[:ensure].should
-        warning '"ensure=>held" has been deprecated and will be removed in a future version, use "mark=hold" instead'
-      end
-      if @parameters[:mark] && [:absent, :purged, :held].include?(@parameters[:ensure].should)
-        raise ArgumentError, _('You cannot use "mark" property while "ensure" is one of ["absent", "purged", "held"]')
-      end
-    end
   end
 end