puppet 5.5.6 → 5.5.7

data/lib/puppet/provider/exec.rb

@@ -4,71 +4,68 @@ require 'puppet/util/execution'
 class Puppet::Provider::Exec < Puppet::Provider
   include Puppet::Util::Execution
 
-  def run(command, check = false)
-    output = nil
-    sensitive = resource.parameters[:command].sensitive
+  def environment
+    env = {}
 
-    checkexe(command)
+    if (path = resource[:path])
+      env[:PATH] = path.join(File::PATH_SEPARATOR)
+    end
 
-    if dir = resource[:cwd]
-      unless File.directory?(dir)
-        if check
-          dir = nil
-        else
-          self.fail _("Working directory '%{dir}' does not exist") % { dir: dir }
-        end
+    return env unless (envlist = resource[:environment])
+
+    envlist = [envlist] unless envlist.is_a? Array
+    envlist.each do |setting|
+      unless (match = /^(\w+)=((.|\n)+)$/.match(setting))
+        warning _("Cannot understand environment setting %{setting}") % { setting: setting.inspect }
+        next
+      end
+      var = match[1]
+      value = match[2]
+
+      if env.include?(var) || env.include?(var.to_sym)
+        warning _("Overriding environment setting '%{var}' with '%{value}'") % { var: var, value: value }
       end
+
+      env[var] = value
     end
 
-    dir ||= Dir.pwd
+    env
+  end
+
+  def run(command, check = false)
+    output = nil
+    sensitive = resource.parameters[:command].sensitive
+
+    checkexe(command)
 
     debug "Executing#{check ? " check": ""} '#{sensitive ? '[redacted]' : command}'"
-    begin
-      # Do our chdir
-      Dir.chdir(dir) do
-        environment = {}
-
-        environment[:PATH] = resource[:path].join(File::PATH_SEPARATOR) if resource[:path]
-
-        if envlist = resource[:environment]
-          envlist = [envlist] unless envlist.is_a? Array
-          envlist.each do |setting|
-            if setting =~ /^(\w+)=((.|\n)+)$/
-              env_name = $1
-              value = $2
-              if environment.include?(env_name) || environment.include?(env_name.to_sym)
-                warning _("Overriding environment setting '%{env_name}' with '%{value}'") % { env_name: env_name, value: value }
-              end
-              environment[env_name] = value
-            else
-              warning _("Cannot understand environment setting %{setting}") % { setting: setting.inspect }
-            end
-          end
-        end
-
-        # Ruby 2.1 and later interrupt execution in a way that bypasses error
-        # handling by default. Passing Timeout::Error causes an exception to be
-        # raised that can be rescued inside of the block by cleanup routines.
-        #
-        # This is backwards compatible all the way to Ruby 1.8.7.
-        Timeout::timeout(resource[:timeout], Timeout::Error) do
-          # note that we are passing "false" for the "override_locale" parameter, which ensures that the user's
-          # default/system locale will be respected.  Callers may override this behavior by setting locale-related
-          # environment variables (LANG, LC_ALL, etc.) in their 'environment' configuration.
-          output = Puppet::Util::Execution.execute(command, :failonfail => false, :combine => true,
-                                  :uid => resource[:user], :gid => resource[:group],
-                                  :override_locale => false,
-                                  :custom_environment => environment,
-                                  :sensitive => sensitive)
-        end
-        # The shell returns 127 if the command is missing.
-        if output.exitstatus == 127
-          raise ArgumentError, output
-        end
 
