openvox 7.37.1 → 8.19.0

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

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 Puppet::Type.type(:file).provide :windows do
   desc "Uses Microsoft Windows functionality to manage file ownership and permissions."
 
-  confine :operatingsystem => :windows
+  confine 'os.name' => :windows
   has_feature :manages_symlinks if Puppet.features.manages_symlinks?
 
   include Puppet::Util::Warnings
@@ -36,28 +38,26 @@ Puppet::Type.type(:file).provide :windows do
 
   def owner
     return :absent unless resource.stat
+
     get_owner(resource[:path])
   end
 
   def owner=(should)
-    begin
-      set_owner(should, resolved_path)
-    rescue => detail
-      raise Puppet::Error, _("Failed to set owner to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
-    end
+    set_owner(should, resolved_path)
+  rescue => detail
+    raise Puppet::Error, _("Failed to set owner to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
   end
 
   def group
     return :absent unless resource.stat
+
     get_group(resource[:path])
   end
 
   def group=(should)
-    begin
-      set_group(should, resolved_path)
-    rescue => detail
-      raise Puppet::Error, _("Failed to set group to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
-    end
+    set_group(should, resolved_path)
+  rescue => detail
+    raise Puppet::Error, _("Failed to set group to '%{should}': %{detail}") % { should: should, detail: detail }, detail.backtrace
   end
 
   def mode
@@ -70,20 +70,17 @@ Puppet::Type.type(:file).provide :windows do
   end
 
   def mode=(value)
-    begin
-      managing_owner = !resource[:owner].nil?
-      managing_group = !resource[:group].nil?
-      set_mode(value.to_i(8), resource[:path], true, managing_owner, managing_group)
-    rescue => detail
-      error = Puppet::Error.new(_("failed to set mode %{mode} on %{path}: %{message}") % { mode: mode, path: resource[:path], message: detail.message })
-      error.set_backtrace detail.backtrace
-      raise error
-    end
-    :file_changed
+    managing_owner = !resource[:owner].nil?
+    managing_group = !resource[:group].nil?
+    set_mode(value.to_i(8), resource[:path], true, managing_owner, managing_group)
+  rescue => detail
+    error = Puppet::Error.new(_("failed to set mode %{mode} on %{path}: %{message}") % { mode: mode, path: resource[:path], message: detail.message })
+    error.set_backtrace detail.backtrace
+    raise error
   end
 
   def validate
-    if [:owner, :group, :mode].any?{|p| resource[p]} and !supports_acl?(resource[:path])
+    if [:owner, :group, :mode].any? { |p| resource[p] } and !supports_acl?(resource[:path])
       resource.fail(_("Can only manage owner, group, and mode on filesystems that support Windows ACLs, such as NTFS"))
     end
   end
@@ -100,16 +97,16 @@ Puppet::Type.type(:file).provide :windows do
   def munge_windows_system_group(current, should)
     [
       {
-        'type'        => 'group',
-        'resource'    => resource[:group],
+        'type' => 'group',
+        'resource' => resource[:group],
         'set_to_user' => group,
         'fullcontrol' => "070".to_i(8),
         'remove_mask' => "707".to_i(8),
         'should_mask' => (should[0].to_i(8) & "070".to_i(8)),
       },
       {
-        'type'        => 'owner',
-        'resource'    => resource[:owner],
+        'type' => 'owner',
+        'resource' => resource[:owner],
         'set_to_user' => owner,
         'fullcontrol' => "700".to_i(8),
         'remove_mask' => "077".to_i(8),
@@ -121,12 +118,12 @@ Puppet::Type.type(:file).provide :windows do
           # Since the group is LocalSystem, and the permissions are FullControl,
           # replace the value returned with the value expected. This will treat
           # this specific situation as "insync"
-          current = ( (current.to_i(8) & mode_part['remove_mask']) | mode_part['should_mask'] ).to_s(8).rjust(4, '0')
+          current = ((current.to_i(8) & mode_part['remove_mask']) | mode_part['should_mask']).to_s(8).rjust(4, '0')
         else
           # If the SYSTEM account does _not_ have FullControl in this scenario, we should
           # force the resource out of sync no matter what.
-          #TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
-          Puppet.debug { _("%{resource_name}: %{mode_part_type} set to SYSTEM. SYSTEM permissions cannot be set below FullControl ('7')") % { resource_name: resource[:name], mode_part_type: mode_part['type']} }
+          # TRANSLATORS 'SYSTEM' is a Windows name and should not be translated
+          Puppet.debug { _("%{resource_name}: %{mode_part_type} set to SYSTEM. SYSTEM permissions cannot be set below FullControl ('7')") % { resource_name: resource[:name], mode_part_type: mode_part['type'] } }
           return nil
         end
       end
@@ -135,7 +132,9 @@ Puppet::Type.type(:file).provide :windows do
   end
 
   attr_reader :file
+
   private
+
   def file
     @file ||= Puppet::FileSystem.pathname(resource[:path])
   end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Group Puppet provider for AIX. It uses standard commands to manage groups:
 #  mkgroup, rmgroup, lsgroup, chgroup
 require_relative '../../../puppet/provider/aix_object'
@@ -6,8 +8,8 @@ Puppet::Type.type(:group).provide :aix, :parent => Puppet::Provider::AixObject d
   desc "Group management for AIX."
 
   # This will the default provider for this platform
-  defaultfor :operatingsystem => :aix
-  confine :operatingsystem => :aix
+  defaultfor 'os.name' => :aix
+  confine 'os.name' => :aix
 
   # Commands that manage the element
   commands :list      => "/usr/sbin/lsgroup"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice/directoryservice'
 
 Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider::NameService::DirectoryService do
@@ -6,17 +8,17 @@ Puppet::Type.type(:group).provide :directoryservice, :parent => Puppet::Provider
   "
 
   commands :dscl => "/usr/bin/dscl"
-  confine :operatingsystem => :darwin
-  defaultfor :operatingsystem => :darwin
+  confine 'os.name' => :darwin
+  defaultfor 'os.name' => :darwin
   has_feature :manages_members
 
   def members_insync?(current, should)
     return false unless current
+
     if current == :absent
-      return should.empty?
+      should.empty?
     else
-      return current.sort.uniq == should.sort.uniq
+      current.sort.uniq == should.sort.uniq
     end
   end
-
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice/objectadd'
 require_relative '../../../puppet/util/libuser'
 
@@ -9,7 +11,7 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
   commands :add => "groupadd", :delete => "groupdel", :modify => "groupmod"
 
-  has_feature :system_groups unless %w{HP-UX Solaris}.include? Puppet.runtime[:facter].value(:operatingsystem)
+  has_feature :system_groups unless %w[HP-UX Solaris].include? Puppet.runtime[:facter].value('os.name')
 
   verify :gid, _("GID must be an integer") do |value|
     value.is_a? Integer
@@ -32,17 +34,20 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
   def exists?
     return !!localgid if @resource.forcelocal?
+
     super
   end
 
   def gid
     return localgid if @resource.forcelocal?
+
     get(:gid)
   end
 
   def localgid
     group = findgroup(:group_name, resource[:name])
     return group[:gid] if group
+
     false
   end
 
@@ -51,12 +56,12 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
     # because by default duplicates are allowed.  This check is
     # to ensure consistent behaviour of the useradd provider when
     # using both useradd and luseradd
-    if not @resource.allowdupe? and @resource.forcelocal?
-       if @resource.should(:gid) and findgroup(:gid, @resource.should(:gid).to_s)
-           raise(Puppet::Error, _("GID %{resource} already exists, use allowdupe to force group creation") % { resource: @resource.should(:gid).to_s })
-       end
-    elsif @resource.allowdupe? and not @resource.forcelocal?
-       return ["-o"]
+    if !@resource.allowdupe? and @resource.forcelocal?
+      if @resource.should(:gid) and findgroup(:gid, @resource.should(:gid).to_s)
+        raise(Puppet::Error, _("GID %{resource} already exists, use allowdupe to force group creation") % { resource: @resource.should(:gid).to_s })
+      end
+    elsif @resource.allowdupe? and !@resource.forcelocal?
+      return ["-o"]
     end
     []
   end
@@ -134,7 +139,8 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
   end
 
   def members_to_s(current)
-    return '' if current.nil? || !current.kind_of?(Array)
+    return '' if current.nil? || !current.is_a?(Array)
+
     current.join(',')
   end
 
@@ -159,13 +165,13 @@ Puppet::Type.type(:group).provide :groupadd, :parent => Puppet::Provider::NameSe
 
     unless @groups
       unless Puppet::FileSystem.exist?(group_file)
-        raise Puppet::Error.new("Forcelocal set for group resource '#{resource[:name]}', but #{group_file} does not exist")
+        raise Puppet::Error, "Forcelocal set for group resource '#{resource[:name]}', but #{group_file} does not exist"
       end
 
       @groups = []
       Puppet::FileSystem.each_line(group_file) do |line|
         group = line.chomp.split(':')
-        @groups << Hash[group_keys.zip(group)]
+        @groups << group_keys.zip(group).to_h
       end
     end
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/ldap'
 
 Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
@@ -29,6 +31,7 @@ Puppet::Type.type(:group).provide :ldap, :parent => Puppet::Provider::Ldap do
       existing.each do |hash|
         value = hash[:gid]
         next unless value
+
         num = value[0].to_i
         largest = num if num > largest
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice/pw'
 
 Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService::PW do
@@ -6,8 +8,8 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
   commands :pw => "pw"
   has_features :manages_members
 
-  defaultfor :operatingsystem => [:freebsd, :dragonfly]
-  confine    :operatingsystem => [:freebsd, :dragonfly]
+  defaultfor 'os.name' => [:freebsd, :dragonfly]
+  confine    'os.name' => [:freebsd, :dragonfly]
 
   options :members, :flag => "-M", :method => :mem
 
@@ -48,4 +50,3 @@ Puppet::Type.type(:group).provide :pw, :parent => Puppet::Provider::NameService:
     super(param, value)
   end
 end
-

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

@@ -1,15 +1,17 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/windows'
 
 Puppet::Type.type(:group).provide :windows_adsi do
   desc "Local group management for Windows. Group members can be both users and groups.
     Additionally, local groups can contain domain users."
 
-  defaultfor :operatingsystem => :windows
-  confine    :operatingsystem => :windows
+  defaultfor 'os.name' => :windows
+  confine    'os.name' => :windows
 
   has_features :manages_members
 
-  def initialize(value={})
+  def initialize(value = {})
     super(value)
     @deleted = false
   end
@@ -38,10 +40,11 @@ Puppet::Type.type(:group).provide :windows_adsi do
   end
 
   def members_to_s(users)
-    return '' if users.nil? or !users.kind_of?(Array)
+    return '' if users.nil? or !users.is_a?(Array)
+
     users = users.map do |user_name|
       sid = Puppet::Util::Windows::SID.name_to_principal(user_name)
-      if !sid
+      unless sid
         resource.debug("#{user_name} (unresolvable to SID)")
         next user_name
       end
@@ -54,11 +57,11 @@ Puppet::Type.type(:group).provide :windows_adsi do
       resource.debug("#{sid.domain}\\#{account} (#{sid.sid})")
       sid.domain ? "#{sid.domain}\\#{account}" : account
     end
-    return users.join(',')
+    users.join(',')
   end
 
   def member_valid?(user_name)
-    ! Puppet::Util::Windows::SID.name_to_principal(user_name).nil?
+    !Puppet::Util::Windows::SID.name_to_principal(user_name).nil?
   end
 
   def group

data/lib/puppet/provider/ldap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../puppet/provider'
 
 # The base class for LDAP providers.
@@ -79,9 +81,10 @@ class Puppet::Provider::Ldap < Puppet::Provider
   def initialize(*args)
     raise(Puppet::DevError, _("No LDAP Configuration defined for %{class_name}") % { class_name: self.class }) unless self.class.manager
     raise(Puppet::DevError, _("Invalid LDAP Configuration defined for %{class_name}") % { class_name: self.class }) unless self.class.manager.valid?
+
     super
 
-    @property_hash = @property_hash.inject({}) do |result, ary|
+    @property_hash = @property_hash.each_with_object({}) do |ary, result|
       param, values = ary
 
       # Skip any attributes we don't manage.
@@ -101,7 +104,6 @@ class Puppet::Provider::Ldap < Puppet::Provider
       else
         result[param] = values
       end
-      result
     end
 
     # Make a duplicate, so that we have a copy for comparison
@@ -117,7 +119,7 @@ class Puppet::Provider::Ldap < Puppet::Provider
   # Return (and look up if necessary) the desired state.
   def properties
     if @property_hash.empty?
-      @property_hash = query || {:ensure => :absent}
+      @property_hash = query || { :ensure => :absent }
       @property_hash[:ensure] = :absent if @property_hash.empty?
     end
     @property_hash.dup