From 6ec37fbe032c1d4901e66f47f743f4b46f8587be Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Fri, 15 Jan 2016 16:07:51 +0100 Subject: [PATCH] Bug 6979 - Handle multiple branches in non-auth_by_bin --- C4/Auth_with_ldap.pm | 29 +++++++++++++++++++---------- t/db_dependent/Auth_with_ldap.t | 28 +++++++++++++++------------- 2 files changed, 34 insertions(+), 23 deletions(-) diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm index 5458245..ccca71f 100644 --- a/C4/Auth_with_ldap.pm +++ b/C4/Auth_with_ldap.pm @@ -96,10 +96,10 @@ sub search_method { warn sprintf("LDAP Auth rejected : %s gets %d hits\n", $filter->as_string, $count) . description($search); return 0; } - if ($count != 1) { - warn sprintf("LDAP Auth rejected : %s gets %d hits\n", $filter->as_string, $count); - return 0; - } + if ($count == 0) { + warn sprintf("LDAP Auth rejected : search with filter '%s' returns no hit\n", $filter->as_string); + return 0; + } return $search; } @@ -173,15 +173,24 @@ sub checkpw_ldap { return 0; } my $search = search_method($db, $userid) or return 0; # warnings are in the sub - $userldapentry = $search->shift_entry; - my $dn = $userldapentry->dn; - my $user_ldap_bind_ret = $db->bind($dn, password => $password); - if ($user_ldap_bind_ret->code) { - warn "LDAP Auth rejected : invalid password for user '$userid'. " . description($user_ldap_bind_ret); + # Handle multiple branches. Same login exists several times in different branches. + my $bind_ok = 0; + while (my $entry = $search->shift_entry) { + my $user_ldap_bind_ret = $db->bind($entry->dn, password => $password); + unless ($user_ldap_bind_ret->code) { + $userldapentry = $entry; + $bind_ok = 1; + last; + } + } + + unless ($bind_ok) { + warn "LDAP Auth rejected : invalid password for user '$userid'."; return -1; } - } + + } # To get here, LDAP has accepted our user's login attempt. # But we still have work to do. See perldoc below for detailed breakdown. diff --git a/t/db_dependent/Auth_with_ldap.t b/t/db_dependent/Auth_with_ldap.t index eb0b932..50d0e9e 100755 --- a/t/db_dependent/Auth_with_ldap.t +++ b/t/db_dependent/Auth_with_ldap.t @@ -38,10 +38,10 @@ my $anonymous_bind = 1; my $desired_authentication_result = 'success'; my $desired_connection_result = 'error'; my $desired_admin_bind_result = 'error'; -my $desired_compare_result = 'error'; my $desired_search_result = 'error'; my $desired_count_result = 1; my $desired_bind_result = 'error'; +my $remaining_entry = 1; my $ret; # Mock the context module @@ -158,11 +158,13 @@ subtest "checkpw_ldap tests" => sub { $anonymous_bind = 1; $desired_admin_bind_result = 'success'; $desired_bind_result = 'error'; + $desired_search_result = 'success'; + $desired_count_result = 1; reload_ldap_module(); warning_like { $ret = C4::Auth_with_ldap::checkpw_ldap( $dbh, 'hola', password => 'hey' ) } - qr/LDAP Auth rejected : invalid password for user 'hola'. LDAP error #1: error_name/, + qr/LDAP Auth rejected : invalid password for user 'hola'./, "checkpw_ldap prints correct warning if LDAP bind fails"; is ( $ret, -1, "checkpw_ldap returns -1 if bind fails (Bug 8148)"); @@ -185,7 +187,7 @@ subtest "checkpw_ldap tests" => sub { warning_like { $ret = C4::Auth_with_ldap::checkpw_ldap( $dbh, 'hola', password => 'hey' ) } - qr/LDAP Auth rejected : invalid password for user 'hola'. LDAP error #1: error_name/, + qr/LDAP Auth rejected : invalid password for user 'hola'./, "checkpw_ldap prints correct warning if LDAP bind fails"; is ( $ret, -1, "checkpw_ldap returns -1 if bind fails (Bug 8148)"); @@ -194,7 +196,7 @@ subtest "checkpw_ldap tests" => sub { subtest "search_method tests" => sub { - plan tests => 5; + plan tests => 3; my $ldap = mock_net_ldap(); @@ -211,14 +213,6 @@ subtest "search_method tests" => sub { like( $@, qr/LDAP search failed to return object : 1/, "search_method prints correct warning when db->search returns error code"); - $desired_search_result = 'success'; - $desired_count_result = 2; - reload_ldap_module(); - warning_like { $ret = C4::Auth_with_ldap::search_method( $ldap, '123') } - qr/^LDAP Auth rejected \: \(uid\=123\) gets 2 hits/, - "search_method prints correct warning when hits count is not 1"; - is( $ret, 0, "search_method returns 0 when hits count is not 1" ); - }; # Function that mocks the call to C4::Context->config(param) @@ -279,6 +273,8 @@ sub mock_net_ldap { $mocked_ldap->mock( 'search', sub { + $remaining_entry = 1; + return mock_net_ldap_search( ( $desired_count_result ) # count ? $desired_count_result @@ -313,7 +309,13 @@ sub mock_net_ldap_search { $mocked_search->mock( 'error', sub { return $error; } ); $mocked_search->mock( 'error_name', sub { return $error_name; } ); $mocked_search->mock( 'error_text', sub { return $error_text; } ); - $mocked_search->mock( 'shift_entry', sub { return $shift_entry; } ); + $mocked_search->mock( 'shift_entry', sub { + if ($remaining_entry) { + $remaining_entry--; + return $shift_entry; + } + return ''; + }); return $mocked_search; } -- 1.7.10.4