-      end
-    rescue Errno::ENOENT => detail
-      self.fail Puppet::Error, detail.to_s, detail
+    # Ruby 2.1 and later interrupt execution in a way that bypasses error
+    # handling by default. Passing Timeout::Error causes an exception to be
+    # raised that can be rescued inside of the block by cleanup routines.
+    #
+    # This is backwards compatible all the way to Ruby 1.8.7.
+    Timeout::timeout(resource[:timeout], Timeout::Error) do
+      cwd = resource[:cwd]
+      cwd ||= Dir.pwd
+
+      # note that we are passing "false" for the "override_locale" parameter, which ensures that the user's
+      # default/system locale will be respected.  Callers may override this behavior by setting locale-related
+      # environment variables (LANG, LC_ALL, etc.) in their 'environment' configuration.
+      output = Puppet::Util::Execution.execute(
+        command,
+        :failonfail => false,
+        :combine => true,
+        :cwd => cwd,
+        :uid => resource[:user], :gid => resource[:group],
+        :override_locale => false,
+        :custom_environment => environment(),
+        :sensitive => sensitive
+      )
+    end
+    # The shell returns 127 if the command is missing.
+    if output.exitstatus == 127
+      raise ArgumentError, output
     end
 
     # Return output twice as processstatus was returned before, but only exitstatus was ever called.

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

@@ -1,10 +1,6 @@
-#
 # Group Puppet provider for AIX. It uses standard commands to manage groups:
 #  mkgroup, rmgroup, lsgroup, chgroup
-#
-# Author::    Hector Rivas Gandara <keymon@gmail.com>
-#
-require 'puppet/provider/aixobject'
+require 'puppet/provider/aix_object'
 
 Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject do
   desc "Group management for AIX."
@@ -13,131 +9,60 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
   defaultfor :operatingsystem => :aix
   confine :operatingsystem => :aix
 
-  # Provider features
-  has_features :manages_aix_lam
-  has_features :manages_members
-
   # Commands that manage the element
   commands :list      => "/usr/sbin/lsgroup"
   commands :add       => "/usr/bin/mkgroup"
   commands :delete    => "/usr/sbin/rmgroup"
   commands :modify    => "/usr/bin/chgroup"
 
-  # Group attributes to ignore
-  def self.attribute_ignore
-    []
-  end
-
-  # AIX attributes to properties mapping.
-  #
-  # Valid attributes to be managed by this provider.
-  # It is a list with of hash
-  #  :aix_attr      AIX command attribute name
-  #  :puppet_prop   Puppet property name
-  #  :to            Method to adapt puppet property to aix command value. Optional.
-  #  :from          Method to adapt aix command value to puppet property. Optional
-  self.attribute_mapping = [
-    #:name => :name,
-    {:aix_attr => :id,       :puppet_prop => :gid },
-    {:aix_attr => :users,    :puppet_prop => :members,
-      :from => :users_from_attr},
-    {:aix_attr => :attributes, :puppet_prop => :attributes},
-  ]
-
-  #--------------
-  # Command definition
-
-  # Return the IA module arguments based on the resource param ia_load_module
-  def get_ia_module_args
-    if @resource[:ia_load_module]
-      ["-R", @resource[:ia_load_module].to_s]
-    else
-      []
-    end
-  end
-
-  def lscmd(value=@resource[:name])
-    [self.class.command(:list)] +
-      self.get_ia_module_args +
-      [ value]
-  end
-
-  def lsallcmd()
-    lscmd("ALL")
-  end
+  # Provider features
+  has_features :manages_aix_lam
+  has_features :manages_members
 
-  def addcmd(extra_attrs = [])
-    # Here we use the @resource.to_hash to get the list of provided parameters
-    # Puppet does not call to self.<parameter>= method if it does not exists.
+  class << self
+    # Used by the AIX user provider. Returns a hash of:
+    #   {
+    #     :name => <group_name>,
+    #     :gid  => <gid>
+    #   }
     #
