openvox 7.37.1 → 8.19.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/error'
 
 Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
@@ -5,13 +7,13 @@ Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
     will need to install Ruby's shadow password library (package known as
     `ruby-shadow`) if you wish to manage user passwords."
 
-  commands :add      => "useradd",
-           :delete   => "userdel",
-           :modify   => "usermod",
+  commands :add => "useradd",
+           :delete => "userdel",
+           :modify => "usermod",
            :password => "passwd"
 
-  defaultfor :operatingsystem => :openbsd
-  confine    :operatingsystem => :openbsd
+  defaultfor 'os.name' => :openbsd
+  confine    'os.name' => :openbsd
 
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos
@@ -19,22 +21,22 @@ Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
   options :password, :method => :sp_pwdp
   options :loginclass, :flag => '-L', :method => :sp_loginclass
   options :expiry, :method => :sp_expire,
-    :munge => proc { |value|
-      if value == :absent
-        ''
-      else
-        # OpenBSD uses a format like "january 1 1970"
-        Time.parse(value).strftime('%B %d %Y')
-      end
-    },
-    :unmunge => proc { |value|
-      if value == -1
-        :absent
-      else
-        # Expiry is days after 1970-01-01
-        (Date.new(1970,1,1) + value).strftime('%Y-%m-%d')
-      end
-    }
+                   :munge => proc { |value|
+                               if value == :absent
+                                 ''
+                               else
+                                 # OpenBSD uses a format like "january 1 1970"
+                                 Time.parse(value).strftime('%B %d %Y')
+                               end
+                             },
+                   :unmunge => proc { |value|
+                                 if value == -1
+                                   :absent
+                                 else
+                                   # Expiry is days after 1970-01-01
+                                   (Date.new(1970, 1, 1) + value).strftime('%Y-%m-%d')
+                                 end
+                               }
 
   [:expiry, :password, :loginclass].each do |shadow_property|
     define_method(shadow_property) do
@@ -47,7 +49,7 @@ Puppet::Type.type(:user).provide :openbsd, :parent => :useradd do
           begin
             return unmunge(shadow_property, ent.send(method))
           rescue
-            #TRANSLATORS 'ruby-shadow' is a Ruby gem library
+            # TRANSLATORS 'ruby-shadow' is a Ruby gem library
             Puppet.warning _("ruby-shadow doesn't support %{method}") % { method: method }
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice/pw'
 require 'open3'
 
@@ -7,8 +9,8 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
   commands :pw => "pw"
   has_features :manages_homedir, :allows_duplicates, :manages_passwords, :manages_expiry, :manages_shell
 
-  defaultfor :operatingsystem => [:freebsd, :dragonfly]
-  confine    :operatingsystem => [:freebsd, :dragonfly]
+  defaultfor 'os.name' => [:freebsd, :dragonfly]
+  confine    'os.name' => [:freebsd, :dragonfly]
 
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos
@@ -18,7 +20,6 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     value.split("-").reverse.join("-")
   }
 
-
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
   end
@@ -31,9 +32,10 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     cmd = [command(:pw), "useradd", @resource[:name]]
     @resource.class.validproperties.each do |property|
       next if property == :ensure or property == :password
+
       value = @resource.should(property)
       if value and value != ""
-        cmd << flag(property) << munge(property,value)
+        cmd << flag(property) << munge(property, value)
       end
     end
 
@@ -84,7 +86,7 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
   end
 
   def has_sensitive_data?(property = nil)
-    #Check for sensitive values?
+    # Check for sensitive values?
     properties = property ? [property] : Puppet::Type.type(:user).validproperties
     properties.any? do |prop|
       p = @resource.parameter(prop)
@@ -94,7 +96,7 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
 
   # Get expiry from system and convert to Puppet-style date
   def expiry
-    expiry = self.get(:expiry)
+    expiry = get(:expiry)
     expiry = :absent if expiry == 0
 
     if expiry != :absent
@@ -105,4 +107,3 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
     expiry
   end
 end
-

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

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util'
 require_relative '../../../puppet/util/user_attr'
 require 'date'
 
 Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => :useradd do
-
   desc "User and role management on Solaris, via `useradd` and `roleadd`."
 
-  defaultfor :osfamily => :solaris
+  defaultfor 'os.family' => :solaris
 
   commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "passwd", :role_add => "roleadd", :role_delete => "roledel", :role_modify => "rolemod"
   options :home, :flag => "-d", :method => :dir
