puppet 5.3.7 → 5.4.0

data/lib/puppet/pops/validation/checker4_0.rb

@@ -15,19 +15,25 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   attr_reader :acceptor
   attr_reader :migration_checker
 
+  def self.check_visitor
+    # Class instance variable rather than Class variable because methods visited
+    # may be overridden in subclass
+    @check_visitor ||= Visitor.new(nil, 'check', 0, 0)
+  end
+
   # Initializes the validator with a diagnostics producer. This object must respond to
   # `:will_accept?` and `:accept`.
   #
   def initialize(diagnostics_producer)
     super()
-    @@check_visitor       ||= Visitor.new(nil, "check", 0, 0)
     @@rvalue_visitor      ||= Visitor.new(nil, "rvalue", 0, 0)
     @@hostname_visitor    ||= Visitor.new(nil, "hostname", 1, 2)
     @@assignment_visitor  ||= Visitor.new(nil, "assign", 0, 1)
     @@query_visitor       ||= Visitor.new(nil, "query", 0, 0)
     @@relation_visitor    ||= Visitor.new(nil, "relation", 0, 0)
-    @@idem_visitor        ||= Visitor.new(self, "idem", 0, 0)
+    @@idem_visitor        ||= Visitor.new(nil, "idem", 0, 0)
 
+    @check_visitor = self.class.check_visitor
     @acceptor = diagnostics_producer
 
     # Use null migration checker unless given in context
@@ -51,7 +57,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
 
   # Performs regular validity check
   def check(o)
-    @@check_visitor.visit_this_0(self, o)
+    @check_visitor.visit_this_0(self, o)
   end
 
   # Performs check if this is a vaid hostname expression
@@ -380,9 +386,7 @@ class Checker4_0 < Evaluator::LiteralEvaluator
   }
 
   FUTURE_RESERVED_WORDS = {
-    'application' => true,
-    'produces' => true,
-    'consumes' => true
+    'plan' => true
   }
 
   # for 'class', 'define', and function

data/lib/puppet/pops/validation/tasks_checker.rb

@@ -0,0 +1,60 @@
+module Puppet::Pops
+module Validation
+
+# Validator that limits the set of allowed expressions to not include catalog related operations
+# @api private
+class TasksChecker < Checker4_0
+  def check_Application(o)
+    illegalTasksExpression(o)
+  end
+
+  def check_CapabilityMapping(o)
+    illegalTasksExpression(o)
+  end
+
+  def check_CollectExpression(o)
+    illegalTasksExpression(o)
+  end
+
+  def check_HostClassDefinition(o)
+    illegalTasksExpression(o)
+  end
+
+  def check_NodeDefinition(o)
+    illegalTasksExpression(o)
+  end
+
+  def check_RelationshipExpression(o)
+    illegalTasksExpression(o)
+  end
+
+  def check_ResourceDefaultsExpression(o)
+    illegalTasksExpression(o)
+  end
+
+  def check_ResourceExpression(o)
+    illegalTasksExpression(o)
+  end
+
+  def check_ResourceOverrideExpression(o)
+    illegalTasksExpression(o)
+  end
+
+  def check_ResourceTypeDefinition(o)
+    illegalTasksExpression(o)
+  end
+
+  def check_SiteDefinition(o)
+    illegalTasksExpression(o)
+  end
+
+  def illegalTasksExpression(o)
+    acceptor.accept(Issues::CATALOG_OPERATION_NOT_SUPPORTED_WHEN_SCRIPTING, o)
+  end
+
+  def resource_without_title?(o)
+    false
+  end
+end
+end
+end

data/lib/puppet/pops/validation/validator_factory_4_0.rb

@@ -7,7 +7,12 @@ class ValidatorFactory_4_0 < Factory
 
   # Produces the checker to use
   def checker diagnostic_producer
-    Checker4_0.new(diagnostic_producer)
+    if Puppet[:tasks]
+      require_relative 'tasks_checker'
+      TasksChecker.new(diagnostic_producer)
+    else
+      Checker4_0.new(diagnostic_producer)
+    end
   end
 
   # Produces the label provider to use

data/lib/puppet/property.rb

@@ -365,7 +365,7 @@ class Puppet::Property < Puppet::Parameter
     begin
       @should = should
       insync?(is)