-    # It gets an extra list of arguments to add to the user.
-    [self.class.command(:add) ] +
-      self.get_ia_module_args +
-      self.hash2args(@resource.to_hash) +
-      extra_attrs + [@resource[:name]]
-  end
-
-  def modifycmd(hash = property_hash)
-    args = self.hash2args(hash)
-    return nil if args.empty?
-
-    [self.class.command(:modify)] +
-      self.get_ia_module_args +
-      args + [@resource[:name]]
-  end
-
-  def deletecmd
-    [self.class.command(:delete)] +
-      self.get_ia_module_args +
-      [@resource[:name]]
-  end
-
-
-  #--------------
-  # Overwrite get_arguments to add the attributes' arguments
-  def get_arguments(key, value, mapping, objectinfo)
-    # In the case of attributes, return a list of key=value
-    if key == :attributes
-      unless value and value.is_a? Hash
-        raise Puppet::Error, _("Attributes must be a list of pairs key=value on %{resource}[%{name}]") %
-            { resource: @resource.class.name, name: @resource.name }
+    # that matches the group, which can either be the group name or
+    # the gid. Takes an optional set of ia_module_args
+    def find(group, ia_module_args = [])
+      groups = list_all(ia_module_args)
+
+      id_property = mappings[:puppet_property][:id]
+
+      if group.is_a?(String)
+        # Find by name
+        group_hash = groups.find { |cur_group| cur_group[:name] == group }
+      else
+        # Find by gid
+        group_hash = groups.find do |cur_group|
+          id_property.convert_attribute_value(cur_group[:id]) == group
+        end
       end
-      return value.select { |k,v| true }.map { |pair| pair.join("=") }
-    end
-    super(key, value, mapping, objectinfo)
-  end
 
-  def filter_attributes(hash)
-    # Return only not managed attributes.
-    hash.select {
-        |k,v| !self.class.attribute_mapping_from.include?(k) and
-                !self.class.attribute_ignore.include?(k)
-      }.inject({}) {
-        |h, array| h[array[0]] = array[1]; h
-      }
-  end
+      unless group_hash
+        raise ArgumentError, _("No AIX group exists with a group name or gid of %{group}!") % { group: group }
+      end
 
-  def attributes
-    filter_attributes(getosinfo(false))
-  end
+      # Convert :id => :gid
+      id = group_hash.delete(:id)
+      group_hash[:gid] = id_property.convert_attribute_value(id)
 
-  def attributes=(attr_hash)
-    #self.class.validate(param, value)
-    param = :attributes
-    cmd = modifycmd({param => filter_attributes(attr_hash)})
-    if cmd
-      begin
-        execute(cmd)
-      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
+      group_hash
     end
   end
 
-  # Force convert users it a list.
-  def users_from_attr(value)
-    (value.is_a? String) ? value.split(',') : value
-  end
+  mapping puppet_property: :members,
+          aix_attribute: :users
 
+  numeric_mapping puppet_property: :gid,
+                  aix_attribute: :id
 
+  # Now that we have all of our mappings, let's go ahead and make
+  # the resource methods (property getters + setters for our mapped
+  # properties + a getter for the attributes property).
+  mk_resource_methods
 end

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

@@ -9,7 +9,10 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
   defaultfor :operatingsystem => [:freebsd, :dragonfly]
   confine    :operatingsystem => [:freebsd, :dragonfly]
 
-  options :members, :flag => "-M", :method => :mem
+  options :members,
+          :flag    => "-M",
+          :method  => :mem,
+          :unmunge => proc { |members| members.join(',') }
 
   verify :gid, _("GID must be an integer") do |value|
     value.is_a? Integer
@@ -26,9 +29,6 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
 
     if members = @resource.should(:members)
       unless members == :absent
-        if members.is_a?(Array)
-          members = members.join(",")
-        end
         cmd << "-M" << members
       end
     end
@@ -39,10 +39,6 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
   end
 
   def modifycmd(param, value)
-    # members may be an array, need a comma separated list
-    if param == :members and value.is_a?(Array)
-      value = value.join(",")
-    end
     super(param, value)
   end
 end

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

@@ -22,10 +22,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_members = Puppet::Util::Windows::ADSI::User.name_sid_hash(current)
+    specified_members = Puppet::Util::Windows::ADSI::User.name_sid_hash(should)
+
+    current_sids = current_members.keys.to_a
+    specified_sids = specified_members.keys.to_a
 
     if @resource[:auth_membership]
       current_sids.sort == specified_sids.sort
@@ -63,7 +65,8 @@ Puppet::Type.type(:group).provide :windows_adsi do
   end
 
   def members
