a2d244ec06
If a user fails to provide a username or password to the LDAP login
form then a 500 error is returned due to an exception being raised
in omniauth-ldap. This gem has been amended to use the omniauth
error propagation function (fail!) to pass this exception message to
the registered omniauth failure handler so that the Rails application
can handle it approriately.
The failure function now knows about standard exceptions and no longer
requires a specific check for the OmniAuth::Error exception added by
commit f322975.
This resolves issue #1077.
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
23 lines
799 B
Ruby
23 lines
799 B
Ruby
class OmniauthCallbacksController < Devise::OmniauthCallbacksController
|
|
|
|
# Extend the standard message generation to accept our custom exception
|
|
def failure_message
|
|
exception = env["omniauth.error"]
|
|
error = exception.error_reason if exception.respond_to?(:error_reason)
|
|
error ||= exception.error if exception.respond_to?(:error)
|
|
error ||= exception.message if exception.respond_to?(:message)
|
|
error ||= env["omniauth.error.type"].to_s
|
|
error.to_s.humanize if error
|
|
end
|
|
|
|
def ldap
|
|
# We only find ourselves here if the authentication to LDAP was successful.
|
|
info = request.env["omniauth.auth"]["info"]
|
|
@user = User.find_for_ldap_auth(info)
|
|
if @user.persisted?
|
|
@user.remember_me = true
|
|
end
|
|
sign_in_and_redirect @user
|
|
end
|
|
|
|
end
|