From a090e868d55ea9b10f8193dcb2d1f23838a6def1 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Mon, 11 Oct 2010 19:41:31 -0700 Subject: Fix for #4963 -- Use correct commands for password expiry on solaris This fixes the command / option issues of #4963 as suggested on the ticket; the setting-expiry when not needed aspects are deferred to #4975. --- lib/puppet/provider/user/user_role_add.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/puppet') diff --git a/lib/puppet/provider/user/user_role_add.rb b/lib/puppet/provider/user/user_role_add.rb index 7e7ad78e5..c8be75a8f 100644 --- a/lib/puppet/provider/user/user_role_add.rb +++ b/lib/puppet/provider/user/user_role_add.rb @@ -6,15 +6,15 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => defaultfor :operatingsystem => :solaris - commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "chage", :role_add => "roleadd", :role_delete => "roledel", :role_modify => "rolemod" + commands :add => "useradd", :delete => "userdel", :modify => "usermod", :password => "passwd", :role_add => "roleadd", :role_delete => "roledel", :role_modify => "rolemod" options :home, :flag => "-d", :method => :dir options :comment, :method => :gecos options :groups, :flag => "-G" options :roles, :flag => "-R" options :auths, :flag => "-A" options :profiles, :flag => "-P" - options :password_min_age, :flag => "-m" - options :password_max_age, :flag => "-M" + options :password_min_age, :flag => "-n" + options :password_max_age, :flag => "-x" verify :gid, "GID must be an integer" do |value| value.is_a? Integer -- cgit From e232770baefc35abb71de6e2f28d053158e6dd45 Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Mon, 11 Oct 2010 21:07:29 -0700 Subject: Minimal fix for #4975 -- only call chage when managing password age rules This is intended to be a minimal fix, with tests, to prevent chage from running unless needed. --- lib/puppet/provider/nameservice.rb | 4 +++- lib/puppet/provider/user/user_role_add.rb | 4 +++- lib/puppet/provider/user/useradd.rb | 11 +++++------ 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'lib/puppet') diff --git a/lib/puppet/provider/nameservice.rb b/lib/puppet/provider/nameservice.rb index 9830fab54..d57052bd9 100644 --- a/lib/puppet/provider/nameservice.rb +++ b/lib/puppet/provider/nameservice.rb @@ -165,7 +165,9 @@ class Puppet::Provider::NameService < Puppet::Provider begin execute(self.addcmd) - execute(self.passcmd) if self.feature? :manages_password_age + if feature?(:manages_password_age) && (cmd = passcmd) + execute(cmd) + end rescue Puppet::ExecutionFailure => detail raise Puppet::Error, "Could not create #{@resource.class.name} #{@resource.name}: #{detail}" end diff --git a/lib/puppet/provider/user/user_role_add.rb b/lib/puppet/provider/user/user_role_add.rb index c8be75a8f..caca1ef88 100644 --- a/lib/puppet/provider/user/user_role_add.rb +++ b/lib/puppet/provider/user/user_role_add.rb @@ -81,7 +81,9 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source => run(transition("normal"), "transition role to") else run(addcmd, "create") - run(passcmd, "change password policy for") + if cmd = passcmd + run(cmd, "change password policy for") + end end # added to handle case when password is specified self.password = @resource[:password] if @resource[:password] diff --git a/lib/puppet/provider/user/useradd.rb b/lib/puppet/provider/user/useradd.rb index 9a62db464..5a163f35a 100644 --- a/lib/puppet/provider/user/useradd.rb +++ b/lib/puppet/provider/user/useradd.rb @@ -70,13 +70,12 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ end def passcmd - cmd = [command(:password)] - [:password_min_age, :password_max_age].each do |property| - if value = @resource.should(property) - cmd << flag(property) << value - end + age_limits = [:password_min_age, :password_max_age].select { |property| @resource.should(property) } + if age_limits.empty? + nil + else + [command(:password),age_limits.collect { |property| [flag(property), @resource.should(property)]}, @resource[:name]].flatten end - cmd << @resource[:name] end def min_age -- cgit From 3c56705a95c945778674f9792a07b66b879cb48e Mon Sep 17 00:00:00 2001 From: Markus Roberts Date: Tue, 12 Oct 2010 16:38:59 -0700 Subject: Fix for #4832 -- Making PSON handle arbitrary binary data The PSON library needlessly assumed that the data to be transmitted was well- formed unicode. This made Latin-1 users (and anyone who needed to serialize arbitrary binary data) sad. This patch goes some of the way to resolving the issues, by passing through non-unicode data rather than just failing, adds tests, and cleans up a pernicious assumption about escape characters in ruby regular expressions not marked "n" (no-encoding). --- lib/puppet/external/pson/pure/generator.rb | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'lib/puppet') diff --git a/lib/puppet/external/pson/pure/generator.rb b/lib/puppet/external/pson/pure/generator.rb index ef8b36d31..4180be57d 100644 --- a/lib/puppet/external/pson/pure/generator.rb +++ b/lib/puppet/external/pson/pure/generator.rb @@ -63,22 +63,15 @@ module PSON end else def utf8_to_pson(string) # :nodoc: - string = string.gsub(/["\\\x0-\x1f]/) { MAP[$MATCH] } - string.gsub!(/( - (?: + string. + gsub(/["\\\x0-\x1f]/n) { MAP[$MATCH] }. + gsub(/((?: [\xc2-\xdf][\x80-\xbf] | [\xe0-\xef][\x80-\xbf]{2} | [\xf0-\xf4][\x80-\xbf]{3} - )+ | - [\x80-\xc1\xf5-\xff] # invalid - )/nx) { |c| - c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'" - s = PSON::UTF8toUTF16.iconv(c).unpack('H*')[0] - s.gsub!(/.{4}/n, '\\\\u\&') + )+)/nx) { |c| + PSON::UTF8toUTF16.iconv(c).unpack('H*')[0].gsub(/.{4}/n, '\\\\u\&') } - string - rescue Iconv::Failure => e - raise GeneratorError, "Caught #{e.class}: #{e}" end end module_function :utf8_to_pson -- cgit