@@ -44,12 +45,13 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
     end
   end
 
-  #must override this to hand the keyvalue pairs
+  # must override this to hand the keyvalue pairs
   def add_properties
     cmd = []
     Puppet::Type.type(:user).validproperties.each do |property|
-      #skip the password because we can't create it with the solaris useradd
+      # skip the password because we can't create it with the solaris useradd
       next if [:ensure, :password, :password_min_age, :password_max_age, :password_warn_days].include?(property)
+
       # 1680 Now you can set the hashed passwords on solaris:lib/puppet/provider/user/user_role_add.rb
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
@@ -74,7 +76,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   end
 
   def command(cmd)
-    cmd = ("role_#{cmd}").intern if is_role? or (!exists? and @resource[:ensure] == :role)
+    cmd = "role_#{cmd}".intern if is_role? or (!exists? and @resource[:ensure] == :role)
     super(cmd)
   end
 
@@ -83,9 +85,9 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   end
 
   def run(cmd, msg)
-      execute(cmd)
+    execute(cmd)
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not #{msg} #{@resource.class.name} #{@resource.name}: #{detail}", detail.backtrace
+    raise Puppet::Error, "Could not #{msg} #{@resource.class.name} #{@resource.name}: #{detail}", detail.backtrace
   end
 
   def transition(type)
@@ -110,7 +112,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   end
 
   def destroy
-    run(deletecmd, "delete "+ (is_role? ? "role" : "user"))
+    run(deletecmd, "delete " + (is_role? ? "role" : "user"))
   end
 
   def create_role
@@ -143,19 +145,19 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
 
   def remove_managed_attributes
     managed = managed_attributes
-    user_attributes.select { |k,v| !managed.include?(k) }.inject({}) { |hash, array| hash[array[0]] = array[1]; hash }
+    user_attributes.select { |k, _v| !managed.include?(k) }.each_with_object({}) { |array, hash| hash[array[0]] = array[1]; }
   end
 
   def keys
     if user_attributes
-      #we have to get rid of all the keys we are managing another way
+      # we have to get rid of all the keys we are managing another way
       remove_managed_attributes
     end
   end
 
   def build_keys_cmd(keys_hash)
     cmd = []
-    keys_hash.each do |k,v|
+    keys_hash.each do |k, v|
       cmd << "-K" << "#{k}=#{v}"
     end
     cmd
@@ -165,7 +167,6 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
     run([command(:modify)] + build_keys_cmd(keys_hash) << @resource[:name], "modify attribute key pairs")
   end
 
-
   # This helper makes it possible to test this on stub data without having to
   # do too many crazy things!
   def target_file_path
@@ -173,34 +174,39 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   end
   private :target_file_path
 
-  #Read in /etc/shadow, find the line for this user (skipping comments, because who knows) and return it
-  #No abstraction, all esoteric knowledge of file formats, yay
+  # Read in /etc/shadow, find the line for this user (skipping comments, because who knows) and return it
+  # No abstraction, all esoteric knowledge of file formats, yay
   def shadow_entry
     return @shadow_entry if defined? @shadow_entry
-    @shadow_entry = File.readlines(target_file_path).
-      reject { |r| r =~ /^[^\w]/ }.
-      # PUP-229: don't suppress the empty fields
-      collect { |l| l.chomp.split(':', -1) }.
-      find { |user, _| user == @resource[:name] }
+
+    @shadow_entry =
+      File.readlines(target_file_path)
+          .reject { |r| r =~ /^[^\w]/ }
+          .collect { |l| l.chomp.split(':', -1) } # Don't suppress empty fields (PUP-229)
+          .find { |user, _| user == @resource[:name] }
   end
 
   def password
     return :absent unless shadow_entry
+
     shadow_entry[1]
   end
 
   def password_min_age
     return :absent unless shadow_entry
+
     shadow_entry[3].empty? ? -1 : shadow_entry[3]
   end
 
   def password_max_age
     return :absent unless shadow_entry
+
     shadow_entry[4].empty? ? -1 : shadow_entry[4]
   end
 
   def password_warn_days
     return :absent unless shadow_entry
+
     shadow_entry[5].empty? ? -1 : shadow_entry[5]
   end
 
@@ -215,25 +221,23 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   # data, but it is still terrible.  We still skip platform locking, so a
   # concurrent `vipw -s` session will have no idea we risk data loss.
   def password=(cryptopw)
