puppet 6.4.5-x86-mingw32 → 6.5.0-x86-mingw32

data/lib/puppet/provider/service/windows.rb

@@ -35,12 +35,6 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
     raise Puppet::Error.new(_("Cannot enable %{resource_name} for manual start, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail )
   end
 
-  def delayed_start
-    Puppet::Util::Windows::Service.set_startup_mode( @resource[:name], :SERVICE_AUTO_START, true )
-  rescue => detail
-    raise Puppet::Error.new(_("Cannot enable %{resource_name} for delayed start, error was: %{detail}") % { resource_name: @resource[:name], detail: detail }, detail )
-  end
-
   def enabled?
     return :false unless Puppet::Util::Windows::Service.exists?(@resource[:name])
 
@@ -53,8 +47,6 @@ Puppet::Type.type(:service).provide :windows, :parent => :service do
         :true
       when :SERVICE_DEMAND_START
         :manual
-      when :SERVICE_DELAYED_AUTO_START
-        :delayed
       when :SERVICE_DISABLED
         :false
       else

data/lib/puppet/provider/user/directoryservice.rb

@@ -503,7 +503,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   def next_system_id(min_id=20)
     dscl_output = dscl '.', '-list', '/Users', 'uid'
     # We're ok with throwing away negative uids here. Also, remove nil values.
-    user_ids = dscl_output.split.compact.collect { |l| l.to_i if l =~ /^\d+$/ }
+    user_ids = dscl_output.split.compact.collect { |l| l.to_i if l.match(/^\d+$/) }
     ids = user_ids.compact!.sort! { |a,b| a.to_f <=> b.to_f }
     # We're just looking for an unused id in our sorted array.
     ids.each_index do |i|

data/lib/puppet/provider/user/hpux.rb

@@ -29,7 +29,7 @@ Puppet::Type.type(:user).provide :hpuxuseradd, :parent => :useradd do
 
   def modifycmd(param,value)
      cmd = super(param, value)
-     cmd.insert(1,"-F")
+     cmd << "-F"
      if trusted then
        # Append an additional command to reset the password age to 0
        # until a workaround with expiry module can be found for trusted

data/lib/puppet/provider/user/pw.rb

@@ -66,11 +66,11 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
 
   # use pw to update password hash
   def password=(cryptopw)
-    Puppet.debug "change password for user '#{@resource[:name]}' method called with hash [redacted]"
+    Puppet.debug "change password for user '#{@resource[:name]}' method called with hash '#{cryptopw}'"
     stdin, _, _ = Open3.popen3("pw user mod #{@resource[:name]} -H 0")
     stdin.puts(cryptopw)
     stdin.close
-    Puppet.debug "finished password for user '#{@resource[:name]}' method called with hash [redacted]"
+    Puppet.debug "finished password for user '#{@resource[:name]}' method called with hash '#{cryptopw}'"
   end
 
   # get password from /etc/master.passwd
@@ -78,19 +78,10 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     Puppet.debug "checking password for user '#{@resource[:name]}' method called"
     current_passline = `getent passwd #{@resource[:name]}`
     current_password = current_passline.chomp.split(':')[1] if current_passline
-    Puppet.debug "finished password for user '#{@resource[:name]}' method called : [redacted]"
+    Puppet.debug "finished password for user '#{@resource[:name]}' method called : '#{current_password}'"
     current_password
   end
 
-  def has_sensitive_data?(property = nil)
-    #Check for sensitive values?
-    properties = property ? [property] : Puppet::Type.type(:user).validproperties
-    properties.any? do |prop|
-      p = @resource.parameter(prop)
-      p && p.respond_to?(:is_sensitive) && p.is_sensitive
-    end
-  end
-
   # Get expiry from system and convert to Puppet-style date
   def expiry
     expiry = self.get(:expiry)

data/lib/puppet/provider/user/user_role_add.rb

@@ -36,7 +36,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   has_features :manages_homedir, :allows_duplicates, :manages_solaris_rbac, :manages_passwords, :manages_password_age, :manages_shell
 
   def check_valid_shell
-    unless File.exist?(@resource.should(:shell))
+    unless File.exists?(@resource.should(:shell))
       raise(Puppet::Error, "Shell #{@resource.should(:shell)} must exist")
     end
     unless File.executable?(@resource.should(:shell).to_s)
@@ -202,10 +202,6 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
     shadow_entry[5].empty? ? -1 : shadow_entry[5]
   end
 
-  def has_sensitive_data?(property = nil)
-    false
-  end
-
   # Read in /etc/shadow, find the line for our used and rewrite it with the
   # new pw.  Smooth like 80 grit sandpaper.
   #

data/lib/puppet/provider/user/useradd.rb

@@ -55,44 +55,35 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
      get(:uid)
   end
 
-  def comment
-     return localcomment if @resource.forcelocal?
-     get(:comment)
-  end
-
   def finduser(key, value)
     passwd_file = "/etc/passwd"
-    passwd_keys = [:account, :password, :uid, :gid, :gecos, :directory, :shell]
+    passwd_keys = ['account', 'password', 'uid', 'gid', 'gecos', 'directory', 'shell']
     index = passwd_keys.index(key)
     File.open(passwd_file) do |f|
       f.each_line do |line|
-        user = line.split(":")
-        if user[index] == value
-          return Hash[passwd_keys.zip(user)]
-        end
+         user = line.split(":")
+         if user[index] == value
+             f.close
+             return user
+         end
       end
     end
     false
   end
 
   def local_username
-    finduser(:uid, @resource.uid)
+    finduser('uid', @resource.uid)
   end
 
   def localuid
-    user = finduser(:account, resource[:name])
-    return user[:uid] if user
+    user = finduser('account', resource[:name])
+    return user[2] if user
     false
   end
 
-  def localcomment
-    user = finduser(:account, resource[:name])
-    user[:gecos]
-  end
-
   def shell=(value)
     check_valid_shell
-    set(:shell, value)
+    set("shell", value)
   end
 
   verify :gid, "GID must be an integer" do |value|
@@ -115,8 +106,8 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     # to ensure consistent behaviour of the useradd provider when
     # using both useradd and luseradd
     if (!@resource.allowdupe?) && @resource.forcelocal?
-       if @resource.should(:uid) && finduser(:uid, @resource.should(:uid).to_s)
-           raise(Puppet::Error, "UID #{@resource.should(:uid)} already exists, use allowdupe to force user creation")
+       if @resource.should(:uid) && finduser('uid', @resource.should(:uid).to_s)
+           raise(Puppet::Error, "UID #{@resource.should(:uid).to_s} already exists, use allowdupe to force user creation")
        end
     elsif @resource.allowdupe? && (!@resource.forcelocal?)
        return ["-o"]
@@ -125,7 +116,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   end
 
   def check_valid_shell
-    unless File.exist?(@resource.should(:shell))
+    unless File.exists?(@resource.should(:shell))
       raise(Puppet::Error, "Shell #{@resource.should(:shell)} must exist")
     end
     unless File.executable?(@resource.should(:shell).to_s)
@@ -156,35 +147,19 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     # validproperties is a list of properties in undefined order
     # sort them to have a predictable command line in tests
     Puppet::Type.type(:user).validproperties.sort.each do |property|
-      value = get_value_for_property(property)
-      next if value.nil?
+      next if property == :ensure
+      next if property_manages_password_age?(property)
+      next if (property == :groups) && @resource.forcelocal?
+      next if (property == :expiry) && @resource.forcelocal?
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
-      cmd << flag(property) << munge(property, value)
+      if (value = @resource.should(property)) && (value != "")
+        cmd << flag(property) << munge(property, value)
+      end
     end
     cmd
   end
 
-  def get_value_for_property(property)
-    return nil if property == :ensure
-    return nil if property_manages_password_age?(property)
-    return nil if property == :groups and @resource.forcelocal?
-    return nil if property == :expiry and @resource.forcelocal?
-    value = @resource.should(property)
-    return nil if !value || value == ""
-
-    value
-  end
-
-  def has_sensitive_data?(property = nil)
-    #Check for sensitive values?
-    properties = property ? [property] : Puppet::Type.type(:user).validproperties
-    properties.any? do |prop|
-      p = @resource.parameter(prop)
-      p && p.respond_to?(:is_sensitive) && p.is_sensitive
-    end
-  end
-
   def addcmd
     if @resource.forcelocal?
       cmd = [command(:localadd)]

data/lib/puppet/provider/user/windows_adsi.rb

@@ -125,13 +125,14 @@ Puppet::Type.type(:user).provide :windows_adsi do
 
   def password=(value)
     if user.disabled?
-      info _("The user account '%s' is disabled; The password will still be changed" % @resource[:name])
+      warning _("The user account '%s' is disabled; puppet will not reset the password" % @resource[:name])
     elsif user.locked_out?
-      info _("The user account '%s' is locked out; The password will still be changed" % @resource[:name])
+      warning _("The user account '%s' is locked out; puppet will not reset the password" % @resource[:name])
     elsif user.expired?
-      info _("The user account '%s' is expired; The password will still be changed" % @resource[:name])
+      warning _("The user account '%s' is expired; puppet will not reset the password" % @resource[:name])
+    else
+      user.password = value
     end
-    user.password = value
   end
 
   def uid

data/lib/puppet/reference/configuration.rb

@@ -33,9 +33,9 @@ config = Puppet::Util::Reference.newreference(:configuration, :depth => 1, :doc
     elsif name.to_s == 'logdir'
       val = 'Unix/Linux: /var/log/puppetlabs/puppet -- Windows: C:\ProgramData\PuppetLabs\puppet\var\log -- Non-root user: ~/.puppetlabs/var/log'
     elsif name.to_s == 'hiera_config'
-      val = '$confdir/hiera.yaml. However, if a file exists at $codedir/hiera.yaml, Puppet uses that instead.'
+      val = '$confdir/hiera.yaml. However, for backwards compatibility, if a file exists at $codedir/hiera.yaml, Puppet uses that instead.'
     elsif name.to_s == 'certname'
-      val = "the Host's fully qualified domain name, as determined by facter"
+      val = "the Host's fully qualified domain name, as determined by Facter"
     end
 
     # Leave out the section information; it was apparently confusing people.
@@ -80,7 +80,7 @@ config.header = <<EOT
 * Settings that take a single file or directory can optionally set the owner,
   group, and mode for their value: `rundir = $vardir/run { owner = puppet,
   group = puppet, mode = 644 }`
-* The Puppet executables will ignore any setting that isn't relevant to
+* The Puppet executables ignores any setting that isn't relevant to
   their function.
 
 See the [configuration guide][confguide] for more details.

data/lib/puppet/reference/indirection.rb

@@ -5,14 +5,14 @@ require 'puppet/file_serving/metadata'
 
 reference = Puppet::Util::Reference.newreference :indirection, :doc => "Indirection types and their terminus classes" do
   text = ""
-  Puppet::Indirector::Indirection.instances.sort_by(&:to_s).each do |indirection|
+  Puppet::Indirector::Indirection.instances.sort { |a,b| a.to_s <=> b.to_s }.each do |indirection|
     ind = Puppet::Indirector::Indirection.instance(indirection)
     name = indirection.to_s.capitalize
     text << "## " + indirection.to_s + "\n\n"
 
     text << Puppet::Util::Docs.scrub(ind.doc) + "\n\n"
 
-    Puppet::Indirector::Terminus.terminus_classes(ind.name).sort_by(&:to_s).each do |terminus|
+    Puppet::Indirector::Terminus.terminus_classes(ind.name).sort { |a,b| a.to_s <=> b.to_s }.each do |terminus|
       terminus_name = terminus.to_s
       term_class = Puppet::Indirector::Terminus.terminus_class(ind.name, terminus)
       if term_class

data/lib/puppet/reference/metaparameter.rb

@@ -19,7 +19,9 @@ etc.), prevent Puppet from making changes (`noop`), and change logging verbosity
       params << param
     }
 
-    params.sort_by(&:to_s).each { |param|
+    params.sort { |a,b|
+      a.to_s <=> b.to_s
+    }.each { |param|
       str << markdown_header(param.to_s, 3)
       str << scrub(Puppet::Type.metaparamdoc(param))
       str << "\n\n"

data/lib/puppet/reference/providers.rb

@@ -32,9 +32,10 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
 
     table_data = {}
 
+    functional = false
     notes = []
     default = type.defaultprovider ? type.defaultprovider.name : 'none'
-    type.providers.sort_by(&:to_s).each do |pname|
+    type.providers.sort { |a,b| a.to_s <=> b.to_s }.each do |pname|
       data = []
       table_data[pname] = data
       provider = type.provider(pname)
@@ -43,6 +44,7 @@ providers = Puppet::Util::Reference.newreference :providers, :title => "Provider
       if missing = provider.suitable?(false) and missing.empty?
         data << "*X*"
         suit = true
+        functional = true
       else
         data << "[#{count}]_" # A pointer to the appropriate footnote
         suit = false

data/lib/puppet/reference/type.rb

@@ -49,7 +49,9 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
 
   }
 
-  types.sort_by(&:to_s).each { |name,type|
+  types.sort { |a,b|
+    a.to_s <=> b.to_s
+  }.each { |name,type|
 
     str << "
 
@@ -67,7 +69,9 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
     end
 
     docs = {}
-    type.validproperties.sort_by(&:to_s).reject { |sname|
+    type.validproperties.sort { |a,b|
+      a.to_s <=> b.to_s
+    }.reject { |sname|
       property = type.propertybyname(sname)
       property.nodoc
     }.each { |sname|
@@ -87,7 +91,9 @@ Puppet::Util::Reference.newreference :type, :doc => "All Puppet resource types a
     }
 
     str << markdown_header("Parameters", 4) + "\n"
-    type.parameters.sort_by(&:to_s).each { |type_name, param|
+    type.parameters.sort { |a,b|
+      a.to_s <=> b.to_s
+    }.each { |type_name, param|
       docs[type_name] = scrub(type.paramdoc(type_name))
     }
 

data/lib/puppet/reports.rb

@@ -74,7 +74,7 @@ class Puppet::Reports
 
     # Use this method so they all get loaded
     instance_loader(:report).loadall(Puppet.lookup(:current_environment))
-    loaded_instances(:report).sort_by(&:to_s).each do |name|
+    loaded_instances(:report).sort { |a,b| a.to_s <=> b.to_s }.each do |name|
       mod = self.report(name)
       docs << "#{name}\n#{"-" * name.to_s.length}\n"
 

data/lib/puppet/resource.rb

@@ -209,7 +209,7 @@ class Puppet::Resource
   end
 
   def stage?
-    @is_stage ||= @type.to_s.casecmp("stage").zero?
+    @is_stage ||= @type.to_s.downcase == "stage"
   end
 
   # Construct a resource from data.
@@ -427,8 +427,6 @@ class Puppet::Resource
   end
 
   # Convert our resource to yaml for Hiera purposes.
-  #
-  # @deprecated Use {to_hiera_hash} instead.
   def to_hierayaml
     # Collect list of attributes to align => and move ensure first
     attr = parameters.keys
@@ -448,21 +446,6 @@ class Puppet::Resource
     "  %s:\n%s" % [self.title, attributes]
   end
 
-  # Convert our resource to a hiera hash suitable for serialization.
-  def to_hiera_hash
-    # to_data_hash converts to safe Data types, e.g. no symbols, unicode replacement character
-    h = to_data_hash
-
-    params = h['parameters'] || {}
-    value = params.delete('ensure')
-
-    res = {}
-    res['ensure'] = value if value
-    res.merge!(Hash[params.sort])
-
-    return { h['title'] => res }
-  end
-
   # Convert our resource to Puppet code.
   def to_manifest
     # Collect list of attributes to align => and move ensure first

data/lib/puppet/resource/catalog.rb

@@ -637,7 +637,7 @@ class Puppet::Resource::Catalog < Puppet::Graph::SimpleGraph
       result.add_resource newres
     end
 
-    message = convert.to_s.tr "_", " "
+    message = convert.to_s.gsub "_", " "
     edges.each do |edge|
       # Skip edges between virtual resources.
       next if virtual_not_exported?(edge.source)

data/lib/puppet/rest/routes.rb

@@ -1,10 +1,10 @@
+require 'time'
 require 'puppet/rest/route'
 require 'puppet/network/http_pool'
 require 'puppet/network/http/compression'
 
 module Puppet::Rest
   module Routes
-
     extend Puppet::Network::HTTP::Compression.module
 
     ACCEPT_ENCODING = 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3'
@@ -16,9 +16,14 @@ module Puppet::Rest
                         srv_service: :ca)
     end
 
-    # Make an HTTP request to fetch the named certificate
-    # @param [String] name the name of the certificate to fetch
-    # @param [Puppet::SSL::SSLContext] ssl_context the ssl content to use when making the request
+    def self.clear
+      @ca = nil
+    end
+
+    # Make an HTTP request to fetch the named certificate.
+    #
+    # @param name [String] the name of the certificate to fetch
+    # @param ssl_context [Puppet::SSL::SSLContext] the ssl content to use when making the request
     # @raise [Puppet::Rest::ResponseError] if the response status is not OK
     # @return [String] the PEM-encoded certificate or certificate bundle
     def self.get_certificate(name, ssl_context)
@@ -41,14 +46,19 @@ module Puppet::Rest
       end
     end
 
-    # Make an HTTP request to fetch the named crl
-    # @param [String] name the crl to fetch
-    # @param [Puppet::SSL::SSLContext] ssl_context the ssl content to use when making the request
+    # Make an HTTP request to fetch the named crl.
+    #
+    # @param name [String] name of the crl to fetch
+    # @param ssl_context [Puppet::SSL::SSLContext] the ssl content to use when making the request
+    # @param if_modified_since [Time, nil] If non-nil, then only download the CRL if it has been
+    #   modified since the specified time.
     # @raise [Puppet::Rest::ResponseError] if the response status is not OK
     # @return [String] the PEM-encoded crl
-    def self.get_crls(name, ssl_context)
+    def self.get_crls(name, ssl_context, if_modified_since: nil)
       ca.with_base_url(Puppet::Network::Resolver.new) do |url|
         header = { 'Accept' => 'text/plain', 'Accept-Encoding' => ACCEPT_ENCODING }
+        header['If-Modified-Since'] = if_modified_since.httpdate if if_modified_since
+
         url.path += "certificate_revocation_list/#{name}"
 
         use_ssl = url.is_a? URI::HTTPS
@@ -66,11 +76,12 @@ module Puppet::Rest
       end
     end
 
-    # Make an HTTP request to send the named CSR
-    # @param [String] csr_pem the contents of the CSR to sent to the CA
-    # @param [String] name the name of the host whose CSR is being submitted
-    # @param [Puppet::SSL::SSLContext] ssl_context the ssl content to use when making the request
-    # @rasies [Puppet::Rest::ResponseError] if the response status is not OK
+    # Make an HTTP request to send the named CSR.
+    #
+    # @param csr_pem [String] the contents of the CSR to sent to the CA
+    # @param name [String] the name of the host whose CSR is being submitted
+    # @param ssl_context [Puppet::SSL::SSLContext] the ssl content to use when making the request
+    # @raise [Puppet::Rest::ResponseError] if the response status is not OK
     def self.put_certificate_request(csr_pem, name, ssl_context)
       ca.with_base_url(Puppet::Network::Resolver.new) do |url|
         header = { 'Accept' => 'text/plain',
@@ -91,11 +102,13 @@ module Puppet::Rest
       end
     end
 
-    # Make an HTTP request to get the named CSR
-    # @param [String] name the name of the host whose CSR is being queried
-    # @param [Puppet::SSL::SSLContext] ssl_context the ssl content to use when making the request
-    # @rasies [Puppet::Rest::ResponseError] if the response status is not OK
+    # Make an HTTP request to get the named CSR.
+    #
+    # @param name [String] the name of the host whose CSR is being queried
+    # @param ssl_context [Puppet::SSL::SSLContext] the ssl content to use when making the request
+    # @raise [Puppet::Rest::ResponseError] if the response status is not OK
     # @return [String] the PEM encoded certificate request
+    # @deprecated
     def self.get_certificate_request(name, ssl_context)
       ca.with_base_url(Puppet::Network::Resolver.new) do |url|
         header = { 'Accept' => 'text/plain', 'Accept-Encoding' => ACCEPT_ENCODING }