Account for inappropriate LDAP Auth

Needed for blank passwords. [#103 state:resolved]
bricoleurs · Nov 13, 2009 · 642add9 · 642add9
1 parent bbf81d3
commit 642add9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib/Bric/Util/AuthLDAP.pm b/lib/Bric/Util/AuthLDAP.pm
@@ -37,7 +37,7 @@ use strict;
 # Programmatic Dependencies
 use Bric::Config qw(:ldap);
 use Bric::Util::Fault qw(throw_auth);
-use Net::LDAP qw(LDAP_INVALID_CREDENTIALS LDAP_SUCCESS);
+use Net::LDAP qw(LDAP_INVALID_CREDENTIALS LDAP_SUCCESS LDAP_INAPPROPRIATE_AUTH);
 use Net::LDAP::Util qw(ldap_error_desc);
 use Net::LDAP::Filter;
 
@@ -82,8 +82,11 @@ sub authenticate {
         version => LDAP_VERSION,
         onerror => sub {
             my $mesg = shift;
+            my $code = $mesg->code;
             # Invalid credentials are okay.
-            return $mesg if $mesg->code == LDAP_INVALID_CREDENTIALS;
+            return $mesg if grep { $_ == $code }
+                LDAP_INVALID_CREDENTIALS,
+                LDAP_INAPPROPRIATE_AUTH;
             throw_auth "LDAP Error: " . ldap_error_desc($mesg);
         }
     ) or throw_auth error => "Unable to connect to LDAP Server", payload => $@;

diff --git a/t/Bric/Util/AuthEngines/Test.pm b/t/Bric/Util/AuthEngines/Test.pm
@@ -124,6 +124,7 @@ BEGIN {
         my $caller = caller or return;
         no strict 'refs';
         *{"${caller}::LDAP_INVALID_CREDENTIALS"} = sub () { 49 };
+        *{"${caller}::LDAP_INAPPROPRIATE_AUTH"} = sub () { 48 };
         *{"${caller}::LDAP_SUCCESS"} = sub () { 0 };
     }
     my $ldap = bless {};