mirror of
https://github.com/OpenNebula/one.git
synced 2025-01-21 18:03:38 +03:00
parent
311ca1d9da
commit
70c7d5536e
@ -126,7 +126,7 @@ order.each do |name|
|
|||||||
|
|
||||||
# authentication success
|
# authentication success
|
||||||
group_list = groups.join(' ')
|
group_list = groups.join(' ')
|
||||||
escaped_user = URI_PARSER.escape(user)
|
escaped_user = URI_PARSER.escape(user).strip.downcase
|
||||||
escaped_secret = URI_PARSER.escape(user_name)
|
escaped_secret = URI_PARSER.escape(user_name)
|
||||||
|
|
||||||
puts "ldap #{escaped_user} #{escaped_secret} #{group_list}"
|
puts "ldap #{escaped_user} #{escaped_secret} #{group_list}"
|
||||||
|
@ -10,10 +10,12 @@ module OneDBFsck
|
|||||||
|
|
||||||
@fixes_user = users_fix = {}
|
@fixes_user = users_fix = {}
|
||||||
|
|
||||||
@db.fetch("SELECT oid,body,gid FROM user_pool") do |row|
|
name_seen = {}
|
||||||
|
@db.fetch("SELECT oid,body,gid,name FROM user_pool") do |row|
|
||||||
doc = Nokogiri::XML(row[:body],nil,NOKOGIRI_ENCODING){|c| c.default_xml.noblanks}
|
doc = Nokogiri::XML(row[:body],nil,NOKOGIRI_ENCODING){|c| c.default_xml.noblanks}
|
||||||
|
|
||||||
gid = doc.root.at_xpath('GID').text.to_i
|
gid = doc.root.at_xpath('GID').text.to_i
|
||||||
|
auth_driver = doc.root.at_xpath('AUTH_DRIVER').text
|
||||||
user_gid = gid
|
user_gid = gid
|
||||||
user_gids = Set.new
|
user_gids = Set.new
|
||||||
|
|
||||||
@ -76,6 +78,18 @@ module OneDBFsck
|
|||||||
|
|
||||||
users_fix[row[:oid]] = {:body => doc.root.to_s, :gid => user_gid}
|
users_fix[row[:oid]] = {:body => doc.root.to_s, :gid => user_gid}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
if auth_driver == 'ldap'
|
||||||
|
if ! name_seen[row[:name].downcase]
|
||||||
|
name_seen[row[:name].downcase] = [row[:oid] , row[:name]]
|
||||||
|
else
|
||||||
|
log_error(
|
||||||
|
"User id:#{row[:oid]} has conficting name #{row[:name]}, "<<
|
||||||
|
"another user id:#{name_seen[row[:name].downcase][0]} "<<
|
||||||
|
"with name #{name_seen[row[:name].downcase][1] } is present",
|
||||||
|
repaired=false)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user