From: Gervase Markham <gerv@gerv.net>
Date: Fri, 18 Nov 2011 10:15:43 +0000 (+0000)
Subject: Make Login/Stack.pm refuse to continue down the stack if an Auth method returns an... 
X-Git-Tag: bugzilla-4.2rc1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31009dd4d8c9f1462d3026e04095c8befc307fd2;p=thirdparty%2Fbugzilla.git

Make Login/Stack.pm refuse to continue down the stack if an Auth method returns an explicit failure. r=dkl, a=mkanat.

https://bugzilla.mozilla.org/show_bug.cgi?id=698423
---

diff --git a/Bugzilla/Auth/Login/Stack.pm b/Bugzilla/Auth/Login/Stack.pm
index 0f3661954a..e8d9c46350 100644
--- a/Bugzilla/Auth/Login/Stack.pm
+++ b/Bugzilla/Auth/Login/Stack.pm
@@ -28,6 +28,7 @@ use fields qw(
 );
 use Hash::Util qw(lock_keys);
 use Bugzilla::Hook;
+use Bugzilla::Constants;
 use List::MoreUtils qw(any);
 
 sub new {
@@ -60,8 +61,13 @@ sub get_login_info {
         }
         $result = $object->get_login_info(@_);
         $self->{successful} = $object;
-        last if !$result->{failure};
-        # So that if none of them succeed, it's undef.
+        
+        # We only carry on down the stack if this method denied all knowledge.
+        last unless ($result->{failure}
+                    && ($result->{failure} eq AUTH_NODATA 
+                       || $result->{failure} eq AUTH_NO_SUCH_USER));
+        
+        # If none of the methods succeed, it's undef.
         $self->{successful} = undef;
     }
     return $result;