From 8d3dab34ec29abf5453ecbfaea1cb764e710f1b4 Mon Sep 17 00:00:00 2001 From: simonp Date: Fri, 16 May 2014 12:29:06 +0200 Subject: Add timeout for password-driver vpopmaild --- plugins/password/drivers/vpopmaild.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugins/password/drivers') diff --git a/plugins/password/drivers/vpopmaild.php b/plugins/password/drivers/vpopmaild.php index 6c1a9ee9d..40731206a 100644 --- a/plugins/password/drivers/vpopmaild.php +++ b/plugins/password/drivers/vpopmaild.php @@ -22,6 +22,8 @@ class rcube_vpopmaild_password $rcmail->config->get('password_vpopmaild_port'), null))) { return PASSWORD_CONNECT_ERROR; } + + $vpopmaild->setTimeout($rcmail->config->get('password_vpopmaild_timeout'),0); $result = $vpopmaild->readLine(); if(!preg_match('/^\+OK/', $result)) { -- cgit v1.2.3 From 7706df99f03fb5e492c92994d8e36620406a7a1a Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 24 Jun 2014 12:03:17 +0200 Subject: Allow anonymous LDAP searches --- plugins/password/drivers/ldap.php | 11 +++++++++-- plugins/password/drivers/ldap_simple.php | 15 +++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'plugins/password/drivers') diff --git a/plugins/password/drivers/ldap.php b/plugins/password/drivers/ldap.php index 739958ad7..cc62595b5 100644 --- a/plugins/password/drivers/ldap.php +++ b/plugins/password/drivers/ldap.php @@ -130,9 +130,10 @@ class rcube_ldap_password */ function search_userdn($rcmail) { + $binddn = $rcmail->config->get('password_ldap_searchDN'); + $bindpw = $rcmail->config->get('password_ldap_searchPW'); + $ldapConfig = array ( - 'binddn' => $rcmail->config->get('password_ldap_searchDN'), - 'bindpw' => $rcmail->config->get('password_ldap_searchPW'), 'basedn' => $rcmail->config->get('password_ldap_basedn'), 'host' => $rcmail->config->get('password_ldap_host'), 'port' => $rcmail->config->get('password_ldap_port'), @@ -140,6 +141,12 @@ class rcube_ldap_password 'version' => $rcmail->config->get('password_ldap_version'), ); + // allow anonymous searches + if (!empty($binddn)) { + $ldapConfig['binddn'] = $binddn; + $ldapConfig['bindpw'] = $bindpw; + } + $ldap = Net_LDAP2::connect($ldapConfig); if (PEAR::isError($ldap)) { diff --git a/plugins/password/drivers/ldap_simple.php b/plugins/password/drivers/ldap_simple.php index 3e167ea5b..3c19ccde5 100644 --- a/plugins/password/drivers/ldap_simple.php +++ b/plugins/password/drivers/ldap_simple.php @@ -168,14 +168,16 @@ class rcube_ldap_simple_password */ function search_userdn($rcmail, $ds) { - $search_user = $rcmail->config->get('password_ldap_searchDN'); - $search_pass = $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_user)) { - return null; + if (empty($search_filter)) { + return false; } - $this->_debug("C: Bind $search_user, pass: **** [" . strlen($search_pass) . "]"); + $this->_debug("C: Bind " . ($search_user ? $search_user : '[anonymous]')); // Bind if (!ldap_bind($ds, $search_user, $search_pass)) { @@ -185,9 +187,6 @@ class rcube_ldap_simple_password $this->_debug("S: OK"); - $search_base = $rcmail->config->get('password_ldap_search_base'); - $search_filter = $rcmail->config->get('password_ldap_search_filter'); - $search_base = rcube_ldap_password::substitute_vars($search_base); $search_filter = rcube_ldap_password::substitute_vars($search_filter); -- cgit v1.2.3 From 1599665651a3e6e259091e3f9576c47c06b20a30 Mon Sep 17 00:00:00 2001 From: Mohammad Anwari Date: Mon, 14 Jul 2014 23:54:32 +0700 Subject: New gearman driver for password plugin --- plugins/password/config.inc.php.dist | 5 ++++ plugins/password/drivers/gearman.php | 50 ++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 plugins/password/drivers/gearman.php (limited to 'plugins/password/drivers') diff --git a/plugins/password/config.inc.php.dist b/plugins/password/config.inc.php.dist index 16b7f9317..d979a1901 100644 --- a/plugins/password/config.inc.php.dist +++ b/plugins/password/config.inc.php.dist @@ -367,3 +367,8 @@ $config['password_expect_params'] = ''; $config['password_smb_host'] = 'localhost'; // Location of smbpasswd binary $config['password_smb_cmd'] = '/usr/bin/smbpasswd'; + +// gearman driver options +// --------------------- +// Gearman host (default: localhost) +$config['password_gearman_host'] = 'localhost'; diff --git a/plugins/password/drivers/gearman.php b/plugins/password/drivers/gearman.php new file mode 100644 index 000000000..6c1ad3cf0 --- /dev/null +++ b/plugins/password/drivers/gearman.php @@ -0,0 +1,50 @@ + + */ + +class rcube_gearman_password +{ + function save($currpass, $newpass) + { + $user = $_SESSION['username']; + $rcmail = rcmail::get_instance(); + + if (extension_loaded('gearman')) { + $success = false; + $gmc= new GearmanClient(); + + $gmc->addServer($rcmail->config->get('password_gearman_host')); + $payload = array("username" => $user, "oldPassword" => $currpass, "newPassword" => $newpass); + $result = $gmc->doNormal("setPassword", json_encode($payload)); + $success = json_decode($result); + if ($success->result == 1) { + return PASSWORD_SUCCESS; + } else { + rcube::raise_error(array( + 'code' => 600, + 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "Password plugin: Gearman authentication failed for user $user: $error" + ), true, false); + } + } + else { + rcube::raise_error(array( + 'code' => 600, + 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "Password plugin: PECL Gearman module not loaded" + ), true, false); + } + + return PASSWORD_ERROR; + } +} +?> -- cgit v1.2.3 From 9d2550502a68ea3cc495e287ebff04e142a59e2e Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 16 Jul 2014 15:12:53 +0200 Subject: CS fixes after PR merge --- plugins/password/drivers/gearman.php | 71 +++++++++++++++++++----------------- 1 file changed, 38 insertions(+), 33 deletions(-) (limited to 'plugins/password/drivers') diff --git a/plugins/password/drivers/gearman.php b/plugins/password/drivers/gearman.php index 6c1ad3cf0..36571a98f 100644 --- a/plugins/password/drivers/gearman.php +++ b/plugins/password/drivers/gearman.php @@ -1,4 +1,5 @@ $user, + 'oldPassword' => $currpass, + 'newPassword' => $newpass, + ); - if (extension_loaded('gearman')) { - $success = false; - $gmc= new GearmanClient(); + $gmc = new GearmanClient(); + $gmc->addServer($rcmail->config->get('password_gearman_host')); - $gmc->addServer($rcmail->config->get('password_gearman_host')); - $payload = array("username" => $user, "oldPassword" => $currpass, "newPassword" => $newpass); - $result = $gmc->doNormal("setPassword", json_encode($payload)); - $success = json_decode($result); - if ($success->result == 1) { - return PASSWORD_SUCCESS; - } else { - rcube::raise_error(array( - 'code' => 600, - 'type' => 'php', - 'file' => __FILE__, 'line' => __LINE__, - 'message' => "Password plugin: Gearman authentication failed for user $user: $error" - ), true, false); - } - } - else { - rcube::raise_error(array( - 'code' => 600, - 'type' => 'php', - 'file' => __FILE__, 'line' => __LINE__, - 'message' => "Password plugin: PECL Gearman module not loaded" - ), true, false); - } + $result = $gmc->doNormal('setPassword', json_encode($payload)); + $success = json_decode($result); - return PASSWORD_ERROR; - } + if ($success && $success->result == 1) { + return PASSWORD_SUCCESS; + } + else { + rcube::raise_error(array( + 'code' => 600, + 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "Password plugin: Gearman authentication failed for user $user: $error" + ), true, false); + } + } + else { + rcube::raise_error(array( + 'code' => 600, + 'type' => 'php', + 'file' => __FILE__, 'line' => __LINE__, + 'message' => "Password plugin: PECL Gearman module not loaded" + ), true, false); + } + + return PASSWORD_ERROR; + } } -?> -- cgit v1.2.3