shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

F #4294: Fix Multi LDAP server logging (#202)

Browse Source 
Co-authored-by: Daniel Clavijo Coca <dclavijo@opennebula.io>
This commit is contained in:
Daniel Clavijo Coca 2020-09-11 03:08:18 -05:00 committed by GitHub
parent bcb57100d1
commit 7b78ba18bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/authm_mad/remotes/ldap/authenticate
View File

@ -56,17 +56,17 @@ begin
user = URI_PARSER.unescape(xml['/AUTHN/USERNAME'])
secret = URI_PARSER.unescape(xml['/AUTHN/SECRET'])
rescue
STDERR.puts "Invalid XML input"
rescue StandardError
STDERR.puts 'Invalid XML input'
exit(-1)
end
options=YAML.load(File.read(ETC_LOCATION+'/auth/ldap_auth.conf'))
user_full = user
order,user = get_server_order(options, user)
order, user = get_server_order(options, user)
STDERR.puts "Using group of servers: #{servers.join(', ')}" if order.length>1
STDERR.puts "Using group of servers: #{order.join(' ')}" if order.length>1
order.each do |servers|
servers.each do |server_name|
@ -74,7 +74,7 @@ order.each do |servers|
server_conf=options[server_name]
if !server_conf
STDERR.puts "Configuration for server not found"
STDERR.puts 'Configuration for server not found'
break
end
@ -95,7 +95,7 @@ order.each do |servers|
if !user_uid.nil? && user_uid.downcase != user.downcase
STDERR.puts "User \"#{user}\" and \"#{user_uid}\" "\
"differes (leading/trailing whitespace)"
'differes (leading/trailing whitespace)'
break
end
@ -110,7 +110,7 @@ order.each do |servers|
groups = ldap.get_groups
if groups.empty?
if !server_conf[:mapping_default]
STDERR.puts "User does not belong to a mapped group"
STDERR.puts 'User does not belong to a mapped group'
break
else
groups = [server_conf[:mapping_default]]
@ -126,7 +126,7 @@ order.each do |servers|
puts "ldap #{escaped_user} #{escaped_secret} #{group_list}"
exit
else
STDERR.puts "Bad user/password"
STDERR.puts 'Bad user/password'
break
end
end