Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

Improve handling of misconfigured LDAP accounts.

Gitlab requires an email address for all user accounts as this is the
default account id and is used for sending notifications. LDAP accounts
may be missing email fields so handle this by showing a sensible error
message before redirecting to the login screen again.

Resolves github issue #899

Signed-off-by: Pat Thoyts <>
  • Loading branch information...
1 parent 2a705c4 commit f322975c506966e080e58dd3eb0c38b22183415a @patthoyts patthoyts committed
13 app/controllers/omniauth_callbacks_controller.rb
@@ -1,4 +1,17 @@
class OmniauthCallbacksController < Devise::OmniauthCallbacksController
+ # Extend the standard message generation to accept our custom exception
+ def failure_message
+ exception = env["omniauth.error"]
+ if exception.class == OmniAuth::Error
+ error = exception.message
+ else
+ error = exception.error_reason if exception.respond_to?(:error_reason)
+ error ||= exception.error if exception.respond_to?(:error)
+ error ||= env["omniauth.error.type"].to_s
+ end
+ error.to_s.humanize if error
+ end
def ldap
# We only find ourselves here if the authentication to LDAP was successful.
3  app/models/user.rb
@@ -80,7 +80,8 @@ def self.without_projects
def self.find_for_ldap_auth(omniauth_info)
name ="utf-8")
- email =
+ email = unless
+ raise OmniAuth::Error, "LDAP accounts must provide an email address" if email.nil?
if @user = User.find_by_email(email)

0 comments on commit f322975

Please sign in to comment.
Something went wrong with that request. Please try again.