extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-01 03:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

WIP LDAP import

Browse Source
This commit is contained in:
ralf 2022-07-11 07:54:16 +02:00
parent a513bb26f6
commit aefe04d3b8
1 changed files with 61 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
api/src/Accounts/Import.php
View File

@ -35,6 +35,13 @@ class Import
/** @var callable */ /** @var callable */
protected $_logger; protected $_logger;
/**
* Filename => [attr, mask, regexp] for jpegphoto and pubkey attributes
*
* @var array[]
*/
protected $files2attrs;
/** /**
* Constructor * Constructor
* *
@ -66,6 +73,12 @@ class Import
$this->accounts_sql = $this->frontend_sql->backend; $this->accounts_sql = $this->frontend_sql->backend;
$this->_logger = $logger; $this->_logger = $logger;
$this->files2attrs = [
Api\Contacts::FILES_PHOTO => ['jpegphoto', Api\Contacts::FILES_BIT_PHOTO, null],
Api\Contacts::FILES_PGP_PUBKEY => ['pubkey', Api\Contacts::FILES_BIT_PGP_PUBKEY, \addressbook_bo::$pgp_key_regexp],
Api\Contacts::FILES_SMIME_PUBKEY => ['pubkey', Api\Contacts::FILES_BIT_SMIME_PUBKEY, Api\Mail\Smime::$certificate_regexp],
];
} }
/** /**
@ -303,24 +316,62 @@ class Import
} }
else else
{ {
// photo and public keys are not stored in SQL but in filesystem, fetch it to compare
$contact['files'] = 0;
foreach($this->files2attrs as $file => [$attr, $mask, $regexp])
{
if (isset($contact[$attr]))
{
if ($sql_contact['files'] & $mask)
{
$sql_contact[$attr] = ($last_attr === $attr && !empty($sql_contact[$attr]) ? $sql_contact[$attr]."\n" : '').
file_get_contents(Api\Link::vfs_path('addressbook', $sql_contact['id'], $file));
}
if (!isset($regexp) || preg_match($regexp, $contact[$attr]))
{
$contact['files'] |= $mask;
}
}
$last_attr = $attr;
}
$to_update = array_merge($sql_contact, array_filter($contact, static function ($attr) { $to_update = array_merge($sql_contact, array_filter($contact, static function ($attr) {
return $attr !== null && $attr !== ''; return $attr !== null && $attr !== '';
})); }));
$to_update['id'] = $sql_contact['id']; $to_update['id'] = $sql_contact['id'];
if (($diff = array_diff_assoc($to_update, $sql_contact))) if (($diff = array_diff_assoc($to_update, $sql_contact)))
{ {
if ($this->contacts_sql->save($to_update) === 0) $need_update = $diff;
/*
Api\Vfs::$is_root = true;
foreach($this->files2attrs as $file => [$attr, $mask, $regexp])
{ {
$this->logger("Successful updated contact data of '$account[account_lid]' (#$account_id): ". if (array_key_exists($attr, $diff) && (!isset($regexp) || preg_match($regexp, $diff[$attr], $matches)))
json_encode($diff, JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE), 'detail'); {
if (!$new) $new = false; if (($written=file_put_contents($path=Api\Link::vfs_path('addressbook', $sql_contact['id'], $file),
isset($regexp) ? $matches[0] : $diff[$attr])) !== ($size=strlen($diff[$attr])))
{
$this->logger("Error updating contact data $attr ($path) of '$account[account_lid]' (#$account_id)", 'error');
++$errors;
}
unset($need_update[$attr]);
if (isset($regexp))
{
$to_update[$attr] = trim(preg_replace($regexp, '', $to_update[$attr])) ?: null;
}
$diff[$attr] = $attr === 'jpegphoto' ? 'binary data skipped' : substr($diff[$attr], 0, 100).'...';
}
} }
else Api\Vfs::$is_root = false;
*/
if ($need_update && $this->contacts_sql->save($to_update))
{ {
$this->logger("Error updating contact data of '$account[account_lid]' (#$account_id)", 'error'); $this->logger("Error updating contact data of '$account[account_lid]' (#$account_id)", 'error');
++$errors; ++$errors;
continue; continue;
} }
$this->logger("Successful updated contact data of '$account[account_lid]' (#$account_id): ".
json_encode($diff, JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE), 'detail');
if (!$new) $new = false;
} }
else else
{ {
@ -330,6 +381,11 @@ class Import
// if requested, also set memberships // if requested, also set memberships
if ($type === 'users+groups') if ($type === 'users+groups')
{ {
// LDAP backend does not query it automatic
if (!isset($account['memberships']))
{
$account['memberships'] = $this->accounts->memberships($account['account_id']);
}
// we need to convert the account_id's of memberships, in case we use different ones in SQL // we need to convert the account_id's of memberships, in case we use different ones in SQL
$this->accounts_sql->set_memberships(array_filter(array_map(static function($account_lid) use ($groups) $this->accounts_sql->set_memberships(array_filter(array_map(static function($account_lid) use ($groups)
{ {