Gitlab::AppLogger
end
- def ldap_auth(login, password)
- # Check user against LDAP backend if user is not authenticated
- # Only check with valid login and password to prevent anonymous bind results
- return nil unless ldap_conf.enabled && !login.blank? && !password.blank?
-
- ldap = OmniAuth::LDAP::Adaptor.new(ldap_conf)
- ldap_user = ldap.bind_as(
- filter: Net::LDAP::Filter.eq(ldap.uid, login),
- size: 1,
- password: password
- )
-
- User.find_by_extern_uid_and_provider(ldap_user.dn, 'ldap') if ldap_user
- end
-
def ldap_conf
@ldap_conf ||= Gitlab.config.ldap
end
+
+ def ldap_auth(login, password)
+ Gitlab::LDAP::User.auth(login, password)
+ end
end
end
+++ /dev/null
-require 'omniauth-ldap'
-
-module Grack
- module LDAP
- def ldap_auth(login, password)
- # Check user against LDAP backend if user is not authenticated
- # Only check with valid login and password to prevent anonymous bind results
- return nil unless ldap_conf.enabled && !login.blank? && !password.blank?
-
- ldap = OmniAuth::LDAP::Adaptor.new(ldap_conf)
- ldap_user = ldap.bind_as(
- filter: Net::LDAP::Filter.eq(ldap.uid, login),
- size: 1,
- password: password
- )
-
- User.find_by_extern_uid_and_provider(ldap_user.dn, 'ldap') if ldap_user
- end
-
- def ldap_conf
- @ldap_conf ||= Gitlab.config.ldap
- end
- end
-end
class << self
def find(uid, email)
# Look for user with ldap provider and same uid
- user = model.ldap.where(extern_uid: uid).last
+ user = find_by_uid(uid)
return user if user
# Look for user with same emails
user
end
+ def find_by_uid(uid)
+ model.ldap.where(extern_uid: uid).last
+ end
+
+ def auth(login, password)
+ # Check user against LDAP backend if user is not authenticated
+ # Only check with valid login and password to prevent anonymous bind results
+ return nil unless ldap_conf.enabled && login.present? && password.present?
+
+ ldap = OmniAuth::LDAP::Adaptor.new(ldap_conf)
+ ldap_user = ldap.bind_as(
+ filter: Net::LDAP::Filter.eq(ldap.uid, login),
+ size: 1,
+ password: password
+ )
+
+ find_by_uid(ldap_user.dn) if ldap_user
+ end
+
private
def uid(auth)
def model
::User
end
+
+ def ldap_conf
+ Gitlab.config.ldap
+ end
end
end
end