-    group.members
+    @members ||= Puppet::Util::Windows::ADSI::User.name_sid_hash(group.members)
+    @members.keys
   end
 
   def members=(members)

data/lib/puppet/provider/nameservice.rb

@@ -247,31 +247,7 @@ class Puppet::Provider::NameService < Puppet::Provider
   # The list of all groups the user is a member of.  Different
   # user mgmt systems will need to override this method.
   def groups
-    groups = []
-
-    # Reset our group list
-    Puppet::Etc.setgrent
-
-    user = @resource[:name]
-
-    # Now iterate across all of the groups, adding each one our
-    # user is a member of
-    while group = Puppet::Etc.getgrent
-      members = group.mem
-
-      groups << group.name if members.include? user
-    end
-
-    # We have to close the file, so each listing is a separate
-    # reading of the file.
-    Puppet::Etc.endgrent
-
-    uniq_groups = groups.uniq
-    if groups != uniq_groups
-      debug("Removing any duplicate group entries")
-    end
-    # remove any double listed groups
-    uniq_groups.join(",")
+    Puppet::Util::POSIX.groups_of(@resource[:name]).join(',')
   end
 
   # Convert the Etc struct into a hash.

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

@@ -116,7 +116,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       ds_value = input_hash[key]
       case ds_to_ns_attribute_map[ds_attribute]
         when :members
-          ds_value = ds_value # only members uses arrays so far
+          ds_value = ds_value.join(',')
         when :gid, :uid
           # OS X stores objects like uid/gid as strings.
           # Try casting to an integer for these cases to be
@@ -344,8 +344,10 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
 
   def set(param, value)
     self.class.validate(param, value)
-    current_members = @property_value_cache_hash[:members]
     if param == :members
+      current_members = @property_value_cache_hash[:members].split(',')
+      value = value.split(',')
+
       # If we are meant to be authoritative for the group membership
       # then remove all existing members who haven't been specified
       # in the manifest.
@@ -409,7 +411,7 @@ class Puppet::Provider::NameService::DirectoryService < Puppet::Provider::NameSe
       end
       if value != "" and not value.nil?
         if property == :members
-          add_members(nil, value)
+          add_members(nil, value.split(','))
         else
           exec_arg_vector = self.class.get_exec_preamble("-create", @resource[:name])
           exec_arg_vector << ns_to_ds_attribute_map[property.intern]

data/lib/puppet/provider/package/portage.rb

@@ -117,7 +117,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
       if match
         result_fields.zip(match.captures) do |field, value|
           # some fields can be empty or (null) (if we are not passed a category in the package name for instance)
-          if value == '(null)'
+          if value == '(null)' || value == '<unset>'
             package_info[field] = nil
           elsif !value or value.empty?
             package_info[field] = nil
@@ -133,7 +133,7 @@ Puppet::Type.type(:package).provide :portage, :parent => Puppet::Provider::Packa
   end
 
   def qatom_output_format
-    '"[%{CATEGORY}] [%{PN}] [%{PV}] [%[PR]] [%[SLOT]] [%[pfx]] [%[sfx]]"'
+    '"[%[CATEGORY]] [%[PN]] [%[PV]] [%[PR]] [%[SLOT]] [%[pfx]] [%[sfx]]"'
   end
 
   def qatom_result_format

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

@@ -63,14 +63,14 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
     installer = Puppet::Provider::Package::Windows::Package.installer_class(resource)
 
     command = [installer.install_command(resource), install_options].flatten.compact.join(' ')
-    output = execute(command, :failonfail => false, :combine => true)
+    output = execute(command, :failonfail => false, :combine => true, :cwd => File.dirname(resource[:source]), :suppress_window => true)
 
     check_result(output.exitstatus)
   end
 
   def uninstall
     command = [package.uninstall_command, uninstall_options].flatten.compact.join(' ')
-    output = execute(command, :failonfail => false, :combine => true)
+    output = execute(command, :failonfail => false, :combine => true, :suppress_window => true)
 
     check_result(output.exitstatus)
   end