use Test::More tests => 4;
use Test::MockModule;
use Test::MockObject;
+use t::lib::Mocks;
use t::lib::TestBuilder;
use Test::Warn;
use Koha::Patrons;
-my $dbh = '';
-
# Start transaction
-my $database = Koha::Database->new();
-my $schema = $database->schema();
+my $schema = Koha::Database->new->schema;
$schema->storage->txn_begin();
my $builder = t::lib::TestBuilder->new();
my $replicate = 0;
my $auth_by_bind = 1;
my $anonymous_bind = 1;
+my $user = 'cn=Manager,dc=metavore,dc=com';
+my $pass = 'metavore';
# Variables controlling LDAP behaviour
my $desired_authentication_result = 'success';
my $desired_connection_result = 'error';
-my $desired_bind_result = 'error';
-my $desired_compare_result = 'error';
+my $desired_admin_bind_result = 'error';
my $desired_search_result = 'error';
my $desired_count_result = 1;
-my $non_anonymous_bind_result = 'error';
+my $desired_bind_result = 'error';
+my $remaining_entry = 1;
my $ret;
# Mock the context module
}
);
+my $patron = Koha::Patrons->find($borrower->{borrowernumber});
+
# C4::Auth_with_ldap needs several stuff set first ^^^
-use_ok('C4::Auth_with_ldap');
+use_ok('C4::Auth_with_ldap', qw( checkpw_ldap ));
can_ok(
'C4::Auth_with_ldap', qw/
checkpw_ldap
plan tests => 4;
- my $dbh = C4::Context->dbh;
## Connection fail tests
$desired_connection_result = 'error';
warning_is {
$ret =
- C4::Auth_with_ldap::checkpw_ldap( $dbh, 'hola', password => 'hey' );
+ C4::Auth_with_ldap::checkpw_ldap( 'hola', password => 'hey' );
}
'LDAP connexion failed',
'checkpw_ldap prints correct warning if LDAP conexion fails';
subtest 'auth_by_bind = 1 tests' => sub {
- plan tests => 9;
+ plan tests => 11;
$auth_by_bind = 1;
$desired_authentication_result = 'success';
$anonymous_bind = 1;
- $desired_bind_result = 'error';
+ $desired_admin_bind_result = 'error';
$desired_search_result = 'error';
reload_ldap_module();
warning_like {
- $ret = C4::Auth_with_ldap::checkpw_ldap( $dbh, 'hola',
+ $ret = C4::Auth_with_ldap::checkpw_ldap( 'hola',
password => 'hey' );
}
qr/Anonymous LDAP bind failed: LDAP error #1: error_name/,
'checkpw_ldap prints correct warning if LDAP anonymous bind fails';
is( $ret, 0, 'checkpw_ldap returns 0 if LDAP anonymous bind fails' );
+ $anonymous_bind = 0;
+ $user = undef;
+ $pass = undef;
+ reload_ldap_module();
+
+ warning_like {
+ $ret = C4::Auth_with_ldap::checkpw_ldap( 'hola',
+ password => 'hey' );
+ }
+ qr/LDAP bind failed as kohauser hola: LDAP error #1: error_name/,
+ 'checkpw_ldap prints correct warning if LDAP bind_by_auth fails';
+ is( $ret, 0, 'checkpw_ldap returns 0 if LDAP bind_by_auth fails' );
+
$desired_authentication_result = 'success';
$anonymous_bind = 1;
- $desired_bind_result = 'success';
+ $desired_admin_bind_result = 'success';
$desired_search_result = 'success';
$desired_count_result = 1;
- $non_anonymous_bind_result = 'success';
+ $desired_bind_result = 'success';
$update = 1;
reload_ldap_module();
+ t::lib::Mocks::mock_preference( 'ExtendedPatronAttributes', 1 );
my $auth = Test::MockModule->new('C4::Auth_with_ldap');
$auth->mock(
'update_local',
}
);
- C4::Auth_with_ldap::checkpw_ldap( $dbh, 'hola', password => 'hey' );
+ C4::Auth_with_ldap::checkpw_ldap( 'hola', password => 'hey' );
ok(
- @{
- C4::Members::Attributes::GetBorrowerAttributes(
- $borrower->{borrowernumber}
- )
- },
+ Koha::Patrons->find($borrower->{borrowernumber})->extended_attributes->count,
'Extended attributes are not deleted'
);
- is( C4::Members::Attributes::GetBorrowerAttributeValue($borrower->{borrowernumber}, $attr_type2->{code}), 'BAR', 'Mapped attribute is BAR' );
+ is( $patron->get_extended_attribute( $attr_type2->{code} )->attribute, 'BAR', 'Mapped attribute is BAR' );
$auth->unmock('update_local');
$auth->unmock('ldap_entry_2_hash');
$update = 0;
$desired_count_result = 0; # user auth problem
- Koha::Patrons->find( $borrower->{borrowernumber} )->delete;
+ $patron->delete;
reload_ldap_module();
is(
- C4::Auth_with_ldap::checkpw_ldap( $dbh, 'hola', password => 'hey' ),
+ C4::Auth_with_ldap::checkpw_ldap( 'hola', password => 'hey' ),
0,
'checkpw_ldap returns 0 if user lookup returns 0'
);
- $non_anonymous_bind_result = 'error';
+ $desired_bind_result = 'error';
reload_ldap_module();
warning_like {
- $ret = C4::Auth_with_ldap::checkpw_ldap( $dbh, 'hola',
+ $ret = C4::Auth_with_ldap::checkpw_ldap( 'hola',
password => 'hey' );
}
qr/LDAP bind failed as kohauser hola: LDAP error #1: error_name/,
# regression tests for bug 12831
$desired_authentication_result = 'error';
$anonymous_bind = 0;
- $desired_bind_result = 'error';
+ $desired_admin_bind_result = 'error';
$desired_search_result = 'success';
$desired_count_result = 0; # user auth problem
- $non_anonymous_bind_result = 'error';
+ $desired_bind_result = 'error';
reload_ldap_module();
warning_like {
- $ret = C4::Auth_with_ldap::checkpw_ldap( $dbh, 'hola',
+ $ret = C4::Auth_with_ldap::checkpw_ldap( 'hola',
password => 'hey' );
}
qr/LDAP bind failed as kohauser hola: LDAP error #1: error_name/,
# Anonymous bind
$anonymous_bind = 1;
+ $user = 'cn=Manager,dc=metavore,dc=com';
+ $pass = 'metavore';
+ $desired_admin_bind_result = 'error';
$desired_bind_result = 'error';
- $non_anonymous_bind_result = 'error';
reload_ldap_module();
warning_like {
- $ret = C4::Auth_with_ldap::checkpw_ldap( $dbh, 'hola',
+ $ret = C4::Auth_with_ldap::checkpw_ldap( 'hola',
password => 'hey' );
}
qr/LDAP bind failed as ldapuser cn=Manager,dc=metavore,dc=com: LDAP error #1: error_name/,
is( $ret, 0, 'checkpw_ldap returns 0 if bind fails' );
$anonymous_bind = 1;
- $desired_bind_result = 'success';
- $non_anonymous_bind_result = 'success';
- $desired_compare_result = 'error';
+ $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',
+ $ret = C4::Auth_with_ldap::checkpw_ldap( '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)' );
# Non-anonymous bind
$anonymous_bind = 0;
- $desired_bind_result = 'success';
- $non_anonymous_bind_result = 'error';
- $desired_compare_result = 'dont care';
+ $desired_admin_bind_result = 'error';
+ $desired_bind_result = 'error';
reload_ldap_module();
warning_like {
- $ret = C4::Auth_with_ldap::checkpw_ldap( $dbh, 'hola',
+ $ret = C4::Auth_with_ldap::checkpw_ldap( 'hola',
password => 'hey' );
}
qr/LDAP bind failed as ldapuser cn=Manager,dc=metavore,dc=com: LDAP error #1: error_name/,
is( $ret, 0, 'checkpw_ldap returns 0 if bind fails' );
$anonymous_bind = 0;
- $desired_bind_result = 'success';
- $non_anonymous_bind_result = 'success';
- $desired_compare_result = 'error';
+ $desired_admin_bind_result = 'success';
+ $desired_bind_result = 'error';
reload_ldap_module();
warning_like {
- $ret = C4::Auth_with_ldap::checkpw_ldap( $dbh, 'hola',
+ $ret = C4::Auth_with_ldap::checkpw_ldap( '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)' );
subtest 'search_method tests' => sub {
- plan tests => 5;
+ plan tests => 3;
my $ldap = mock_net_ldap();
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)
base => 'dc=metavore,dc=com',
hostname => 'localhost',
mapping => \%ldap_mapping,
- pass => 'metavore',
+ pass => $pass,
principal_name => '%s@my_domain.com',
replicate => $replicate,
update => $update,
- user => 'cn=Manager,dc=metavore,dc=com',
+ user => $user,
);
return \%ldap_config;
}
if ( ref $class eq 'HASH' ) {
return $class->{$param};
}
- return;
+
+ return C4::Context::_common_config($param, 'config');
}
# Function that mocks the call to Net::LDAP
my $mocked_ldap = Test::MockObject->new();
- $mocked_ldap->mock(
- 'bind',
- sub {
-
- my @args = @_;
- my $mocked_message;
-
- if ( $#args > 1 ) {
-
- # Args passed => non-anonymous bind
- if ( $non_anonymous_bind_result eq 'error' ) {
- return mock_net_ldap_message( 1, 1, 'error_name',
- 'error_text' );
- }
- else {
- return mock_net_ldap_message( 0, 0, q{}, q{} );
- }
- }
- else {
- $mocked_message = mock_net_ldap_message(
- ( $desired_bind_result eq 'error' ) ? 1 : 0, # code
- ( $desired_bind_result eq 'error' ) ? 1 : 0, # error
- ( $desired_bind_result eq 'error' )
- ? 'error_name'
- : 0, # error_name
- ( $desired_bind_result eq 'error' )
- ? 'error_text'
- : 0 # error_text
- );
- }
-
- return $mocked_message;
+ $mocked_ldap->mock( 'bind', sub {
+ if (is_admin_bind(@_)) {
+ return mock_net_ldap_message(
+ ($desired_admin_bind_result eq 'error' ) ? 1 : 0, # code
+ ($desired_admin_bind_result eq 'error' ) ? 1 : 0, # error
+ ($desired_admin_bind_result eq 'error' ) ? 'error_name' : 0, # error_name
+ ($desired_admin_bind_result eq 'error' ) ? 'error_text' : 0 # error_text
+ );
}
- );
-
- $mocked_ldap->mock(
- 'compare',
- sub {
-
- my $mocked_message;
-
- if ( $desired_compare_result eq 'error' ) {
- $mocked_message =
- mock_net_ldap_message( 1, 1, 'error_name', 'error_text' );
- }
- else {
- # we expect return code 6 for success
- $mocked_message = mock_net_ldap_message( 6, 0, q{}, q{} );
+ else {
+ if ( $desired_bind_result eq 'error' ) {
+ return mock_net_ldap_message(1,1,'error_name','error_text');
}
-
- return $mocked_message;
+ return mock_net_ldap_message(0,0,'','');
}
- );
+ });
$mocked_ldap->mock(
'search',
sub {
+ $remaining_entry = 1;
+
return mock_net_ldap_search(
{
count => ($desired_count_result)
$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;
}
return;
}
+sub is_admin_bind {
+ my @args = @_;
+
+ if ($#args <= 1 || $args[1] eq 'cn=Manager,dc=metavore,dc=com') {
+ return 1;
+ }
+
+ return 0;
+}
+
$schema->storage->txn_rollback();
-1;
projects / koha-ffzg.git / blobdiff