YunoHost-Apps/dotclear2_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/dotclear2_ynh.git synced 2024-09-03 18:26:29 +02:00
Code Issues Activity Actions 1

add a try catch block, improve the ldap auth class

Browse source
This commit is contained in:
Kay0u 2021-12-16 22:01:27 +01:00
parent 810121c232
commit f6cb024d24
No known key found for this signature in database
GPG key ID: AE1DCADB6415A156
1 changed files with 51 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

93
conf/class.auth.ldap.php
View file

@ -20,7 +20,6 @@ class ldapDcAuth extends dcAuth
if ($ds) if ($ds)
{ {
ldap_set_option ($ds, LDAP_OPT_PROTOCOL_VERSION, 3); ldap_set_option ($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
if (ldap_bind($ds, "uid=".$user_id.",ou=users,".$this->base, $pwd)) if (ldap_bind($ds, "uid=".$user_id.",ou=users,".$this->base, $pwd))
{ {
# search the user in ldap, and get infos # search the user in ldap, and get infos
@ -30,57 +29,67 @@ class ldapDcAuth extends dcAuth
if ($info["count"] == 1) if ($info["count"] == 1)
{ {
$this->con->begin(); try
$cur = $this->con->openCursor($this->user_table);
# Store the password
$cur->user_pwd = $pwd;
# Store informations about the user
$cur->user_id = $user_id;
$cur->user_email = $info[0]['mail'][0];
$cur->user_name = $info[0]['sn'][0];
$cur->user_firstname = $info[0]['givenname'][0];
$cur->user_displayname = $info[0]['cn'][0];
# If the user exist, then we just update his password.
if ($this->core->userExists($user_id))
{ {
$this->sudo(array($this->core, 'updUser'), $user_id, $cur); $this->con->begin();
$cur = $this->con->openCursor($this->user_table);
# Store the password
$cur->user_pwd = $pwd;
# Store informations about the user
$cur->user_id = $user_id;
$cur->user_email = $info[0]['mail'][0];
$cur->user_name = $info[0]['sn'][0];
$cur->user_firstname = $info[0]['givenname'][0];
$cur->user_displayname = $info[0]['cn'][0];
# If the user exist, then we just update his password.
if ($this->core->userExists($user_id))
{
$this->sudo(array($this->core, 'updUser'), $user_id, $cur);
}
# If not, we create him.
# In order for him to connect,
# it is necessary to give him at least
# a permission "usage" on the blog "default".
else
{
$cur->user_lang = 'fr'; # Can change this, PR are welcome
$cur->user_tz = 'Europe/Paris'; # Can change this, PR are welcome
$cur->user_default_blog = 'default'; # Can change this, PR are welcome
$this->sudo(array($this->core,'addUser'), $cur);
# Possible roles:
#admin "administrator"
#usage "manage their own entries and comments"
#publish "publish entries and comments"
#delete "delete entries and comments"
#contentadmin "manage all entries and comments"
#categories "manage categories"
#media "manage their own media items"
#media_admin "manage all media items"
#pages "manage pages"
#blogroll "manage blogroll"
$this->sudo(array($this->core, 'setUserBlogPermissions'), $user_id, 'default', array('usage'=>true)); # Can change this, PR are welcome
}
$this->con->commit();
} }
# If not, we create him. catch (Exception $e)
# In order for him to connect,
# it is necessary to give him at least
# a permission "usage" on the blog "default".
else
{ {
$cur->user_lang = 'fr'; # Can change this, PR are welcome # In case of error we cancel and return "false"
$cur->user_tz = 'Europe/Paris'; # Can change this, PR are welcome $this->con->rollback();
$cur->user_default_blog = 'default'; # Can change this, PR are welcome return false;
$this->sudo(array($this->core,'addUser'), $cur);
# Possible roles:
#admin "administrator"
#usage "manage their own entries and comments"
#publish "publish entries and comments"
#delete "delete entries and comments"
#contentadmin "manage all entries and comments"
#categories "manage categories"
#media "manage their own media items"
#media_admin "manage all media items"
#pages "manage pages"
#blogroll "manage blogroll"
$this->sudo(array($this->core, 'setUserBlogPermissions'), $user_id, 'default', array('usage'=>true)); # Can change this, PR are welcome
} }
$this->con->commit();
# The previous operations proceeded without error, # The previous operations proceeded without error,
# we can now call the parent method # we can now call the parent method
return parent::checkUser($user_id, $pwd); return parent::checkUser($user_id, $pwd);
} }
} }
else
{
error_log("Failed to connect with the user ".$user_id);
}
} }
# In case of error we cancel and return "false" return parent::checkUser($user_id, $pwd);
$this->con->rollback();
return false;
} }
} }
?> ?>