From 2965a981b7ec22866fbdf2d567d87e2d068d3617 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 31 Jul 2015 16:04:08 -0400
Subject: [PATCH] Allow to search and import missing PGP pubkeys from keyservers using Publickey.js
---
plugins/new_user_identity/new_user_identity.php | 134 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 109 insertions(+), 25 deletions(-)
diff --git a/plugins/new_user_identity/new_user_identity.php b/plugins/new_user_identity/new_user_identity.php
index 7559569..b905488 100644
--- a/plugins/new_user_identity/new_user_identity.php
+++ b/plugins/new_user_identity/new_user_identity.php
@@ -6,44 +6,128 @@
*
* This plugin requires that a working public_ldap directory be configured.
*
- * @version 1.0
+ * @version @package_version@
* @author Kris Steinhoff
- *
- * Example configuration:
- *
- * // The id of the address book to use to automatically set a new
- * // user's full name in their new identity. (This should be an
- * // string, which refers to the $rcmail_config['ldap_public'] array.)
- * $rcmail_config['new_user_identity_addressbook'] = 'People';
- *
- * // When automatically setting a new users's full name in their
- * // new identity, match the user's login name against this field.
- * $rcmail_config['new_user_identity_match'] = 'uid';
- *
- * // Use the value in this field to automatically set a new users's
- * // full name in their new identity.
- * $rcmail_config['new_user_identity_field'] = 'name';
+ * @license GNU GPLv3+
*/
class new_user_identity extends rcube_plugin
{
+ public $task = 'login';
+
+ private $rc;
+ private $ldap;
+
function init()
{
- $this->add_hook('create_user', array($this, 'lookup_user_name'));
+ $this->rc = rcmail::get_instance();
+
+ $this->add_hook('user_create', array($this, 'lookup_user_name'));
+ $this->add_hook('login_after', array($this, 'login_after'));
}
function lookup_user_name($args)
{
- $rcmail = rcmail::get_instance();
- if ($addressbook = $rcmail->config->get('new_user_identity_addressbook')) {
- $match = $rcmail->config->get('new_user_identity_match');
- $ldap = $rcmail->get_address_book($addressbook);
- $ldap->prop['search_fields'] = array($match);
- $results = $ldap->search($match, $args['user'], TRUE);
+ if ($this->init_ldap($args['host'])) {
+ $results = $this->ldap->search('*', $args['user'], true);
+
if (count($results->records) == 1) {
- $args['user_name'] = $results->records[0][$rcmail->config->get('new_user_identity_field')];
+ $user_name = is_array($results->records[0]['name']) ? $results->records[0]['name'][0] : $results->records[0]['name'];
+ $user_email = is_array($results->records[0]['email']) ? $results->records[0]['email'][0] : $results->records[0]['email'];
+
+ $args['user_name'] = $user_name;
+ $args['email_list'] = array();
+
+ if (!$args['user_email'] && strpos($user_email, '@')) {
+ $args['user_email'] = rcube_utils::idn_to_ascii($user_email);
+ }
+
+ foreach (array_keys($results[0]) as $key) {
+ if (!preg_match('/^email($|:)/', $key)) {
+ continue;
+ }
+
+ foreach ((array) $results->records[0][$key] as $alias) {
+ if (strpos($alias, '@')) {
+ $args['email_list'][] = rcube_utils::idn_to_ascii($alias);
+ }
+ }
+ }
+
+ }
+ }
+
+ return $args;
+ }
+
+ function login_after($args)
+ {
+ $this->load_config();
+
+ if ($this->ldap || !$this->rc->config->get('new_user_identity_onlogin')) {
+ return $args;
+ }
+
+ $identities = $this->rc->user->list_emails();
+ $ldap_entry = $this->lookup_user_name(array(
+ 'user' => $this->rc->user->data['username'],
+ 'host' => $this->rc->user->data['mail_host'],
+ ));
+
+ foreach ((array) $ldap_entry['email_list'] as $email) {
+ foreach ($identities as $identity) {
+ if ($identity['email'] == $email) {
+ continue 2;
+ }
+ }
+
+ $plugin = $this->rc->plugins->exec_hook('identity_create', array(
+ 'login' => true,
+ 'record' => array(
+ 'user_id' => $this->rc->user->ID,
+ 'standard' => 0,
+ 'email' => $email,
+ 'name' => $ldap_entry['user_name']
+ ),
+ ));
+
+ if (!$plugin['abort'] && $plugin['record']['email']) {
+ $this->rc->user->insert_identity($plugin['record']);
}
}
return $args;
}
+
+ private function init_ldap($host)
+ {
+ if ($this->ldap) {
+ return $this->ldap->ready;
+ }
+
+ $this->load_config();
+
+ $addressbook = $this->rc->config->get('new_user_identity_addressbook');
+ $ldap_config = (array)$this->rc->config->get('ldap_public');
+ $match = $this->rc->config->get('new_user_identity_match');
+
+ if (empty($addressbook) || empty($match) || empty($ldap_config[$addressbook])) {
+ return false;
+ }
+
+ $this->ldap = new new_user_identity_ldap_backend(
+ $ldap_config[$addressbook],
+ $this->rc->config->get('ldap_debug'),
+ $this->rc->config->mail_domain($host),
+ $match);
+
+ return $this->ldap->ready;
+ }
}
-?>
+
+class new_user_identity_ldap_backend extends rcube_ldap
+{
+ function __construct($p, $debug, $mail_domain, $search)
+ {
+ parent::__construct($p, $debug, $mail_domain);
+ $this->prop['search_fields'] = (array)$search;
+ }
+}
--
Gitblit v1.9.1