From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names
---
plugins/password/drivers/ldap_simple.php | 255 +++++++++++++++++++++-----------------------------
1 files changed, 107 insertions(+), 148 deletions(-)
diff --git a/plugins/password/drivers/ldap_simple.php b/plugins/password/drivers/ldap_simple.php
index f442d24..9123ea8 100644
--- a/plugins/password/drivers/ldap_simple.php
+++ b/plugins/password/drivers/ldap_simple.php
@@ -9,25 +9,57 @@
*
* @version 2.0
* @author Wout Decre <wout@canodus.be>
+ * @author Aleksander Machniak <machniak@kolabsys.com>
+ *
+ * Copyright (C) 2005-2014, The Roundcube Dev Team
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
*/
class rcube_ldap_simple_password
{
+ private $debug = false;
+
function save($curpass, $passwd)
{
$rcmail = rcmail::get_instance();
+ $this->debug = $rcmail->config->get('ldap_debug');
+
+ $ldap_host = $rcmail->config->get('password_ldap_host');
+ $ldap_port = $rcmail->config->get('password_ldap_port');
+
+ $this->_debug("C: Connect to $ldap_host:$ldap_port");
+
// Connect
- if (!$ds = ldap_connect($rcmail->config->get('password_ldap_host'), $rcmail->config->get('password_ldap_port'))) {
- ldap_unbind($ds);
+ if (!$ds = ldap_connect($ldap_host, $ldap_port)) {
+ $this->_debug("S: NOT OK");
+
+ rcube::raise_error(array(
+ 'code' => 100, 'type' => 'ldap',
+ 'file' => __FILE__, 'line' => __LINE__,
+ 'message' => "Could not connect to LDAP server"
+ ),
+ true);
+
return PASSWORD_CONNECT_ERROR;
}
+ $this->_debug("S: OK");
+
// Set protocol version
- if (!ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $rcmail->config->get('password_ldap_version'))) {
- ldap_unbind($ds);
- return PASSWORD_CONNECT_ERROR;
- }
+ ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, $rcmail->config->get('password_ldap_version'));
// Start TLS
if ($rcmail->config->get('password_ldap_starttls')) {
@@ -37,9 +69,19 @@
}
}
+ // include 'ldap' driver, we share some static methods with it
+ require_once INSTALL_PATH . 'plugins/password/drivers/ldap.php';
+
+ // other plugins might want to modify user DN
+ $plugin = $rcmail->plugins->exec_hook('password_ldap_bind', array(
+ 'user_dn' => '', 'conn' => $ds));
+
// Build user DN
- if ($user_dn = $rcmail->config->get('password_ldap_userDN_mask')) {
- $user_dn = $this->substitute_vars($user_dn);
+ if (!empty($plugin['user_dn'])) {
+ $user_dn = $plugin['user_dn'];
+ }
+ else if ($user_dn = $rcmail->config->get('password_ldap_userDN_mask')) {
+ $user_dn = rcube_ldap_password::substitute_vars($user_dn);
}
else {
$user_dn = $this->search_userdn($rcmail, $ds);
@@ -63,12 +105,13 @@
break;
}
- $crypted_pass = $this->hash_password($passwd, $rcmail->config->get('password_ldap_encodage'));
$lchattr = $rcmail->config->get('password_ldap_lchattr');
$pwattr = $rcmail->config->get('password_ldap_pwattr');
$smbpwattr = $rcmail->config->get('password_ldap_samba_pwattr');
$smblchattr = $rcmail->config->get('password_ldap_samba_lchattr');
$samba = $rcmail->config->get('password_ldap_samba');
+ $pass_mode = $rcmail->config->get('password_ldap_encodage');
+ $crypted_pass = rcube_ldap_password::hash_password($passwd, $pass_mode);
// Support password_ldap_samba option for backward compat.
if ($samba && !$smbpwattr) {
@@ -82,40 +125,55 @@
}
// Crypt new Samba password
- if ($smbpwattr && !($samba_pass = $this->hash_password($passwd, 'samba'))) {
+ if ($smbpwattr && !($samba_pass = rcube_ldap_password::hash_password($passwd, 'samba'))) {
return PASSWORD_CRYPT_ERROR;
}
+ $this->_debug("C: Bind $binddn, pass: **** [" . strlen($bindpw) . "]");
+
// Bind
if (!ldap_bind($ds, $binddn, $bindpw)) {
+ $this->_debug("S: ".ldap_error($ds));
+
ldap_unbind($ds);
+
return PASSWORD_CONNECT_ERROR;
}
- $entree[$pwattr] = $crypted_pass;
+ $this->_debug("S: OK");
+
+ $entry[$pwattr] = $crypted_pass;
// Update PasswordLastChange Attribute if desired
if ($lchattr) {
- $entree[$lchattr] = (int)(time() / 86400);
+ $entry[$lchattr] = (int)(time() / 86400);
}
// Update Samba password
if ($smbpwattr) {
- $entree[$smbpwattr] = $samba_pass;
+ $entry[$smbpwattr] = $samba_pass;
}
// Update Samba password last change
if ($smblchattr) {
- $entree[$smblchattr] = time();
+ $entry[$smblchattr] = time();
}
- if (!ldap_modify($ds, $user_dn, $entree)) {
+ $this->_debug("C: Modify $user_dn: " . print_r($entry, true));
+
+ if (!ldap_modify($ds, $user_dn, $entry)) {
+ $this->_debug("S: ".ldap_error($ds));
+
ldap_unbind($ds);
+
return PASSWORD_CONNECT_ERROR;
}
+ $this->_debug("S: OK");
+
// All done, no error
ldap_unbind($ds);
+
return PASSWORD_SUCCESS;
}
@@ -126,18 +184,42 @@
*/
function search_userdn($rcmail, $ds)
{
- /* Bind */
- if (!ldap_bind($ds, $rcmail->config->get('password_ldap_searchDN'), $rcmail->config->get('password_ldap_searchPW'))) {
+ $search_user = $rcmail->config->get('password_ldap_searchDN');
+ $search_pass = $rcmail->config->get('password_ldap_searchPW');
+ $search_base = $rcmail->config->get('password_ldap_search_base');
+ $search_filter = $rcmail->config->get('password_ldap_search_filter');
+
+ if (empty($search_filter)) {
return false;
}
- /* Search for the DN */
- if (!$sr = ldap_search($ds, $rcmail->config->get('password_ldap_search_base'), $this->substitute_vars($rcmail->config->get('password_ldap_search_filter')))) {
+ $this->_debug("C: Bind " . ($search_user ? $search_user : '[anonymous]'));
+
+ // Bind
+ if (!ldap_bind($ds, $search_user, $search_pass)) {
+ $this->_debug("S: ".ldap_error($ds));
return false;
}
- /* If no or more entries were found, return false */
- if (ldap_count_entries($ds, $sr) != 1) {
+ $this->_debug("S: OK");
+
+ $search_base = rcube_ldap_password::substitute_vars($search_base);
+ $search_filter = rcube_ldap_password::substitute_vars($search_filter);
+
+ $this->_debug("C: Search $search_base for $search_filter");
+
+ // Search for the DN
+ if (!$sr = ldap_search($ds, $search_base, $search_filter)) {
+ $this->_debug("S: ".ldap_error($ds));
+ return false;
+ }
+
+ $found = ldap_count_entries($ds, $sr);
+
+ $this->_debug("S: OK [found $found records]");
+
+ // If no or more entries were found, return false
+ if ($found != 1) {
return false;
}
@@ -145,135 +227,12 @@
}
/**
- * Substitute %login, %name, %domain, %dc in $str
- * See plugin config for details
+ * Prints debug info to the log
*/
- function substitute_vars($str)
+ private function _debug($str)
{
- $str = str_replace('%login', $_SESSION['username'], $str);
- $str = str_replace('%l', $_SESSION['username'], $str);
-
- $parts = explode('@', $_SESSION['username']);
-
- if (count($parts) == 2) {
- $dc = 'dc='.strtr($parts[1], array('.' => ',dc=')); // hierarchal domain string
-
- $str = str_replace('%name', $parts[0], $str);
- $str = str_replace('%n', $parts[0], $str);
- $str = str_replace('%dc', $dc, $str);
- $str = str_replace('%domain', $parts[1], $str);
- $str = str_replace('%d', $parts[1], $str);
+ if ($this->debug) {
+ rcube::write_log('ldap', $str);
}
-
- return $str;
- }
-
- /**
- * Code originaly from the phpLDAPadmin development team
- * http://phpldapadmin.sourceforge.net/
- *
- * Hashes a password and returns the hash based on the specified enc_type
- */
- function hash_password($password_clear, $encodage_type)
- {
- $encodage_type = strtolower($encodage_type);
- switch ($encodage_type) {
- case 'crypt':
- $crypted_password = '{CRYPT}' . crypt($password_clear, $this->random_salt(2));
- break;
- case 'ext_des':
- /* Extended DES crypt. see OpenBSD crypt man page */
- if (!defined('CRYPT_EXT_DES') || CRYPT_EXT_DES == 0) {
- /* Your system crypt library does not support extended DES encryption */
- return false;
- }
- $crypted_password = '{CRYPT}' . crypt($password_clear, '_' . $this->random_salt(8));
- break;
- case 'md5crypt':
- if (!defined('CRYPT_MD5') || CRYPT_MD5 == 0) {
- /* Your system crypt library does not support md5crypt encryption */
- return false;
- }
- $crypted_password = '{CRYPT}' . crypt($password_clear, '$1$' . $this->random_salt(9));
- break;
- case 'blowfish':
- if (!defined('CRYPT_BLOWFISH') || CRYPT_BLOWFISH == 0) {
- /* Your system crypt library does not support blowfish encryption */
- return false;
- }
- /* Hardcoded to second blowfish version and set number of rounds */
- $crypted_password = '{CRYPT}' . crypt($password_clear, '$2a$12$' . $this->random_salt(13));
- break;
- case 'md5':
- $crypted_password = '{MD5}' . base64_encode(pack('H*', md5($password_clear)));
- break;
- case 'sha':
- if (function_exists('sha1')) {
- /* Use PHP 4.3.0+ sha1 function, if it is available */
- $crypted_password = '{SHA}' . base64_encode(pack('H*', sha1($password_clear)));
- } else if (function_exists('mhash')) {
- $crypted_password = '{SHA}' . base64_encode(mhash(MHASH_SHA1, $password_clear));
- } else {
- /* Your PHP install does not have the mhash() function */
- return false;
- }
- break;
- case 'ssha':
- if (function_exists('mhash') && function_exists('mhash_keygen_s2k')) {
- mt_srand((double) microtime() * 1000000 );
- $salt = mhash_keygen_s2k(MHASH_SHA1, $password_clear, substr(pack('h*', md5(mt_rand())), 0, 8), 4);
- $crypted_password = '{SSHA}' . base64_encode(mhash(MHASH_SHA1, $password_clear . $salt) . $salt);
- } else {
- /* Your PHP install does not have the mhash() function */
- return false;
- }
- break;
- case 'smd5':
- if (function_exists('mhash') && function_exists('mhash_keygen_s2k')) {
- mt_srand((double) microtime() * 1000000 );
- $salt = mhash_keygen_s2k(MHASH_MD5, $password_clear, substr(pack('h*', md5(mt_rand())), 0, 8), 4);
- $crypted_password = '{SMD5}' . base64_encode(mhash(MHASH_MD5, $password_clear . $salt) . $salt);
- } else {
- /* Your PHP install does not have the mhash() function */
- return false;
- }
- break;
- case 'samba':
- if (function_exists('hash')) {
- $crypted_password = hash('md4', rcube_charset::convert($password_clear, RCUBE_CHARSET, 'UTF-16LE'));
- $crypted_password = strtoupper($crypted_password);
- } else {
- /* Your PHP install does not have the hash() function */
- return false;
- }
- break;
- case 'ad':
- $crypted_password = rcube_charset::convert('"' . $password_clear . '"', RCUBE_CHARSET, 'UTF-16LE');
- break;
- case 'clear':
- default:
- $crypted_password = $password_clear;
- }
-
- return $crypted_password;
- }
-
- /**
- * Code originaly from the phpLDAPadmin development team
- * http://phpldapadmin.sourceforge.net/
- *
- * Used to generate a random salt for crypt-style passwords
- */
- function random_salt($length)
- {
- $possible = '0123456789' . 'abcdefghijklmnopqrstuvwxyz' . 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' . './';
- $str = '';
- // mt_srand((double)microtime() * 1000000);
-
- while (strlen($str) < $length) {
- $str .= substr($possible, (rand() % strlen($possible)), 1);
- }
-
- return $str;
}
}
--
Gitblit v1.9.1