Refactorn oauth & ldap
This commit is contained in:
parent
fa4150d47d
commit
048d47e626
4 changed files with 176 additions and 55 deletions
66
lib/gitlab/auth.rb
Normal file
66
lib/gitlab/auth.rb
Normal file
|
@ -0,0 +1,66 @@
|
|||
module Gitlab
|
||||
class Auth
|
||||
def find_for_ldap_auth(auth, signed_in_resource = nil)
|
||||
uid = auth.info.uid
|
||||
provider = auth.provider
|
||||
email = auth.info.email.downcase unless auth.info.email.nil?
|
||||
raise OmniAuth::Error, "LDAP accounts must provide an uid and email address" if uid.nil? or email.nil?
|
||||
|
||||
if @user = User.find_by_extern_uid_and_provider(uid, provider)
|
||||
@user
|
||||
elsif @user = User.find_by_email(email)
|
||||
log.info "Updating legacy LDAP user #{email} with extern_uid => #{uid}"
|
||||
@user.update_attributes(:extern_uid => uid, :provider => provider)
|
||||
@user
|
||||
else
|
||||
create_from_omniauth(auth, true)
|
||||
end
|
||||
end
|
||||
|
||||
def create_from_omniauth auth, ldap = false
|
||||
provider = auth.provider
|
||||
uid = auth.info.uid || auth.uid
|
||||
name = auth.info.name.force_encoding("utf-8")
|
||||
email = auth.info.email.downcase unless auth.info.email.nil?
|
||||
|
||||
ldap_prefix = ldap ? '(LDAP) ' : ''
|
||||
raise OmniAuth::Error, "#{ldap_prefix}#{provider} does not provide an email"\
|
||||
" address" if auth.info.email.blank?
|
||||
|
||||
log.info "#{ldap_prefix}Creating user from #{provider} login"\
|
||||
" {uid => #{uid}, name => #{name}, email => #{email}}"
|
||||
password = Devise.friendly_token[0, 8].downcase
|
||||
@user = User.new(
|
||||
extern_uid: uid,
|
||||
provider: provider,
|
||||
name: name,
|
||||
email: email,
|
||||
password: password,
|
||||
password_confirmation: password,
|
||||
projects_limit: Gitlab.config.default_projects_limit,
|
||||
)
|
||||
if Gitlab.config.omniauth.block_auto_created_users && !ldap
|
||||
@user.blocked = true
|
||||
end
|
||||
@user.save!
|
||||
@user
|
||||
end
|
||||
|
||||
def find_or_new_for_omniauth(auth)
|
||||
provider, uid = auth.provider, auth.uid
|
||||
|
||||
if @user = User.find_by_provider_and_extern_uid(provider, uid)
|
||||
@user
|
||||
else
|
||||
if Gitlab.config.omniauth.allow_single_sign_on
|
||||
@user = create_from_omniauth(auth)
|
||||
@user
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def log
|
||||
Gitlab::AppLogger
|
||||
end
|
||||
end
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue