F #4924: LDAP auth - capture user part (#74)

This commit is contained in:
Jan Orel authored and GitHub committed 2020-07-06 11:19:47 +02:00
1 parent 20719b6c86
commit c33a610bec
3 files changed
+17 -7

No files matched your search

+3 -2
View File
@@ -63,7 +63,8 @@ end
options=YAML.load(File.read(ETC_LOCATION+'/auth/ldap_auth.conf'))
order = get_server_order(options, user)
user_full = user
order,user = get_server_order(options, user)
STDERR.puts "Using group of servers: #{servers.join(', ')}" if order.length>1
@@ -119,7 +120,7 @@ order.each do |servers|
# authentication success
group_list = groups.join(' ')
escaped_user = URI_PARSER.escape(user).downcase
escaped_user = URI_PARSER.escape(user_full).downcase
escaped_secret = URI_PARSER.escape(user_dn)
puts "ldap #{escaped_user} #{escaped_secret} #{group_list}"
+8 -3
View File
@@ -129,9 +129,14 @@ server 2:
# Example:
#
# :match_user_regex:
# "^.*@orgA$": server1
# "^.*@orgB$": server2
# "^.*@orgC$": ['server3', 'server4']
# "^(.*)@orgA$": server1
# "^(.*)@orgB$": server2
# "^(.*)@orgC$": ['server3', 'server4']
#
# In this example user `joe@orgA` will be searched in server1 and user
# `paul@orgC` will be searched in server3 (and server4 if not found)
#
# If the regex contains capture group like here, only this part of the
# username is searched in the LDAP actually. So the user entry only
# have attribute like `cn: paul`. The suffix is only used to identify
# the server.
+6 -2
View File
@@ -267,7 +267,11 @@ def get_server_order(opts, user)
end
opts[:match_user_regex].each do |regex, server|
if user =~ /#{regex}/i
if m = user.match(/#{regex}/i)
# update user with the capture
user = m[1] if m[1]
order << to_array(server)
end
end
@@ -281,5 +285,5 @@ def get_server_order(opts, user)
exit(-1)
end
return order
return [order, user]
end