mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-07 16:44:07 +01:00
WIP of SMIME support: Implement set_smime_keys and get_smime_keys
This commit is contained in:
Hadi Nategh
parent
94f678548b
commit
68a1f2fd37
@ -35,40 +35,7 @@ class addressbook_bo extends Api\Contacts
|
||||
*/
|
||||
public function get_pgp_keys($recipients)
|
||||
{
|
||||
if (!$recipients) return array();
|
||||
|
||||
if (!is_array($recipients)) $recipients = array($recipients);
|
||||
|
||||
$criteria = $result = array();
|
||||
foreach($recipients as &$recipient)
|
||||
{
|
||||
if (is_numeric($recipient))
|
||||
{
|
||||
$criteria['egw_addressbook.account_id'][] = (int)$recipient;
|
||||
}
|
||||
else
|
||||
{
|
||||
$criteria['contact_email'][] = $recipient = strtolower($recipient);
|
||||
}
|
||||
}
|
||||
foreach($this->search($criteria, array('account_id', 'contact_email', 'contact_pubkey'), '', '', '', false, 'OR', false,
|
||||
"contact_pubkey LIKE '%-----BEGIN PGP PUBLIC KEY BLOCK-----%'") as $contact)
|
||||
{
|
||||
$matches = null;
|
||||
if (preg_match(self::$pgp_key_regexp, $contact['pubkey'], $matches))
|
||||
{
|
||||
$contact['email'] = strtolower($contact['email']);
|
||||
if (empty($criteria['account_id']) || in_array($contact['email'], $recipients))
|
||||
{
|
||||
$result[$contact['email']] = $matches[0];
|
||||
}
|
||||
else
|
||||
{
|
||||
$result[$contact['account_id']] = $matches[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
return $result;
|
||||
return $this->get_keys($recipients, self::$pgp_key_regexp, '%-----BEGIN PGP PUBLIC KEY BLOCK-----%');
|
||||
}
|
||||
|
||||
/**
|
||||
@ -139,73 +106,7 @@ class addressbook_bo extends Api\Contacts
|
||||
*/
|
||||
public function ajax_set_pgp_keys($keys, $allow_user_updates=null)
|
||||
{
|
||||
if (isset($allow_user_updates) && isset($GLOBALS['egw_info']['user']['apps']['admin']))
|
||||
{
|
||||
$update = false;
|
||||
if ($allow_user_updates && !in_array('pubkey', $this->own_account_acl))
|
||||
{
|
||||
$this->own_account_acl[] = 'pubkey';
|
||||
$update = true;
|
||||
}
|
||||
elseif (!$allow_user_updates && ($key = array_search('pubkey', $this->own_account_acl)) !== false)
|
||||
{
|
||||
unset($this->own_account_acl[$key]);
|
||||
$update = true;
|
||||
}
|
||||
if ($update)
|
||||
{
|
||||
Config::save_value('own_account_acl', $this->own_account_acl, 'phpgwapi');
|
||||
}
|
||||
}
|
||||
$criteria = array();
|
||||
foreach($keys as $recipient => $key)
|
||||
{
|
||||
if (!preg_match(self::$pgp_key_regexp, $key)) continue;
|
||||
|
||||
if (is_numeric($recipient))
|
||||
{
|
||||
$criteria['egw_addressbook.account_id'][] = (int)$recipient;
|
||||
}
|
||||
else
|
||||
{
|
||||
$criteria['contact_email'][] = $recipient;
|
||||
}
|
||||
}
|
||||
if (!$criteria) return 0;
|
||||
|
||||
$updated = 0;
|
||||
foreach($this->search($criteria, false, '', '', '', false, 'OR') as $contact)
|
||||
{
|
||||
if ($contact['account_id'] && isset($keys[$contact['account_id']]))
|
||||
{
|
||||
$key = $keys[$contact['account_id']];
|
||||
}
|
||||
elseif (isset($keys[$contact['email']]))
|
||||
{
|
||||
$key = $keys[$contact['email']];
|
||||
}
|
||||
if (empty($contact['pubkey']) || !preg_match(self::$pgp_key_regexp, $contact['pubkey']))
|
||||
{
|
||||
$contact['pubkey'] .= $key;
|
||||
}
|
||||
else
|
||||
{
|
||||
$contact['pubkey'] = preg_replace(self::$pgp_key_regexp, $key, $contact['pubkey']);
|
||||
}
|
||||
if ($this->check_perms(Acl::EDIT, $contact) && $this->save($contact))
|
||||
{
|
||||
++$updated;
|
||||
}
|
||||
}
|
||||
if ($criteria == array('egw.addressbook.account_id' => array((int)$GLOBALS['egw_info']['user']['account_id'])))
|
||||
{
|
||||
$message = !$updated ? lang('Permissiong denied! Ask your administrator to allow regular uses to update their public keys.') :
|
||||
lang('Your new public key has been stored in accounts addressbook.');
|
||||
}
|
||||
else
|
||||
{
|
||||
$message = lang('%1 public keys added.', $updated);
|
||||
}
|
||||
$message = $this->set_keys($keys, self::$pgp_key_regexp, $allow_user_updates);
|
||||
// add all keys to public keyserver too
|
||||
$message .= "\n".lang('%1 key(s) added to public keyserver "%2".',
|
||||
self::set_pgp_keyserver($keys), PARSE_URL(self::KEYSERVER_ADD, PHP_URL_HOST));
|
||||
@ -252,4 +153,160 @@ class addressbook_bo extends Api\Contacts
|
||||
}
|
||||
return $added;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set keys for given email or account_id and key type based on regexp (SMIME or PGP), if user has necessary rights
|
||||
*
|
||||
* @param array $keys email|account_id => public key pairs to store
|
||||
* @param string $key_regexp regular expresion for key type indication (SMIME|PGP)
|
||||
* @param boolean $allow_user_updates = null for admins, set config to allow regular users to store their key
|
||||
*
|
||||
* @return string message of the update operation result
|
||||
*/
|
||||
public function set_keys ($keys, $key_regexp, $allow_user_updates = null)
|
||||
{
|
||||
if (isset($allow_user_updates) && isset($GLOBALS['egw_info']['user']['apps']['admin']))
|
||||
{
|
||||
$update = false;
|
||||
if ($allow_user_updates && !in_array('pubkey', $this->own_account_acl))
|
||||
{
|
||||
$this->own_account_acl[] = 'pubkey';
|
||||
$update = true;
|
||||
}
|
||||
elseif (!$allow_user_updates && ($key = array_search('pubkey', $this->own_account_acl)) !== false)
|
||||
{
|
||||
unset($this->own_account_acl[$key]);
|
||||
$update = true;
|
||||
}
|
||||
if ($update)
|
||||
{
|
||||
Config::save_value('own_account_acl', $this->own_account_acl, 'phpgwapi');
|
||||
}
|
||||
}
|
||||
$criteria = array();
|
||||
foreach($keys as $recipient => $key)
|
||||
{
|
||||
if (!preg_match($key_regexp, $key)) continue;
|
||||
|
||||
if (is_numeric($recipient))
|
||||
{
|
||||
$criteria['egw_addressbook.account_id'][] = (int)$recipient;
|
||||
}
|
||||
else
|
||||
{
|
||||
$criteria['contact_email'][] = $recipient;
|
||||
}
|
||||
}
|
||||
if (!$criteria) return 0;
|
||||
|
||||
$updated = 0;
|
||||
foreach($this->search($criteria, false, '', '', '', false, 'OR') as $contact)
|
||||
{
|
||||
if ($contact['account_id'] && isset($keys[$contact['account_id']]))
|
||||
{
|
||||
$key = $keys[$contact['account_id']];
|
||||
}
|
||||
elseif (isset($keys[$contact['email']]))
|
||||
{
|
||||
$key = $keys[$contact['email']];
|
||||
}
|
||||
if (empty($contact['pubkey']) || !preg_match($key_regexp, $contact['pubkey']))
|
||||
{
|
||||
$contact['pubkey'] .= $key;
|
||||
}
|
||||
else
|
||||
{
|
||||
$contact['pubkey'] = preg_replace($key_regexp, $key, $contact['pubkey']);
|
||||
}
|
||||
if ($this->check_perms(Acl::EDIT, $contact) && $this->save($contact))
|
||||
{
|
||||
++$updated;
|
||||
}
|
||||
}
|
||||
if ($criteria == array('egw.addressbook.account_id' => array((int)$GLOBALS['egw_info']['user']['account_id'])))
|
||||
{
|
||||
$message = !$updated ? lang('Permissiong denied! Ask your administrator to allow regular uses to update their public keys.') :
|
||||
lang('Your new public key has been stored in accounts addressbook.');
|
||||
}
|
||||
else
|
||||
{
|
||||
$message = lang('%1 public keys added.', $updated);
|
||||
}
|
||||
return $message;
|
||||
}
|
||||
|
||||
/**
|
||||
* Search addressbook for keys of given recipients
|
||||
*
|
||||
* EMail addresses are lowercased to make search case-insensitive
|
||||
*
|
||||
* @param string|int|array $recipients (array of) email addresses or numeric account-ids
|
||||
* @param string $key_regexp
|
||||
* @param string $criteria_filter
|
||||
*
|
||||
* @return array email|account_id => key pairs
|
||||
*/
|
||||
public function get_keys ($recipients, $key_regexp, $criteria_filter)
|
||||
{
|
||||
if (!$recipients) return array();
|
||||
|
||||
if (!is_array($recipients)) $recipients = array($recipients);
|
||||
|
||||
$criteria = $result = array();
|
||||
foreach($recipients as &$recipient)
|
||||
{
|
||||
if (is_numeric($recipient))
|
||||
{
|
||||
$criteria['egw_addressbook.account_id'][] = (int)$recipient;
|
||||
}
|
||||
else
|
||||
{
|
||||
$criteria['contact_email'][] = $recipient = strtolower($recipient);
|
||||
}
|
||||
}
|
||||
foreach($this->search($criteria, array('account_id', 'contact_email', 'contact_pubkey'), '', '', '', false, 'OR', false,
|
||||
"contact_pubkey LIKE '". $criteria_filter ."'" ) as $contact)
|
||||
{
|
||||
$matches = null;
|
||||
if (preg_match($key_regexp, $contact['pubkey'], $matches))
|
||||
{
|
||||
$contact['email'] = strtolower($contact['email']);
|
||||
if (empty($criteria['account_id']) || in_array($contact['email'], $recipients))
|
||||
{
|
||||
$result[$contact['email']] = $matches[0];
|
||||
}
|
||||
else
|
||||
{
|
||||
$result[$contact['account_id']] = $matches[0];
|
||||
}
|
||||
}
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
/**
|
||||
* Search addressbook for SMIME Certificate keys of given recipients
|
||||
*
|
||||
* EMail addresses are lowercased to make search case-insensitive
|
||||
*
|
||||
* @param string|int|array $recipients (array of) email addresses or numeric account-ids
|
||||
* @return array email|account_id => key pairs
|
||||
*/
|
||||
public function get_smime_keys($recipients)
|
||||
{
|
||||
return $this->get_keys($recipients, Api\Mail\Smime::$certificate_regexp, '%-----BEGIN CERTIFICATE-----%');
|
||||
}
|
||||
|
||||
/**
|
||||
* Set SMIME keys for given email or account_id, if user has necessary rights
|
||||
*
|
||||
* @param array $keys email|account_id => public key pairs to store
|
||||
* @param boolean $allow_user_updates =null for admins, set config to allow regular users to store their smime key
|
||||
*
|
||||
* @return string message of the update operation result
|
||||
*/
|
||||
public function set_smime_keys($keys, $allow_user_updates=null)
|
||||
{
|
||||
return $this->set_keys($keys, Api\Mail\Smime::$certificate_regexp, $allow_user_updates);
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user