bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-07-03 08:38:49 +02:00
Code Issues Projects Releases Wiki Activity

LSaddon :: ssh: Add debug using LSlog logger

Browse source
This commit is contained in:
Benjamin Renard 2020-05-11 11:33:53 +02:00
parent 499ff808f4
commit 5f17c45cf4
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/includes/addons/LSaddons.ssh.php
View file

@ -114,6 +114,7 @@ LSerror :: defineError('SSH_07',
* @retval mixed SSH2/SFTP object or false * @retval mixed SSH2/SFTP object or false
*/ */
function connectToSSH($params, $sftp=false) { function connectToSSH($params, $sftp=false) {
$logger = LSlog :: get_logger('LSaddon_ssh');
if (!isset($params['host'])) { if (!isset($params['host'])) {
LSerror :: addErrorCode('SSH_01',"host"); LSerror :: addErrorCode('SSH_01',"host");
return false; return false;
@ -127,7 +128,7 @@ LSerror :: defineError('SSH_07',
$user = $params['user']; $user = $params['user'];
$port = (isset($params['port'])?$params['port']:22); $port = (isset($params['port'])?$params['port']:22);
$timeout = (isset($params['timeout'])?$params['timeout']:22); $timeout = (isset($params['timeout'])?$params['timeout']:10);
if (isset($params['auth_key'])) { if (isset($params['auth_key'])) {
if (!isset($params['auth_key']['file_path'])) { if (!isset($params['auth_key']['file_path'])) {
@ -151,8 +152,10 @@ LSerror :: defineError('SSH_07',
LSerror :: addErrorCode('SSH_03', $key_file_path); LSerror :: addErrorCode('SSH_03', $key_file_path);
return; return;
} }
$logger -> debug("Connect on $user@$host:$port (timeout: $timeout sec) with key authentication using file '$key_file_path'.");
} }
elseif (isset($params['password'])) { elseif (isset($params['password'])) {
$logger -> debug("Connect on $user@$host:$port (timeout: $timeout sec) with password authentication.");
$password = $params['password']; $password = $params['password'];
} }
else { else {
@ -169,6 +172,7 @@ LSerror :: defineError('SSH_07',
LSerror :: addErrorCode('SSH_04', array('host' => $host, 'port' => $port)); LSerror :: addErrorCode('SSH_04', array('host' => $host, 'port' => $port));
return false; return false;
} }
$logger -> debug("Connected.");
return $cnx; return $cnx;
} }
@ -196,6 +200,7 @@ LSerror :: defineError('SSH_07',
} }
$retval=true; $retval=true;
foreach($dirs as $dir) { foreach($dirs as $dir) {
LSlog :: get_logger('LSaddon_ssh') -> debug("mkdir($dir) with chmod=$chmod and recursie ".($recursive?'enabled':'disabled'));
if (!$cnx -> mkdir($dir, $chmod, $recursive)) { if (!$cnx -> mkdir($dir, $chmod, $recursive)) {
LSerror :: addErrorCode('SSH_05',$dir); LSerror :: addErrorCode('SSH_05',$dir);
if (!$continue) return false; if (!$continue) return false;
@ -227,6 +232,7 @@ LSerror :: defineError('SSH_07',
} }
$retval=true; $retval=true;
foreach($dirs as $dir) { foreach($dirs as $dir) {
LSlog :: get_logger('LSaddon_ssh') -> debug("delete($dir) with recursive ".($recursive?'enabled':'disabled'));
if (!$cnx -> delete($dir, $recursive)) { if (!$cnx -> delete($dir, $recursive)) {
LSerror :: addErrorCode('SSH_06',$dir); LSerror :: addErrorCode('SSH_06',$dir);
if (!$continue) return false; if (!$continue) return false;
@ -252,6 +258,7 @@ LSerror :: defineError('SSH_07',
if (! $cnx){ if (! $cnx){
return; return;
} }
LSlog :: get_logger('LSaddon_ssh') -> debug("rename($old, $new)");
if (!$cnx -> rename($old, $new)) { if (!$cnx -> rename($old, $new)) {
LSerror :: addErrorCode('SSH_07',array('old' => $old,'new' => $new)); LSerror :: addErrorCode('SSH_07',array('old' => $old,'new' => $new));
return; return;
@ -276,6 +283,7 @@ LSerror :: defineError('SSH_07',
if (! $cnx){ if (! $cnx){
return; return;
} }
LSlog :: get_logger('LSaddon_ssh') -> debug("exec($cmd)");
$result = $cnx -> exec($cmd); $result = $cnx -> exec($cmd);
$exit_status = $cnx->getExitStatus(); $exit_status = $cnx->getExitStatus();
return array($exit_status, $result); return array($exit_status, $result);