-    begin
-      shadow = File.read(target_file_path)
-
-      # Go Mifune loves the race here where we can lose data because
-      # /etc/shadow changed between reading it and writing it.
-      # --daniel 2012-02-05
-      Puppet::Util.replace_file(target_file_path, 0640) do |fh|
-        shadow.each_line do |line|
-          line_arr = line.split(':')
-          if line_arr[0] == @resource[:name]
-            line_arr[1] = cryptopw
-            line_arr[2] = (Date.today - Date.new(1970,1,1)).to_i.to_s
-            line = line_arr.join(':')
-          end
-          fh.print line
+    shadow = File.read(target_file_path)
+
+    # Go Mifune loves the race here where we can lose data because
+    # /etc/shadow changed between reading it and writing it.
+    # --daniel 2012-02-05
+    Puppet::Util.replace_file(target_file_path, 0o640) do |fh|
+      shadow.each_line do |line|
+        line_arr = line.split(':')
+        if line_arr[0] == @resource[:name]
+          line_arr[1] = cryptopw
+          line_arr[2] = (Date.today - Date.new(1970, 1, 1)).to_i.to_s
+          line = line_arr.join(':')
         end
+        fh.print line
       end
-    rescue => detail
-      self.fail Puppet::Error, "Could not write replace #{target_file_path}: #{detail}", detail
     end
+  rescue => detail
+    self.fail Puppet::Error, "Could not write replace #{target_file_path}: #{detail}", detail
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/provider/nameservice/objectadd'
 require 'date'
 require_relative '../../../puppet/util/libuser'
@@ -12,7 +14,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     To use the `forcelocal` parameter, you need to install the `libuser` package (providing
     `/usr/sbin/lgroupadd` and `/usr/sbin/luseradd`)."
 
-  commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage", :chpasswd  => "chpasswd"
+  commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage", :chpasswd => "chpasswd"
 
   options :home, :flag => "-d", :method => :dir
   options :comment, :method => :gecos
@@ -22,69 +24,76 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   options :password_warn_days, :flag => "-W", :method => :sp_warn
   options :password, :method => :sp_pwdp
   options :expiry, :method => :sp_expire,
-    :munge => proc { |value|
-      if value == :absent
-        if Puppet.runtime[:facter].value(:operatingsystem)=='SLES' && Puppet.runtime[:facter].value(:operatingsystemmajrelease) == "11"
-          -1
-        else
-          ''
-        end
-      else
-        case Puppet.runtime[:facter].value(:operatingsystem)
-        when 'Solaris'
-          # Solaris uses %m/%d/%Y for useradd/usermod
-          expiry_year, expiry_month, expiry_day = value.split('-')
-          [expiry_month, expiry_day, expiry_year].join('/')
-        else
-          value
-        end
-      end
-    },
-    :unmunge => proc { |value|
-      if value == -1
-        :absent
-      else
-        # Expiry is days after 1970-01-01
-        (Date.new(1970,1,1) + value).strftime('%Y-%m-%d')
-      end
-    }
+                   :munge => proc { |value|
+                               if value == :absent
+                                 if Puppet.runtime[:facter].value('os.name') == 'SLES' && Puppet.runtime[:facter].value('os.release.major') == "11"
+                                   -1
+                                 else
+                                   ''
+                                 end
+                               else
+                                 case Puppet.runtime[:facter].value('os.name')
+                                 when 'Solaris'
+                                   # Solaris uses %m/%d/%Y for useradd/usermod
+                                   expiry_year, expiry_month, expiry_day = value.split('-')
+                                   [expiry_month, expiry_day, expiry_year].join('/')
+                                 else
+                                   value
+                                 end
+                               end
+                             },
+                   :unmunge => proc { |value|
+                                 if value == -1
+                                   :absent
+                                 else
+                                   # Expiry is days after 1970-01-01
+                                   (Date.new(1970, 1, 1) + value).strftime('%Y-%m-%d')
+                                 end
+                               }
 
   optional_commands :localadd => "luseradd", :localdelete => "luserdel", :localmodify => "lusermod", :localpassword => "lchage"
   has_feature :manages_local_users_and_groups if Puppet.features.libuser?
 
   def exists?
     return !!localuid if @resource.forcelocal?
+
     super
   end
 
   def uid
