4fa39250e7
LDAP User Cleanup background job for user clean up adjust user backend for clean up register background job remove dead code dependency injection make Helper non-static for proper testing check whether it is OK to run clean up job. Do not forget to pass arguments. use correct method to get the config from server methods can be private, proper indirect testing is given no automatic user deletion make limit readable for test purposes make method less complex add first tests let preferences accept limit and offset for getUsersForValue DI via constructor does not work for background jobs after detecting, now we have retrieving deleted users and their details we need this method to be public for now finalize export method, add missing getter clean up namespaces and get rid of unnecessary files helper is not static anymore cleanup according to scrutinizer add cli tool to show deleted users uses are necessary after recent namespace change also remove user from mappings table on deletion add occ command to delete users fix use statement improve output big fixes / improvements PHP doc return true in userExists early for cleaning up deleted users bump version control state and interval with one config.php setting, now ldapUserCleanupInterval. 0 will disable it. enabled by default. improve doc rename cli method to be consistent with others introduce ldapUserCleanupInterval in sample config don't show last login as unix epoche start when no login happend less log output consistent namespace for OfflineUser rename GarbageCollector to DeletedUsersIndex and move it to user subdir fix unit tests add tests for deleteUser more test adjustements Conflicts: apps/user_ldap/ajax/clearMappings.php apps/user_ldap/appinfo/app.php apps/user_ldap/lib/access.php apps/user_ldap/lib/helper.php apps/user_ldap/tests/helper.php core/register_command.php lib/private/preferences.php lib/private/user.php add ldap:check-user to check user existance on the fly Conflicts: apps/user_ldap/lib/helper.php forgotten file PHPdoc fixes, no code change and don't forget to adjust tests
76 lines
2.1 KiB
PHP
76 lines
2.1 KiB
PHP
<?php
|
|
/**
|
|
* Copyright (c) 2014 Arthur Schiwon <blizzz@owncloud.com>
|
|
* This file is licensed under the Affero General Public License version 3 or
|
|
* later.
|
|
* See the COPYING-README file.
|
|
*/
|
|
|
|
namespace OCA\user_ldap\Command;
|
|
|
|
use Symfony\Component\Console\Command\Command;
|
|
use Symfony\Component\Console\Input\InputArgument;
|
|
use Symfony\Component\Console\Input\InputInterface;
|
|
use Symfony\Component\Console\Input\InputOption;
|
|
use Symfony\Component\Console\Output\OutputInterface;
|
|
use \OCA\user_ldap\lib\Helper;
|
|
use \OCA\user_ldap\lib\Connection;
|
|
|
|
class TestConfig extends Command {
|
|
|
|
protected function configure() {
|
|
$this
|
|
->setName('ldap:test-config')
|
|
->setDescription('tests an LDAP configuration')
|
|
->addArgument(
|
|
'configID',
|
|
InputArgument::REQUIRED,
|
|
'the configuration ID'
|
|
)
|
|
;
|
|
}
|
|
|
|
protected function execute(InputInterface $input, OutputInterface $output) {
|
|
$helper = new Helper();
|
|
$availableConfigs = $helper->getServerConfigurationPrefixes();
|
|
$configID = $input->getArgument('configID');
|
|
if(!in_array($configID, $availableConfigs)) {
|
|
$output->writeln("Invalid configID");
|
|
return;
|
|
}
|
|
|
|
$result = $this->testConfig($configID);
|
|
if($result === 0) {
|
|
$output->writeln('The configuration is valid and the connection could be established!');
|
|
} else if($result === 1) {
|
|
$output->writeln('The configuration is invalid. Please have a look at the logs for further details.');
|
|
} else if($result === 2) {
|
|
$output->writeln('The configuration is valid, but the Bind failed. Please check the server settings and credentials.');
|
|
} else {
|
|
$output->writeln('Your LDAP server was kidnapped by aliens.');
|
|
}
|
|
}
|
|
|
|
/**
|
|
* tests the specified connection
|
|
* @param string $configID
|
|
* @return int
|
|
*/
|
|
protected function testConfig($configID) {
|
|
$lw = new \OCA\user_ldap\lib\LDAP();
|
|
$connection = new Connection($lw, $configID);
|
|
|
|
//ensure validation is run before we attempt the bind
|
|
$connection->getConfiguration();
|
|
|
|
if(!$connection->setConfiguration(array(
|
|
'ldap_configuration_active' => 1,
|
|
))) {
|
|
return 1;
|
|
}
|
|
if($connection->bind()) {
|
|
return 0;
|
|
}
|
|
return 2;
|
|
}
|
|
}
|