mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

LDAP: extend remnants output with "detected on" field 

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2018-12-17 17:37:45 +01:00
parent fbd4e9e651
commit 85f14bc591
No known key found for this signature in database
GPG Key ID: 7424F1874854DF23
3 changed files with 57 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
apps/user_ldap/lib/Command/ShowRemnants.php
View File

@ -55,34 +55,45 @@ class ShowRemnants extends Command {
$this
->setName('ldap:show-remnants')
->setDescription('shows which users are not available on LDAP anymore, but have remnants in Nextcloud.')
->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.');
->addOption('json', null, InputOption::VALUE_NONE, 'return JSON array instead of pretty table.')
->addOption('short-date', null, InputOption::VALUE_NONE, 'show dates in Y-m-d format');
}
protected function formatDate(int $timestamp, string $default, bool $showShortDate) {
if (!($timestamp > 0)) {
return $default;
}
if ($showShortDate) {
return date('Y-m-d', $timestamp);
}
return $this->dateFormatter->formatDate($timestamp);
}
/**
* executes the command, i.e. creeates and outputs a table of LDAP users marked as deleted
* executes the command, i.e. creates and outputs a table of LDAP users marked as deleted
*
* {@inheritdoc}
*/
protected function execute(InputInterface $input, OutputInterface $output) {
/** @var \Symfony\Component\Console\Helper\Table $table */
$table = new Table($output);
$table->setHeaders(array(
$table->setHeaders([
'Nextcloud name', 'Display Name', 'LDAP UID', 'LDAP DN', 'Last Login',
'Dir', 'Sharer'));
$rows = array();
'Detected on', 'Dir', 'Sharer'
]);
$rows = [];
$resultSet = $this->dui->getUsers();
foreach ($resultSet as $user) {
$hAS = $user->getHasActiveShares() ? 'Y' : 'N';
$lastLogin = ($user->getLastLogin() > 0) ?
$this->dateFormatter->formatDate($user->getLastLogin()) : '-';
$rows[] = array('ocName' => $user->getOCName(),
$rows[] = [
'ocName' => $user->getOCName(),
'displayName' => $user->getDisplayName(),
'uid' => $user->getUID(),
'dn' => $user->getDN(),
'lastLogin' => $lastLogin,
'lastLogin' => $this->formatDate($user->getLastLogin(), '-', (bool)$input->getOption('short-date')),
'detectedOn' => $this->formatDate($user->getDetectedOn(), 'unknown', (bool)$input->getOption('short-date')),
'homePath' => $user->getHomePath(),
'sharer' => $hAS
);
'sharer' => $user->getHasActiveShares() ? 'Y' : 'N',
];
}
if ($input->getOption('json')) {

6
apps/user_ldap/lib/User/DeletedUsersIndex.php
View File

@ -108,7 +108,13 @@ class DeletedUsersIndex {
* @throws \OCP\PreConditionNotMetException
*/
public function markUser($ocName) {
$curValue = $this->config->getUserValue($ocName, 'user_ldap', 'isDeleted', '0');
if($curValue === '1') {
// the user is already marked, do not write to DB again
return;
}
$this->config->setUserValue($ocName, 'user_ldap', 'isDeleted', '1');
$this->config->setUserValue($ocName, 'user_ldap', 'foundDeleted', (string)time());
$this->deletedUsers = null;
}
}

22
apps/user_ldap/lib/User/OfflineUser.php
View File

@ -53,6 +53,10 @@ class OfflineUser {
* @var string $lastLogin the timestamp of the last login
*/
protected $lastLogin;
/**
* @var string $foundDeleted the timestamp when the user was detected as unavailable
*/
protected $foundDeleted;
/**
* @var string $email
*/
@ -92,7 +96,8 @@ class OfflineUser {
* remove the Delete-flag from the user.
*/
public function unmark() {
$this->config->setUserValue($this->ocName, 'user_ldap', 'isDeleted', '0');
$this->config->deleteUserValue($this->ocName, 'user_ldap', 'isDeleted');
$this->config->deleteUserValue($this->ocName, 'user_ldap', 'foundDeleted');
}
/**
@ -169,6 +174,14 @@ class OfflineUser {
return (int)$this->lastLogin;
}
/**
* getter for the detection timestamp
* @return int
*/
public function getDetectedOn() {
return (int)$this->foundDeleted;
}
/**
* getter for having active shares
* @return bool
@ -181,13 +194,14 @@ class OfflineUser {
* reads the user details
*/
protected function fetchDetails() {
$properties = array (
$properties = [
'displayName' => 'user_ldap',
'uid' => 'user_ldap',
'homePath' => 'user_ldap',
'foundDeleted' => 'user_ldap',
'email' => 'settings',
'lastLogin' => 'login'
);
'lastLogin' => 'login',
];
foreach($properties as $property => $app) {
$this->$property = $this->config->getUserValue($this->ocName, $app, $property, '');
}