[Catalyst-commits] r9975 - in
Catalyst-Authentication-Store-LDAP/trunk: .
lib/Catalyst/Authentication/Store
lib/Catalyst/Authentication/Store/LDAP t
karpet at dev.catalyst.perl.org
karpet at dev.catalyst.perl.org
Fri May 1 02:33:44 GMT 2009
Author: karpet
Date: 2009-05-01 03:33:43 +0100 (Fri, 01 May 2009)
New Revision: 9975
Modified:
Catalyst-Authentication-Store-LDAP/trunk/Changes
Catalyst-Authentication-Store-LDAP/trunk/Makefile.PL
Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP.pm
Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm
Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/User.pm
Catalyst-Authentication-Store-LDAP/trunk/t/10-roles-mock.t
Log:
release 0.1005
Modified: Catalyst-Authentication-Store-LDAP/trunk/Changes
===================================================================
--- Catalyst-Authentication-Store-LDAP/trunk/Changes 2009-04-30 20:49:23 UTC (rev 9974)
+++ Catalyst-Authentication-Store-LDAP/trunk/Changes 2009-05-01 02:33:43 UTC (rev 9975)
@@ -1,3 +1,7 @@
+0.1005 30 April 2009
+ - Stop throwing an exception when the lookup_user method fails
+ to find a user and instead return undef. (t0m)
+ - Add tests for above (t0m)
- Change documentation which still refers to the old ::Plugin:: style
auth system to use ->authenticate instead of ->login, and not say that
you need to do things manually to have multiple stores. (t0m)
Modified: Catalyst-Authentication-Store-LDAP/trunk/Makefile.PL
===================================================================
--- Catalyst-Authentication-Store-LDAP/trunk/Makefile.PL 2009-04-30 20:49:23 UTC (rev 9974)
+++ Catalyst-Authentication-Store-LDAP/trunk/Makefile.PL 2009-05-01 02:33:43 UTC (rev 9975)
@@ -13,6 +13,7 @@
build_requires('Net::LDAP::Server::Test' => '0.07');
build_requires('Test::More');
build_requires('Test::MockObject');
+build_required('Test::Exception');
auto_install();
Modified: Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm
===================================================================
--- Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm 2009-04-30 20:49:23 UTC (rev 9974)
+++ Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm 2009-05-01 02:33:43 UTC (rev 9975)
@@ -72,7 +72,7 @@
use strict;
use warnings;
-our $VERSION = '0.1004';
+our $VERSION = '0.1005';
use Catalyst::Authentication::Store::LDAP::User;
use Net::LDAP;
@@ -255,11 +255,12 @@
A) Bind to the directory using the configured binddn and bindpw
B) Perform a search for the User Object in the directory, using
user_basedn, user_filter, and user_scope.
- C) Assuming we found the object, we will walk it's attributes
+ C) Assuming we found the object, we will walk it's attributes
using L<Net::LDAP::Entry>'s get_value method. We store the
- results in a hashref.
- D) Return a hashref that looks like:
-
+ results in a hashref. If we do not find the object, then
+ undef is returned.
+ D) Return a hashref that looks like:
+
$results = {
'ldap_entry' => $entry, # The Net::LDAP::Entry object
'attributes' => $attributes,
@@ -292,10 +293,9 @@
push( @searchopts, %{ $self->user_search_options } );
}
my $usersearch = $ldap->search(@searchopts);
- if ( $usersearch->is_error ) {
- Catalyst::Exception->throw(
- "LDAP Error while searching for user: " . $usersearch->error );
- }
+
+ return if ( $usersearch->is_error );
+
my $userentry;
my $user_field = $self->user_field;
my $results_filter = $self->user_results_filter;
Modified: Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/User.pm
===================================================================
--- Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/User.pm 2009-04-30 20:49:23 UTC (rev 9974)
+++ Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/User.pm 2009-05-01 02:33:43 UTC (rev 9975)
@@ -49,7 +49,7 @@
use strict;
use warnings;
-our $VERSION = '0.1004';
+our $VERSION = '0.1005';
BEGIN { __PACKAGE__->mk_accessors(qw/user store/) }
Modified: Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP.pm
===================================================================
--- Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP.pm 2009-04-30 20:49:23 UTC (rev 9974)
+++ Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP.pm 2009-05-01 02:33:43 UTC (rev 9975)
@@ -3,7 +3,7 @@
use strict;
use warnings;
-our $VERSION = '0.1004';
+our $VERSION = '0.1005';
use Catalyst::Authentication::Store::LDAP::Backend;
Modified: Catalyst-Authentication-Store-LDAP/trunk/t/10-roles-mock.t
===================================================================
--- Catalyst-Authentication-Store-LDAP/trunk/t/10-roles-mock.t 2009-04-30 20:49:23 UTC (rev 9974)
+++ Catalyst-Authentication-Store-LDAP/trunk/t/10-roles-mock.t 2009-05-01 02:33:43 UTC (rev 9975)
@@ -4,8 +4,9 @@
use warnings;
use Catalyst::Exception;
-use Test::More tests => 7;
+use Test::More tests => 11;
use Test::MockObject::Extends;
+use Test::Exception;
use Net::LDAP::Entry;
use lib 't/lib';
@@ -13,7 +14,7 @@
eval "use Catalyst::Model::LDAP";
if ($@) {
- skip "Catalyst::Model::LDAP not installed", 7;
+ skip "Catalyst::Model::LDAP not installed", 11;
}
use_ok("Catalyst::Authentication::Store::LDAP::Backend");
@@ -46,7 +47,8 @@
$ldap->mock('unbind' => sub {});
$ldap->mock('disconnect' => sub {});
my $search_res = Test::MockObject->new();
- $search_res->mock(is_error => sub {}); # Never an error
+ my $search_is_error = 0;
+ $search_res->mock(is_error => sub { $search_is_error });
$search_res->mock(entries => sub {
return map
{ my $id = $_;
@@ -73,12 +75,21 @@
is_deeply( [sort $user->roles],
[sort qw/quuxone quuxtwo/],
"User has the expected set of roles" );
+
+ $search_is_error = 1;
+ lives_ok {
+ ok !$back->find_user( { username => 'doesnotexist' } ),
+ 'Nonexistent user returns undef';
+ } 'No exception thrown for nonexistent user';
+
}
is_deeply(\@searches, [
['base', 'ou=foobar', 'filter', '(&(objectClass=inetOrgPerson)(uid=somebody))', 'scope', 'one'],
['base', 'ou=roles', 'filter', '(&(objectClass=posixGroup)(memberUid=test))', 'scope', 'one', 'attrs', [ 'userinrole' ]],
+ ['base', 'ou=foobar', 'filter', '(&(objectClass=inetOrgPerson)(uid=doesnotexist))', 'scope', 'one'],
['base', 'ou=foobar', 'filter', '(&(objectClass=inetOrgPerson)(uid=somebody))', 'scope', 'one'],
['base', 'ou=roles', 'filter', '(&(objectClass=posixGroup)(memberUid=test))', 'scope', 'one', 'attrs', [ 'userinrole' ]],
+ ['base', 'ou=foobar', 'filter', '(&(objectClass=inetOrgPerson)(uid=doesnotexist))', 'scope', 'one'],
], 'User searches as expected');
is_deeply(\@binds, [
[ undef ], # First user search
@@ -90,12 +101,14 @@
[
undef
], # Rebind with initial credentials to find roles
+ [ undef ], # Second user search
# 2nd pass round main loop
[ undef ], # First user search
[
'ou=foobar',
'password',
'password'
- ] # Rebind to confirm user _and_ lookup roles;
+ ], # Rebind to confirm user _and_ lookup roles;
+ [ undef ], # Second user search
], 'Binds as expected');
}
More information about the Catalyst-commits
mailing list