deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1100 from patthoyts/pt/ldap-no-email

Browse source 
Improve handling of misconfigured LDAP accounts.
This commit is contained in:
Valeriy Sizov 2012-07-18 05:17:14 -07:00
commit 3ac840ff06
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/models/user.rb
View file

@ -80,7 +80,8 @@ class User < ActiveRecord::Base
def self.find_for_ldap_auth(omniauth_info)
name = omniauth_info.name.force_encoding("utf-8")
email = omniauth_info.email.downcase
email = omniauth_info.email.downcase unless omniauth_info.email.nil?
raise OmniAuth::Error, "LDAP accounts must provide an email address" if email.nil?
if @user = User.find_by_email(email)
@user