-    rescue => detail
+    rescue
       # Certain operations may fail, but we don't want to fail the transaction if we can
       # avoid it
       #TRANSLATORS 'insync_values?' should not be translated

data/lib/puppet/provider.rb

@@ -290,16 +290,26 @@ class Puppet::Provider
     end
   end
 
+  # Compare a fact value against one or more supplied value
+  # @param [Symbol] fact a fact to query to match against one of the given values
+  # @param [Array, Regexp, String] values one or more values to compare to the
+  #   value of the given fact
+  # @return [Boolean] whether or not the fact value matches one of the supplied
+  #   values. Given one or more Regexp instances, fact is compared via the basic
+  #   pattern-matching operator.
   def self.fact_match(fact, values)
-    values = [values] unless values.is_a? Array
-    values.map! { |v| v.to_s.downcase.intern }
-
-    if fval = Facter.value(fact).to_s and fval != ""
-      fval = fval.to_s.downcase.intern
-
-      values.include?(fval)
+    fact_val = Facter.value(fact).to_s.downcase
+    if fact_val.empty?
+      return false
     else
-      false
+      values = [values] unless values.is_a?(Array)
+      values.any? do |value|
+        if value.is_a?(Regexp)
+          fact_val =~ value
+        else
+          fact_val.intern == value.to_s.downcase.intern
+        end
+      end
     end
   end
 

data/lib/puppet/provider/augeas/augeas.rb

@@ -168,7 +168,6 @@ Puppet::Type.type(:augeas).provide(:augeas) do
       glob_avail = !aug.match("/augeas/version/pathx/functions/glob").empty?
       opt_ctx = resource[:context].match("^/files/[^'\"\\[\\]]+$") if resource[:context]
 
-      restricted = false
       if resource[:incl]
         aug.set("/augeas/load/Xfm/lens", resource[:lens])
         aug.set("/augeas/load/Xfm/incl", resource[:incl])
@@ -220,7 +219,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
 
     #validate and tear apart the command
     fail (_("Invalid command: %{cmd}") % { cmd: cmd_array.join(" ") }) if cmd_array.length < 4
-    cmd = cmd_array.shift
+    _ = cmd_array.shift
     path = cmd_array.shift
     comparator = cmd_array.shift
     arg = cmd_array.join(" ")
@@ -251,7 +250,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
 
     #validate and tear apart the command
     fail(_("Invalid command: %{cmd}") % { cmd: cmd_array.join(" ") }) if cmd_array.length < 3
-    cmd = cmd_array.shift
+    _ = cmd_array.shift
     path = cmd_array.shift
 
     # Need to break apart the clause
@@ -299,7 +298,7 @@ Puppet::Type.type(:augeas).provide(:augeas) do
 
     #validate and tear apart the command
     fail(_("Invalid command: %{cmd}") % { cmd: cmd_array.join(" ") }) if cmd_array.length < 3
-    cmd = cmd_array.shift
+    _ = cmd_array.shift
     path = cmd_array.shift
 
     # Need to break apart the clause

data/lib/puppet/provider/exec.rb

@@ -6,8 +6,6 @@ class Puppet::Provider::Exec < Puppet::Provider
 
   def run(command, check = false)
     output = nil
-    status = nil
-    dir = nil
     sensitive = resource.parameters[:command].sensitive
 
     checkexe(command)

data/lib/puppet/provider/group/groupadd.rb

@@ -14,7 +14,8 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
     value.is_a? Integer
   end
 
-  optional_commands :localadd => "lgroupadd"
+  optional_commands :localadd => "lgroupadd", :localdelete => "lgroupdel", :localmodify => "lgroupmod"
+
   has_feature :libuser if Puppet.features.libuser?
 
   def exists?
@@ -82,4 +83,27 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
     cmd << @resource[:name]
     cmd
   end
+
+  def modifycmd(param, value)
+    if @resource.forcelocal?
+      cmd = [command(:localmodify)]
+      @custom_environment = Puppet::Util::Libuser.getenv
+    else
+      cmd = [command(:modify)]
+    end
+    cmd << flag(param) << value
+    cmd += check_allow_dup
+    cmd << @resource[:name]
+
+    cmd
+  end
+
+  def deletecmd
+    if @resource.forcelocal?
+      @custom_environment = Puppet::Util::Libuser.getenv
+      [command(:localdelete), @resource[:name]]
+    else
+      [command(:delete), @resource[:name]]
+    end
+  end
 end

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

@@ -23,9 +23,12 @@ Puppet::Type.type(:group).provide :windows_adsi do
     # Cannot use munge of the group property to canonicalize @should
     # since the default array_matching comparison is not commutative
 
-    current_sids = current.map(&:sid)
     # dupes automatically weeded out when hashes built
-    specified_sids = Puppet::Util::Windows::ADSI::Group.name_sid_hash(should).keys.to_a
+    current_users = Puppet::Util::Windows::ADSI::Group.name_sid_hash(current)
+    specified_users = Puppet::Util::Windows::ADSI::Group.name_sid_hash(should)
+
+    current_sids = current_users.keys.to_a
+    specified_sids = specified_users.keys.to_a
 
     if @resource[:auth_membership]
       current_sids.sort == specified_sids.sort
@@ -37,7 +40,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
   def members_to_s(users)
     return '' if users.nil? or !users.kind_of?(Array)
     users = users.map do |user_name|
-      sid = Puppet::Util::Windows::SID.name_to_principal(user_name)
+      sid = Puppet::Util::Windows::SID.name_to_sid_object(user_name)
       if !sid
         resource.debug("#{user_name} (unresolvable to SID)")
         next user_name
@@ -55,7 +58,7 @@ Puppet::Type.type(:group).provide :windows_adsi do
   end
 
   def member_valid?(user_name)
-    ! Puppet::Util::Windows::SID.name_to_principal(user_name).nil?
+    ! Puppet::Util::Windows::SID.name_to_sid_object(user_name).nil?
   end
 
   def group

data/lib/puppet/provider/mount.rb

@@ -26,21 +26,38 @@ module Puppet::Provider::Mount
   def remount
     #TRANSLATORS refers to remounting a file system
     info _("Remounting")
-    if resource[:remounts] == :true
+    os = Facter.value(:operatingsystem)
+    supports_remounts = (resource[:remounts] == :true)
+    if supports_remounts && os == 'AIX'
+      remount_with_option("remount")
+    elsif os.match(/^(FreeBSD|DragonFly|OpenBSD)$/)
+      remount_with_option("update")
+    elsif supports_remounts
       mountcmd "-o", "remount", resource[:name]
-    elsif ["FreeBSD", "DragonFly", "OpenBSD"].include?(Facter.value(:operatingsystem))
-      if self.options && !self.options.empty?
-        options = self.options + ",update"
-      else
-        options = "update"
-      end
-      mountcmd "-o", options, resource[:name]
     else
       unmount
       mount
     end
   end
 
+  # Remount by appending the supplied param "option" to any existing explicitly
+  # defined options. If resource has no explicitly defined options, will mount
+  # with only "option".
+  # @param [String] option A remount option to use or append with existing options
+  #
+  def remount_with_option(option)
+    if using_explicit_options?
+      options = self.options + "," + option
+    else
+      options = option
+    end
+    mountcmd "-o", options, resource[:name]
+  end
+
+  def using_explicit_options?
+    !self.options.nil? && !self.options.empty?
+  end
+
   # This only works when the mount point is synced to the fstab.
   def unmount
     umount(resource[:name])

data/lib/puppet/provider/nameservice.rb

@@ -174,7 +174,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     begin
       execute(self.addcmd, {:failonfail => true, :combine => true, :custom_environment => @custom_environment})
       if feature?(:manages_password_age) && (cmd = passcmd)
-        execute(cmd)
+        execute(cmd, { :custom_environment => @custom_environment })
       end
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not create %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
@@ -189,7 +189,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     end
 
     begin
-      execute(self.deletecmd)
+      execute(self.deletecmd, { :custom_environment => @custom_environment })
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not delete %{resource} %{name}: %{detail}") % { resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
     end
@@ -266,7 +266,12 @@ class Puppet::Provider::NameService < Puppet::Provider
     # reading of the file.
     Puppet::Etc.endgrent
 
