Download as
Browse Code »

Commit a2d244ec062f3348f6cd1c5218c6097402c5f562

Authored by Pat Thoyts
1 parent 9267cb04
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Handle LDAP missing credentials error with a flash message. 

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>
Showing 3 changed files with 7 additions and 10 deletions   Show diff stats
@@ -13,7 +13,7 @@ gem &quot;devise&quot;, &quot;~&gt; 2.1.0&quot; @@ -13,7 +13,7 @@ gem &quot;devise&quot;, &quot;~&gt; 2.1.0&quot;
13 gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837" 13 gem "grit", :git => "https://github.com/gitlabhq/grit.git", :ref => "7f35cb98ff17d534a07e3ce6ec3d580f67402837"
14 gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0" 14 gem "gitolite", :git => "https://github.com/gitlabhq/gitolite-client.git", :ref => "9b715ca8bab6529f6c92204a25f84d12f25a6eb0"
15 gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188" 15 gem "pygments.rb", :git => "https://github.com/gitlabhq/pygments.rb.git", :ref => "2cada028da5054616634a1d9ca6941b65b3ce188"
16 -gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "7edf27d0281e09561838122982c16b7e62181f44" 16 +gem "omniauth-ldap", :git => "https://github.com/gitlabhq/omniauth-ldap.git", :ref => "f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e"
17 gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git" 17 gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
18 gem 'grack', :git => "https://github.com/gitlabhq/grack.git" 18 gem 'grack', :git => "https://github.com/gitlabhq/grack.git"
19 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git" 19 gem "linguist", "~> 1.0.0", :git => "https://github.com/gitlabhq/linguist.git"
@@ -42,8 +42,8 @@ GIT @@ -42,8 +42,8 @@ GIT
42 42
43 GIT 43 GIT
44 remote: https://github.com/gitlabhq/omniauth-ldap.git 44 remote: https://github.com/gitlabhq/omniauth-ldap.git
45 - revision: 7edf27d0281e09561838122982c16b7e62181f44  
46 - ref: 7edf27d0281e09561838122982c16b7e62181f44 45 + revision: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
  46 + ref: f038dd852d7bd473a557e385d5d7c2fd5dc1dc2e
47 specs: 47 specs:
48 omniauth-ldap (1.0.2) 48 omniauth-ldap (1.0.2)
49 net-ldap (~> 0.2.2) 49 net-ldap (~> 0.2.2)
app/controllers/omniauth_callbacks_controller.rb
  Diff comments   View file @a2d244e
@@ -3,13 +3,10 @@ class OmniauthCallbacksController &lt; Devise::OmniauthCallbacksController @@ -3,13 +3,10 @@ class OmniauthCallbacksController &lt; Devise::OmniauthCallbacksController
3 # Extend the standard message generation to accept our custom exception 3 # Extend the standard message generation to accept our custom exception
4 def failure_message 4 def failure_message
5 exception = env["omniauth.error"] 5 exception = env["omniauth.error"]
6 - if exception.class == OmniAuth::Error  
7 - error = exception.message  
8 - else  
9 - error = exception.error_reason if exception.respond_to?(:error_reason)  
10 - error ||= exception.error if exception.respond_to?(:error)  
11 - error ||= env["omniauth.error.type"].to_s  
12 - end 6 + error = exception.error_reason if exception.respond_to?(:error_reason)
  7 + error ||= exception.error if exception.respond_to?(:error)
  8 + error ||= exception.message if exception.respond_to?(:message)
  9 + error ||= env["omniauth.error.type"].to_s
13 error.to_s.humanize if error 10 error.to_s.humanize if error
14 end 11 end
15 12