bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-12-19 06:53:53 +01:00
Code Issues Projects Releases Wiki Activity

LScli : add possibility to run command without LDAP connection

Browse source
This commit is contained in:
Benjamin Renard 2020-05-06 18:33:31 +02:00
parent 9028414568
commit fbba445106
1 changed files with 24 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/includes/class/class.LScli.php
View file

@ -39,11 +39,16 @@ class LScli {
* @param[in] $command string The CLI command name (required) * @param[in] $command string The CLI command name (required)
* @param[in] $handler callable The CLI command handler (must be callable, required) * @param[in] $handler callable The CLI command handler (must be callable, required)
* @param[in] $short_desc string|false A short description of what this command does (required) * @param[in] $short_desc string|false A short description of what this command does (required)
* @param[in] $usage_args string|false A short list of commands available arguments show in usage message (optional, default: false) * @param[in] $usage_args string|false A short list of commands available arguments show in usage message
* (optional, default: false)
* @param[in] $long_desc string|false A long description of what this command does (optional, default: false) * @param[in] $long_desc string|false A long description of what this command does (optional, default: false)
* @param[in] $override boolean Allow override if a command already exists with the same name (optional, default: false) * @param[in] $need_ldap_con boolean Permit to define if this command need connection to LDAP server (optional,
* default: true)
* @param[in] $override boolean Allow override if a command already exists with the same name (optional,
* default: false)
**/ **/
public static function add_command($command, $handler, $short_desc, $usage_args=false, $long_desc=false, $override=false) { public static function add_command($command, $handler, $short_desc, $usage_args=false, $long_desc=false,
$need_ldap_con=true, $override=false) {
if (array_key_exists($command, self :: $commands) && !$override) { if (array_key_exists($command, self :: $commands) && !$override) {
LSerror :: addErrorCode('LScli_01', $command); LSerror :: addErrorCode('LScli_01', $command);
return False; return False;
@ -59,6 +64,7 @@ class LScli {
'short_desc' => $short_desc, 'short_desc' => $short_desc,
'usage_args' => $usage_args, 'usage_args' => $usage_args,
'long_desc' => $long_desc, 'long_desc' => $long_desc,
'need_ldap_con' => boolval($need_ldap_con),
); );
return True; return True;
} }
@ -188,11 +194,9 @@ class LScli {
self :: usage(); self :: usage();
} }
// Connect to LDAP server // Select LDAP server (if not already done with -S/--ldap-server parameter)
if ($ldap_server_id === false && !LSsession :: setLdapServer(0)) if ($ldap_server_id === false && !LSsession :: setLdapServer(0))
LSlog :: fatal('Fail to select first LDAP server.'); LSlog :: fatal('Fail to select first LDAP server.');
if (!LSsession :: LSldapConnect())
LSlog :: fatal('Fail to connect to LDAP server.');
// Run command // Run command
self :: run_command($command, $command_args); self :: run_command($command, $command_args);
@ -210,8 +214,18 @@ class LScli {
return; return;
} }
if (!array_key_exists($command, self :: $commands)) { if (!array_key_exists($command, self :: $commands)) {
LSlog :: warning("LScli :: run_command() : invalid command '$command'.");
return false; return false;
} }
// Connect to LDAP server (if command need)
if (self :: $commands[$command]['need_ldap_con']) {
if (!class_exists('LSldap') || !LSldap :: isConnected())
if (!LSsession :: LSldapConnect())
LSlog :: fatal('Fail to connect to LDAP server.');
}
// Run command
LSlog :: debug('Run '.basename($argv[0])." command $command with argument(s) '".implode("', '", $command_args)."'"); LSlog :: debug('Run '.basename($argv[0])." command $command with argument(s) '".implode("', '", $command_args)."'");
try { try {
$result = call_user_func(self :: $commands[$command]['handler'], $command_args); $result = call_user_func(self :: $commands[$command]['handler'], $command_args);