composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-20 15:52:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

🔒 N°1802 itop-backup : move iTop root to config file

Browse Source
This commit is contained in:
Pierre Goiffon
2018-11-26 18:16:06 +01:00
parent d831549c7b
commit d2505d15fe
2 changed files with 71 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
datamodels/2.x/itop-backup/check-backup.php
View File

@@ -23,10 +23,29 @@
// Recommended usage in CRON // Recommended usage in CRON
// /usr/bin/php -q /var/www/combodo/modules/itop-backup/backup.php --backup_file=/home/backups/combodo-crm-%Y-%m-%d // /usr/bin/php -q /var/www/combodo/modules/itop-backup/backup.php --backup_file=/home/backups/combodo-crm-%Y-%m-%d
if (!defined('__DIR__')) define('__DIR__', dirname(__FILE__)); if (file_exists(__DIR__.'/../../approot.inc.php'))
require_once(__DIR__.'/../../approot.inc.php'); {
require_once(APPROOT.'/application/utils.inc.php'); require_once __DIR__.'/../../approot.inc.php'; // When in env-xxxx folder
require_once(APPROOT.'/core/config.class.inc.php'); }
else
{
require_once __DIR__.'/../../../approot.inc.php'; // When in datamodels/x.x folder
}
require_once(APPROOT.'application/utils.inc.php');
require_once(APPROOT.'core/config.class.inc.php');
/**
* Uses production env
*
* @return \Config
*/
function GetConfig()
{
$oConfig = new Config(APPCONF.'production/config-itop.php');
return $oConfig;
}
function ReadMandatoryParam($sParam) function ReadMandatoryParam($sParam)
@@ -84,8 +103,8 @@ function MakeArchiveFileName($iRefTime = null)
{ {
$sDefaultBackupFileName = sys_get_temp_dir().'/'."__DB__-%Y-%m-%d"; $sDefaultBackupFileName = sys_get_temp_dir().'/'."__DB__-%Y-%m-%d";
$sBackupFile = utils::ReadParam('backup_file', $sDefaultBackupFileName, true, 'raw_data'); $sBackupFile = utils::ReadParam('backup_file', $sDefaultBackupFileName, true, 'raw_data');
$oConfig = new Config(APPCONF.'production/config-itop.php'); $oConfig = GetConfig();
$sBackupFile = str_replace('__HOST__', $oConfig->Get('db_host'), $sBackupFile); $sBackupFile = str_replace('__HOST__', $oConfig->Get('db_host'), $sBackupFile);
$sBackupFile = str_replace('__DB__', $oConfig->Get('db_name'), $sBackupFile); $sBackupFile = str_replace('__DB__', $oConfig->Get('db_name'), $sBackupFile);
@@ -126,28 +145,39 @@ function RaiseAlarm($sMessage)
return; return;
} }
$sMessage = "Server: [[Server:".$sTicketImpactedServer."]]\n".$sMessage; $sMessage = "Server: [[Server:".$sTicketImpactedServer."]]\n".$sMessage;
require_once(APPROOT.'webservices/itopsoaptypes.class.inc.php'); require_once(APPROOT.'webservices/itopsoaptypes.class.inc.php');
//$sItopRootDefault = 'http'.((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']!='off')) ? 's' : '').'://'.$_SERVER['SERVER_NAME'].':'.$_SERVER['SERVER_PORT'].dirname($_SERVER['SCRIPT_NAME']).'/../..';
//$sItopRoot = utils::ReadParam('check_ticket_itop', $sItopRootDefault);
$sItopRoot = ReadMandatoryParam('check_ticket_itop');
$sWsdlUri = $sItopRoot.'/webservices/itop.wsdl.php'; $oConfig = GetConfig();
//$sWsdlUri .= '?service_category='; $sItopRootConfig = $oConfig->GetModuleSetting('itop-backup', 'itop_root');
if (empty($sItopRootConfig))
$aSOAPMapping = SOAPMapping::GetMapping(); {
// by default getting self !
ini_set("soap.wsdl_cache_enabled","0"); // we could have '' as config value...
$oSoapClient = new SoapClient( $sItopRootConfig = $oConfig->Get('app_root_url');
$sWsdlUri, }
array(
'trace' => 1, try
'classmap' => $aSOAPMapping, // defined in itopsoaptypes.class.inc.php {
) $sWsdlUri = $sItopRootConfig.'/webservices/itop.wsdl.php';
); $aSOAPMapping = SOAPMapping::GetMapping();
ini_set("soap.wsdl_cache_enabled", "0");
$oSoapClient = new SoapClient(
$sWsdlUri,
array(
'trace' => 1,
'classmap' => $aSOAPMapping, // defined in itopsoaptypes.class.inc.php
)
);
}
catch (Exception $e)
{
echo "ERROR: Failed to read WSDL of the target iTop ($sItopRootConfig)\n";
return;
}
try try
{ {
$oRes = $oSoapClient->CreateIncidentTicket $oRes = $oSoapClient->CreateIncidentTicket
@@ -176,6 +206,8 @@ function RaiseAlarm($sMessage)
catch(Exception $e) catch(Exception $e)
{ {
echo "The ticket could not be created: SOAP Exception = '".$e->getMessage()."'\n"; echo "The ticket could not be created: SOAP Exception = '".$e->getMessage()."'\n";
return;
} }
//echo "<pre>\n"; //echo "<pre>\n";
@@ -189,7 +221,7 @@ function RaiseAlarm($sMessage)
} }
else else
{ {
echo "ERROR: Failed to create the ticket in target iTop ($sItopRoot)\n"; echo "ERROR: Failed to create the ticket in target iTop ($sItopRootConfig)\n";
foreach ($oRes->errors->messages as $oMessage) foreach ($oRes->errors->messages as $oMessage)
{ {
echo $oMessage->text."\n"; echo $oMessage->text."\n";
@@ -211,6 +243,17 @@ catch(Exception $e)
exit; exit;
} }
// N°1802 : was moved from script param to config file (avoid direct call with untrusted param value)
$sItopRootParam = utils::ReadParam('check_ticket_itop', null, true, 'raw_data');
if (!empty($sItopRootParam))
{
echo 'ERROR: parameter \'check_ticket_itop\' should now be specified in the config file\n';
return;
}
$sZipArchiveFile = MakeArchiveFileName().'.tar.gz'; $sZipArchiveFile = MakeArchiveFileName().'.tar.gz';
$sZipArchiveFileForDisplay = utils::HtmlEntities($sZipArchiveFile); $sZipArchiveFileForDisplay = utils::HtmlEntities($sZipArchiveFile);
echo date('Y-m-d H:i:s')." - Checking file: $sZipArchiveFileForDisplay\n"; echo date('Y-m-d H:i:s')." - Checking file: $sZipArchiveFileForDisplay\n";

3
datamodels/2.x/itop-backup/module.itop-backup.php
View File

@@ -52,7 +52,8 @@ SetupWebPage::AddModule(
//'file_name_format' => '__DB__-%Y-%m-%d_%H_%M', //'file_name_format' => '__DB__-%Y-%m-%d_%H_%M',
'retention_count' => 5, 'retention_count' => 5,
'enabled' => true, 'enabled' => true,
'debug' => false 'debug' => false,
'itop_root' => '',
), ),
) )
); );