-     return localuid if @resource.forcelocal?
-     get(:uid)
+    return localuid if @resource.forcelocal?
+
+    get(:uid)
   end
 
   def gid
-     return localgid if @resource.forcelocal?
-     get(:gid)
+    return localgid if @resource.forcelocal?
+
+    get(:gid)
   end
 
   def comment
-     return localcomment if @resource.forcelocal?
-     get(:comment)
+    return localcomment if @resource.forcelocal?
+
+    get(:comment)
   end
 
   def shell
     return localshell if @resource.forcelocal?
+
     get(:shell)
   end
 
   def home
     return localhome if @resource.forcelocal?
+
     get(:home)
   end
 
   def groups
-     return localgroups if @resource.forcelocal?
-     super
+    return localgroups if @resource.forcelocal?
+
+    super
   end
 
   def finduser(key, value)
@@ -93,13 +102,13 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
 
     unless @users
       unless Puppet::FileSystem.exist?(passwd_file)
-        raise Puppet::Error.new("Forcelocal set for user resource '#{resource[:name]}', but #{passwd_file} does not exist")
+        raise Puppet::Error, "Forcelocal set for user resource '#{resource[:name]}', but #{passwd_file} does not exist"
       end
 
       @users = []
       Puppet::FileSystem.each_line(passwd_file) do |line|
         user = line.chomp.split(':')
-        @users << Hash[passwd_keys.zip(user)]
+        @users << passwd_keys.zip(user).to_h
       end
     end
     @users.find { |param| param[key] == value } || false
@@ -112,6 +121,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   def localuid
     user = finduser(:account, resource[:name])
     return user[:uid] if user
+
     false
   end
 
@@ -153,7 +163,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     @groups_of[user] = []
 
     unless Puppet::FileSystem.exist?(group_file)
-      raise Puppet::Error.new("Forcelocal set for user resource '#{user}', but #{group_file} does not exist")
+      raise Puppet::Error, "Forcelocal set for user resource '#{user}', but #{group_file} does not exist"
     end
 
     Puppet::FileSystem.each_line(group_file) do |line|
@@ -195,7 +205,6 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
         :sensitive => has_sensitive_data?
       }
       output = execute(cmd, execute_options)
-
     rescue => detail
       tempfile.close
       tempfile.delete
@@ -216,7 +225,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   end
 
   has_features :manages_homedir, :allows_duplicates, :manages_expiry
-  has_features :system_users unless %w{HP-UX Solaris}.include? Puppet.runtime[:facter].value(:operatingsystem)
+  has_features :system_users unless %w[HP-UX Solaris].include? Puppet.runtime[:facter].value('os.name')
 
   has_features :manages_passwords, :manages_password_age if Puppet.features.libshadow?
   has_features :manages_shell
@@ -226,12 +235,12 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     # because by default duplicates are allowed.  This check is
     # 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")
-       end
-    elsif @resource.allowdupe? && (!@resource.forcelocal?)
-       return ["-o"]
+    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")
+      end
+    elsif @resource.allowdupe? && !@resource.forcelocal?
+      return ["-o"]
     end
     []
   end
@@ -251,8 +260,8 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
       # libuser does not implement the -m flag
       cmd << "-m" unless @resource.forcelocal?
     else
-      osfamily = Puppet.runtime[:facter].value(:osfamily)
-      osversion = Puppet.runtime[:facter].value(:operatingsystemmajrelease).to_i
+      osfamily = Puppet.runtime[:facter].value('os.family')
+      osversion = Puppet.runtime[:facter].value('os.release.major').to_i
       # SLES 11 uses pwdutils instead of shadow, which does not have -M
       # Solaris and OpenBSD use different useradd flavors
       unless osfamily =~ /Solaris|OpenBSD/ || osfamily == 'Suse' && osversion <= 11
@@ -279,6 +288,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     Puppet::Type.type(:user).validproperties.sort.each do |property|
       value = get_value_for_property(property)
       next if value.nil? || property == :password
+
       # the value needs to be quoted, mostly because -c might
       # have spaces in it
       cmd << flag(property) << munge(property, value)
@@ -291,6 +301,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     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 == ""
 
@@ -298,7 +309,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   end
 
   def has_sensitive_data?(property = nil)
-    #Check for sensitive values?
+    # Check for sensitive values?
     properties = property ? [property] : Puppet::Type.type(:user).validproperties
     properties.any? do |prop|
       p = @resource.parameter(prop)
