Skip to content

Commit 8ad1138

Browse files
committed
Remove MiqLdap
Fixes #20017
1 parent 73e4c63 commit 8ad1138

File tree

19 files changed

+2
-2112
lines changed

19 files changed

+2
-2112
lines changed

app/models/authenticator/base.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ def authenticate(username, password, request = nil, options = {})
122122

123123
def authorize(taskid, username, *args)
124124
audit = {:event => "authorize", :userid => username}
125-
decrypt_ldap_password(config) if MiqLdap.using_ldap?
126125

127126
run_task(taskid, "Authorizing") do |task|
128127
begin
@@ -213,9 +212,6 @@ def lookup_by_principalname(username)
213212
if username.include?('\\')
214213
parts = username.split('\\')
215214
username = "#{parts.last}@#{parts.first}"
216-
elsif !username.include?('@') && MiqLdap.using_ldap?
217-
suffix = config[:user_suffix]
218-
username = "#{username}@#{suffix}"
219215
end
220216
user = case_insensitive_find_by_userid(username)
221217
end
@@ -269,7 +265,6 @@ def encrypt_ldap_password(config)
269265
def authorize_queue(username, _request, _options, *args)
270266
task = MiqTask.create(:name => "#{self.class.proper_name} User Authorization of '#{username}'", :userid => username)
271267
if authorize_queue?
272-
encrypt_ldap_password(config) if MiqLdap.using_ldap?
273268
MiqQueue.submit_job(
274269
:class_name => self.class.to_s,
275270
:method_name => "authorize",

app/models/authenticator/ldap.rb

Lines changed: 0 additions & 162 deletions
This file was deleted.

app/models/miq_group.rb

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -156,20 +156,6 @@ def self.strip_group_domains(group_list)
156156
group_list.collect { |group| group.gsub(/@.*/, '') }
157157
end
158158

159-
def self.get_ldap_groups_by_user(user, bind_dn, bind_pwd)
160-
username = user.kind_of?(self) ? user.userid : user
161-
ldap = MiqLdap.new
162-
163-
unless ldap.bind(ldap.fqusername(bind_dn), bind_pwd)
164-
raise _("Bind failed for user %{user_name}") % {:user_name => bind_dn}
165-
end
166-
167-
user_obj = ldap.get_user_object(ldap.normalize(ldap.fqusername(username)))
168-
raise _("Unable to find user %{user_name} in directory") % {:user_name => username} if user_obj.nil?
169-
170-
ldap.get_memberships(user_obj, ::Settings.authentication.group_memberships_max_depth)
171-
end
172-
173159
def self.get_httpd_groups_by_user(user)
174160
if MiqEnvironment::Command.is_podified?
175161
get_httpd_groups_by_user_via_dbus_api_service(user)

app/models/miq_request_workflow.rb

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -514,22 +514,6 @@ def show_fields(display_flag, field_names, display_field = :display)
514514
end
515515
end
516516

517-
def retrieve_ldap(_options = {})
518-
email = get_value(@values[:owner_email])
519-
if email.present?
520-
l = MiqLdap.new
521-
if l.bind_with_default == true
522-
raise _("No information returned for %{email}") % {:email => email} if (d = l.get_user_info(email, "mail")).nil?
523-
524-
[:first_name, :last_name, :address, :city, :state, :zip, :country, :title, :company,
525-
:department, :office, :phone, :phone_mobile, :manager, :manager_mail, :manager_phone].each do |prop|
526-
@values["owner_#{prop}".to_sym] = d[prop].try(:dup)
527-
end
528-
@values[:sysprep_organization] = d[:company].try(:dup)
529-
end
530-
end
531-
end
532-
533517
def default_schedule_time(options = {})
534518
# TODO: Added support for "default_from", like values_from, that gets called once after dialog creation
535519
# Update VM description
@@ -759,11 +743,9 @@ def set_default_user_info
759743

760744
if get_value(@values[:owner_email]).blank? && @requester.email.present?
761745
@values[:owner_email] = @requester.email
762-
retrieve_ldap if MiqLdap.using_ldap?
763746
end
764747

765-
show_flag = MiqLdap.using_ldap? ? :show : :hide
766-
show_fields(show_flag, [:owner_load_ldap])
748+
show_fields(:hide, [:owner_load_ldap])
767749
end
768750

769751
def set_request_values(values)
@@ -1465,16 +1447,6 @@ def ws_requester_fields(values, fields)
14651447
values[:auto_approve] = data.delete(:auto_approve) == 'true'
14661448
data.delete(:user_name)
14671449

1468-
# get owner values from LDAP if configured
1469-
if data[:owner_email].present? && MiqLdap.using_ldap?
1470-
email = data[:owner_email]
1471-
unless email.include?('@')
1472-
email = "#{email}@#{::Settings.authentication.user_suffix}"
1473-
end
1474-
values[:owner_email] = email
1475-
retrieve_ldap rescue nil
1476-
end
1477-
14781450
dlg_keys = dlg_fields.keys
14791451
data.keys.each do |key|
14801452
if dlg_keys.include?(key)

0 commit comments

Comments
 (0)