Bugzilla – Attachment 57965 Details for
Bug 6979
LDAP authentication fails during password comparison
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6979 - Handle multiple branches in non-auth_by_bin
Bug-6979---Handle-multiple-branches-in-non-authbyb.patch (text/plain), 5.68 KB, created by
Alex Arnaud
on 2016-12-05 13:29:46 UTC
(
hide
)
Description:
Bug 6979 - Handle multiple branches in non-auth_by_bin
Filename:
MIME Type:
Creator:
Alex Arnaud
Created:
2016-12-05 13:29:46 UTC
Size:
5.68 KB
patch
obsolete
>From eb0e66a66ac23cb2385f9cd9df89f4067a061fb2 Mon Sep 17 00:00:00 2001 >From: Alex Arnaud <alex.arnaud@biblibre.com> >Date: Tue, 15 Nov 2016 10:02:05 +0000 >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 | 29 +++++++++++++++-------------- > 2 files changed, 34 insertions(+), 24 deletions(-) > >diff --git a/C4/Auth_with_ldap.pm b/C4/Auth_with_ldap.pm >index 9d907c4..85101ad 100644 >--- a/C4/Auth_with_ldap.pm >+++ b/C4/Auth_with_ldap.pm >@@ -106,10 +106,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; > } > >@@ -183,15 +183,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 671021e..6dc846e 100755 >--- a/t/db_dependent/Auth_with_ldap.t >+++ b/t/db_dependent/Auth_with_ldap.t >@@ -42,10 +42,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 >@@ -242,13 +242,15 @@ qr/LDAP bind failed as ldapuser cn=Manager,dc=metavore,dc=com: LDAP error #1: er > $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)' ); > >@@ -275,7 +277,7 @@ qr/LDAP bind failed as ldapuser cn=Manager,dc=metavore,dc=com: LDAP error #1: er > $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)' ); > >@@ -284,7 +286,7 @@ qr/LDAP Auth rejected : invalid password for user 'hola'. LDAP error #1: error_n > > subtest 'search_method tests' => sub { > >- plan tests => 5; >+ plan tests => 3; > > my $ldap = mock_net_ldap(); > >@@ -304,15 +306,6 @@ subtest 'search_method tests' => sub { > 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) >@@ -387,6 +380,8 @@ sub mock_net_ldap { > 'search', > sub { > >+ $remaining_entry = 1 >+ > return mock_net_ldap_search( > { > count => ($desired_count_result) >@@ -429,7 +424,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; > } >-- >2.7.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6979
:
5723
|
46646
|
46654
|
46659
|
46698
|
46863
|
57480
|
57481
|
57482
|
57483
|
57963
|
57964
|
57965
|
57966
|
61295
|
61296
|
61297
|
61298
|
61310
|
61311
|
61312
|
61313