nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-19 01:34:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Slight code tidy up and add some debug statements.

Browse Source
This commit is contained in:
Andrew Ruthven 2007-11-04 20:08:42 +13:00 committed by Andrew Ruthven
parent d5de171ccd
commit 2744a62c28
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
inc/drivers_ldap.php
View File

@ -50,14 +50,19 @@ class ldapDrivers
$this->valid=false; $this->valid=false;
return ; return ;
} }
if ($port) $this->connect=ldap_connect($host, $port); if ($port)
else $this->connect=ldap_connect($host); $this->connect=ldap_connect($host, $port);
else
$this->connect=ldap_connect($host);
if (! $this->connect){ if (! $this->connect){
$c->messages[] = sprintf(i18n( "drivers_ldap : Unable to connect to LDAP with port %s on host %s"), $port,$host ); $c->messages[] = sprintf(i18n( "drivers_ldap : Unable to connect to LDAP with port %s on host %s"), $port,$host );
$this->valid=false; $this->valid=false;
return ; return ;
} }
dbg_error_log( "LDAP", "drivers_ldap : Connected to LDAP server %s",$host );
//Set LDAP protocol version //Set LDAP protocol version
if (isset($config['protocolVersion'])) ldap_set_option($this->connect,LDAP_OPT_PROTOCOL_VERSION, $config['protocolVersion']); if (isset($config['protocolVersion'])) ldap_set_option($this->connect,LDAP_OPT_PROTOCOL_VERSION, $config['protocolVersion']);
@ -115,10 +120,17 @@ class ldapDrivers
if ( !ldap_first_entry($this->connect, $entry) ){ if ( !ldap_first_entry($this->connect, $entry) ){
dbg_error_log( "ERROR", "drivers_ldap : Unable to find the user with filter %s",$filter ); dbg_error_log( "ERROR", "drivers_ldap : Unable to find the user with filter %s",$filter );
return false; return false;
} else {
dbg_error_log( "LDAP", "drivers_ldap : Found a user using filter %s",$filter );
} }
$dnUser = ldap_get_dn($this->connect, ldap_first_entry($this->connect,$entry)); $dnUser = ldap_get_dn($this->connect, ldap_first_entry($this->connect,$entry));
if ( !@ldap_bind($this->connect, $dnUser, $passwd) ) if ( !@ldap_bind($this->connect, $dnUser, $passwd) ) {
dbg_error_log( "LDAP", "drivers_ldap : Failed to bind to user %s using password %s", $dnUser, $passwd );
return false; return false;
}
dbg_error_log( "LDAP", "drivers_ldap : Bound to user %s using password %s", $dnUser, $passwd );
$i = ldap_first_entry($this->connect,$entry); $i = ldap_first_entry($this->connect,$entry);
$arr = ldap_get_attributes($this->connect,$i); $arr = ldap_get_attributes($this->connect,$i);
@ -152,6 +164,7 @@ function getStaticLdap() {
* @param object $usr A user record to be updated (or created) * @param object $usr A user record to be updated (or created)
*/ */
function sync_user_from_LDAP( &$usr, $mapping, $ldap_values ) { function sync_user_from_LDAP( &$usr, $mapping, $ldap_values ) {
dbg_error_log( "LDAP", "Going to sync the user from LDAP" );
$validUserFields = get_fields('usr'); $validUserFields = get_fields('usr');
foreach ( $c->authenticate_hook['config']['default_value'] as $field => $value ) { foreach ( $c->authenticate_hook['config']['default_value'] as $field => $value ) {
@ -159,7 +172,11 @@ function sync_user_from_LDAP( &$usr, $mapping, $ldap_values ) {
} }
foreach ( $mapping as $field => $value ) { foreach ( $mapping as $field => $value ) {
if ( in_array($field, $validUserFields) ) $usr->{$field} = $ldap_values[$value]; dbg_error_log( "LDAP", "Considering copying %s", $field );
if ( in_array($field, $validUserFields) ) {
$usr->{$field} = $ldap_values[$value];
dbg_error_log( "LDAP", "Setting usr value for field $s to %s", $field, $value );
}
} }
UpdateUserFromExternal( $usr ); UpdateUserFromExternal( $usr );
@ -198,7 +215,10 @@ function LDAP_check($username, $password ){
$valid = $ldapDriver->requestUser( $filter, $attributes, $password ); $valid = $ldapDriver->requestUser( $filter, $attributes, $password );
// is a valid user or not // is a valid user or not
if ( !$valid ) return false; if ( !$valid ) {
dbg_error_log( "LDAP", "user %s is not a valid user",$username );
return false;
}
$ldap_timestamp = $valid[$mapping["updated"]]; $ldap_timestamp = $valid[$mapping["updated"]];
@ -221,6 +241,7 @@ function LDAP_check($username, $password ){
// we will need to update the user record // we will need to update the user record
} }
else { else {
dbg_error_log( "LDAP", "user %s doesn't exist in local DB, we need to create it",$username );
$usr = (object) array( 'user_no' => 0 ); $usr = (object) array( 'user_no' => 0 );
} }