fruworg/pgls
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add proper error checking for LDAP search

Browse Source
This commit is contained in:
Lars Kanis 2011-07-07 15:07:44 +02:00
parent aab83aaf09
commit 68e6b40741
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pg_ldap_sync/application.rb
View File

@ -32,6 +32,7 @@ require 'pg_ldap_sync'
module PgLdapSync module PgLdapSync
class Application class Application
class LdapError < RuntimeError; end
attr_accessor :config_fname attr_accessor :config_fname
attr_accessor :log attr_accessor :log
attr_accessor :test attr_accessor :test
@ -77,7 +78,7 @@ class Application
ldap_user_conf = @config[:ldap_users] ldap_user_conf = @config[:ldap_users]
users = [] users = []
@ldap.search(:base => ldap_user_conf[:base], :filter => ldap_user_conf[:filter]) do |entry| res = @ldap.search(:base => ldap_user_conf[:base], :filter => ldap_user_conf[:filter]) do |entry|
name = entry[ldap_user_conf[:name_attribute]].first name = entry[ldap_user_conf[:name_attribute]].first
unless name unless name
@ -95,6 +96,7 @@ class Application
end end
end end
end end
raise LdapError, "LDAP: #{@ldap.get_operation_result.message}" unless res
return users return users
end end
@ -102,7 +104,7 @@ class Application
ldap_group_conf = @config[:ldap_groups] ldap_group_conf = @config[:ldap_groups]
groups = [] groups = []
@ldap.search(:base => ldap_group_conf[:base], :filter => ldap_group_conf[:filter]) do |entry| res = @ldap.search(:base => ldap_group_conf[:base], :filter => ldap_group_conf[:filter]) do |entry|
name = entry[ldap_group_conf[:name_attribute]].first name = entry[ldap_group_conf[:name_attribute]].first
unless name unless name
@ -120,6 +122,7 @@ class Application
end end
end end
end end
raise LdapError, "LDAP: #{@ldap.get_operation_result.message}" unless res
return groups return groups
end end