@@ -313,7 +324,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     else
       cmd = [command(:add)]
     end
-    if (!@resource.should(:gid)) && Puppet::Util.gid(@resource[:name])
+    if !@resource.should(:gid) && Puppet::Util.gid(@resource[:name])
       cmd += ["-g", @resource[:name]]
     end
     cmd += add_properties
@@ -350,7 +361,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
       cmd = [command(:delete)]
     end
     # Solaris `userdel -r` will fail if the homedir does not exist.
-    if @resource.managehome? && (('Solaris' != Puppet.runtime[:facter].value(:operatingsystem)) || Dir.exist?(Dir.home(@resource[:name])))
+    if @resource.managehome? && (('Solaris' != Puppet.runtime[:facter].value('os.name')) || Dir.exist?(Dir.home(@resource[:name])))
       cmd << '-r'
     end
     cmd << @resource[:name]
@@ -367,7 +378,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     if age_limits.empty?
       nil
     else
-      [cmd, age_limits.collect { |property| [flag(property), @resource.should(property)]}, @resource[:name]].flatten
+      [cmd, age_limits.collect { |property| [flag(property), @resource.should(property)] }, @resource[:name]].flatten
     end
   end
 
@@ -390,7 +401,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     end
     super
     if @resource.forcelocal?
-      set(:groups, @resource[:groups]) if self.groups?
+      set(:groups, @resource[:groups]) if groups?
       set(:expiry, @resource[:expiry]) if @resource[:expiry]
     end
     set(:password, @resource[:password]) if @resource[:password]

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

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
+
 require_relative '../../../puppet/util/windows'
 
 Puppet::Type.type(:user).provide :windows_adsi do
   desc "Local user management for Windows."
 
-  defaultfor :operatingsystem => :windows
-  confine    :operatingsystem => :windows
+  defaultfor 'os.name' => :windows
+  confine    'os.name' => :windows
 
   has_features :manages_homedir, :manages_passwords, :manages_roles
 
-  def initialize(value={})
+  def initialize(value = {})
     super(value)
     @deleted = false
   end
@@ -18,7 +20,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
   end
 
   def roles
-    Puppet::Util::Windows::User::get_rights(@resource[:name])
+    Puppet::Util::Windows::User.get_rights(@resource[:name])
   end
 
   def roles=(value)
@@ -26,11 +28,11 @@ Puppet::Type.type(:user).provide :windows_adsi do
     should  = value.split(',')
 
     add_list = should - current
-    Puppet::Util::Windows::User::set_rights(@resource[:name], add_list) unless add_list.empty?
+    Puppet::Util::Windows::User.set_rights(@resource[:name], add_list) unless add_list.empty?
 
     if @resource[:role_membership] == :inclusive
       remove_list = current - should
-      Puppet::Util::Windows::User::remove_rights(@resource[:name], remove_list) unless remove_list.empty?
+      Puppet::Util::Windows::User.remove_rights(@resource[:name], remove_list) unless remove_list.empty?
     end
   end
 
@@ -67,7 +69,8 @@ Puppet::Type.type(:user).provide :windows_adsi do
   end
 
   def groups_to_s(groups)
-    return '' if groups.nil? || !groups.kind_of?(Array)
+    return '' if groups.nil? || !groups.is_a?(Array)
+
     groups = groups.map do |group_name|
       sid = Puppet::Util::Windows::SID.name_to_principal(group_name)
       if sid.account =~ /\\/
@@ -78,7 +81,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
       resource.debug("#{sid.domain}\\#{account} (#{sid.sid})")
       "#{sid.domain}\\#{account}"
     end
-    return groups.join(',')
+    groups.join(',')
   end
 
   def create
@@ -137,7 +140,8 @@ Puppet::Type.type(:user).provide :windows_adsi do
     # avoid a LogonUserW style password check when the resource is not yet
     # populated with a password (as is the case with `puppet resource user`)
     return nil if @resource[:password].nil?
-    user.password_is?( @resource[:password] ) ? @resource[:password] : nil
+
+    user.password_is?(@resource[:password]) ? @resource[:password] : nil
   end
 
   def password=(value)
@@ -161,7 +165,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
 
   [:gid, :shell].each do |prop|
     define_method(prop) { nil }
-    define_method("#{prop}=") do |v|
+    define_method("#{prop}=") do |_v|
       fail "No support for managing property #{prop} of user #{@resource[:name]} on Windows"
     end
   end