-    groups.join(",")
+    uniq_groups = groups.uniq
+    if groups != uniq_groups
+      debug("Removing any duplicate group entries")
+    end
+    # remove any double listed groups
+    uniq_groups.join(",")
   end
 
   # Convert the Etc struct into a hash.
@@ -296,7 +301,7 @@ class Puppet::Provider::NameService < Puppet::Provider
     cmd = modifycmd(param, munge(param, value))
     raise Puppet::DevError, _("Nameservice command must be an array") unless cmd.is_a?(Array)
     begin
-      execute(cmd)
+      execute(cmd, { :custom_environment => @custom_environment })
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not set %{param} on %{resource}[%{name}]: %{detail}") % { param: param, resource: @resource.class.name, name: @resource.name, detail: detail }, detail.backtrace
     end

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

@@ -402,10 +402,10 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       next if property == :ensure
       value = @resource.should(property)
       if property == :gid and value.nil?
-        value = self.class.next_system_id(id_type='gid')
+        value = self.class.next_system_id('gid')
       end
       if property == :uid and value.nil?
-        value = self.class.next_system_id(id_type='uid')
+        value = self.class.next_system_id('uid')
       end
       if value != "" and not value.nil?
         if property == :members
@@ -431,7 +431,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
         cmd = [:dseditgroup, "-o", "edit", "-n", ".", "-d", member, @resource[:name]]
         begin
           execute(cmd)
-        rescue Puppet::ExecutionFailure => detail
+        rescue Puppet::ExecutionFailure
           # TODO: We're falling back to removing the member using dscl due to rdar://8481241
           # This bug causes dseditgroup to fail to remove a member if that member doesn't exist
           cmd = [:dscl, ".", "-delete", "/Groups/#{@resource.name}", "GroupMembership", member]

data/lib/puppet/provider/nameservice/objectadd.rb

@@ -1,33 +1,22 @@
 require 'puppet/provider/nameservice'
 
 class Puppet::Provider::NameService
-class ObjectAdd < Puppet::Provider::NameService
-  def deletecmd
-    [command(:delete), @resource[:name]]
-  end
-
-  # Determine the flag to pass to our command.
-  def flag(name)
-    name = name.intern if name.is_a? String
-    self.class.option(name, :flag) || "-" + name.to_s[0,1]
-  end
-
-  def modifycmd(param, value)
-    cmd = [command(param.to_s =~ /password_.+_age/ ? :password : :modify)]
-    cmd << flag(param) << value
-    if @resource.allowdupe? && ((param == :uid) || (param == :gid and self.class.name == :groupadd))
-      cmd << "-o"
+  class ObjectAdd < Puppet::Provider::NameService
+    def deletecmd
+      [command(:delete), @resource[:name]]
     end
-    cmd << @resource[:name]
 
-    cmd
-  end
+    # Determine the flag to pass to our command.
+    def flag(name)
+      name = name.intern if name.is_a? String
+      self.class.option(name, :flag) || "-" + name.to_s[0, 1]
+    end
 
-  def posixmethod(name)
-    name = name.intern if name.is_a? String
-    method = self.class.option(name, :method) || name
+    def posixmethod(name)
+      name   = name.intern if name.is_a? String
+      method = self.class.option(name, :method) || name
 
-    method
+      method
+    end
   end
 end
-end

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

@@ -1,21 +1,21 @@
 require 'puppet/provider/nameservice/objectadd'
 
 class Puppet::Provider::NameService
-class PW < ObjectAdd
-  def deletecmd
-    [command(:pw), "#{@resource.class.name.to_s}del", @resource[:name]]
-  end
+  class PW < ObjectAdd
+    def deletecmd
+      [command(:pw), "#{@resource.class.name.to_s}del", @resource[:name]]
+    end
 
-  def modifycmd(param, value)
-    cmd = [
-      command(:pw),
-      "#{@resource.class.name.to_s}mod",
-      @resource[:name],
-      flag(param),
-      munge(param, value)
-    ]
-    cmd
+    def modifycmd(param, value)
+      cmd = [
+          command(:pw),
+          "#{@resource.class.name.to_s}mod",
+          @resource[:name],
+          flag(param),
+          munge(param, value)
+      ]
+      cmd
+    end
   end
 end
-end