output();
}
+
+ /**
+ * @since 2.7.2 2.8.0 N°3324
+ */
+ public function testAllowAllData() {
+ $oSimpleSearch = \DBObjectSearch::FromOQL('SELECT FunctionalCI');
+ $oSimpleSearch->AllowAllData(false);
+ self::assertFalse($oSimpleSearch->IsAllDataAllowed(), 'DBSearch AllowData value');
+ $oSimpleSearch->AllowAllData(true);
+ self::assertTrue($oSimpleSearch->IsAllDataAllowed(), 'DBSearch AllowData value');
+
+ $sNestedQuery = 'SELECT FunctionalCI WHERE id IN (SELECT Server)';
+ $this->CheckNestedSearch($sNestedQuery, true);
+ $this->CheckNestedSearch($sNestedQuery, false);
+ }
+
+ private function CheckNestedSearch($sQuery, $bAllowAllData) {
+ $oNestedQuerySearch = \DBObjectSearch::FromOQL($sQuery);
+ $oNestedQuerySearch->AllowAllData($bAllowAllData);
+ self::assertEquals($bAllowAllData, $oNestedQuerySearch->IsAllDataAllowed(), 'root DBSearch AllowData value');
+ $oNestedSearchInExpression = null;
+ $oNestedQuerySearch->GetCriteria()->Browse(function ($oExpression) use (&$oNestedSearchInExpression) {
+ if ($oExpression instanceof \NestedQueryExpression) {
+ $oNestedSearchInExpression = $oExpression->GetNestedQuery();
+
+ return;
+ }
+ });
+ self::assertNotNull($oNestedSearchInExpression, 'We must have a DBSearch inside a NestedQueryExpression inside the root DBSearch');
+ /** @var \DBObjectSearch $oNestedSearchInExpression */
+ self::assertEquals($bAllowAllData, $oNestedSearchInExpression->IsAllDataAllowed(), 'Nested DBSearch AllowData value');
+ }
}
diff --git a/test/core/OQLTest.php b/test/core/OQLTest.php
index eb7bf7230..32882a0ef 100644
--- a/test/core/OQLTest.php
+++ b/test/core/OQLTest.php
@@ -218,7 +218,7 @@ class OQLTest extends ItopDataTestCase
*
* @param $sQuery
*
- * @expectedException \TypeError
+ * @expectedException \CoreException
*
* @throws \OQLException
*/
diff --git a/test/core/TriggerTest.php b/test/core/TriggerTest.php
index e9c703cec..768f1fb3b 100644
--- a/test/core/TriggerTest.php
+++ b/test/core/TriggerTest.php
@@ -2,9 +2,11 @@
namespace Combodo\iTop\Test\UnitTest\Core;
+use Combodo\iTop\Portal\Controller\ObjectController;
use Combodo\iTop\Test\UnitTest\ItopDataTestCase;
use ContextTag;
use MetaModel;
+use PHPUnit\Exception;
use TriggerOnObjectCreate;
/**
@@ -14,10 +16,17 @@ use TriggerOnObjectCreate;
*
* @runTestsInSeparateProcesses
*/
+
class TriggerTest extends ItopDataTestCase
{
const USE_TRANSACTION = false;
+
+ protected function setUp()
+ {
+ parent::setUp();
+ }
+
public function testIsContextValid()
{
/** @var TriggerOnObjectCreate $oTrigger */
@@ -29,4 +38,65 @@ class TriggerTest extends ItopDataTestCase
ContextTag::AddContext(ContextTag::TAG_CRON);
$this->assertTrue($oTrigger->IsContextValid());
}
+
+ public function testEnrichRaisedException_Trigger()
+ {
+ $oTrigger = MetaModel::NewObject('TriggerOnObjectCreate');
+ try
+ {
+ try
+ {
+ MetaModel::NewObject('Toto');
+ }
+ catch (\Exception $e)
+ {
+ \utils::EnrichRaisedException($oTrigger, $e);
+ }
+ $this->assertTrue(false, "An exception should have been thrown");
+ }
+ catch(\CoreException $e1)
+ {
+ $this->assertEquals('CoreException', get_class($e1));
+ $this->assertEquals('Unknown class \'Toto\' (TriggerOnObjectCreate::-1 ()
)', $e1->getMessage());
+
+ $fullStackTraceAsString = $e1->getFullStackTraceAsString();
+ $this->assertContains("MetaModel::NewObject", $fullStackTraceAsString,"new enriched exception should contain root cause method: " . $fullStackTraceAsString);
+ }
+ }
+
+ public function NoEnrichmentProvider()
+ {
+ return [
+ [ null ],
+ [ new NonCmdbAbstractObject() ],
+ ] ;
+ }
+
+ /**
+ * @param $oCmdbAbstract
+ * @dataProvider NoEnrichmentProvider
+ */
+ public function testEnrichRaisedException_NoEnrichment($oCmdbAbstract)
+ {
+ try
+ {
+ try
+ {
+ MetaModel::NewObject('CoreException');
+ }
+ catch (\Exception $e)
+ {
+ \utils::EnrichRaisedException($oCmdbAbstract, $e);
+ }
+ $this->assertTrue(false, "An exception should have been thrown");
+ }
+ catch(\Exception $e1)
+ {
+ $this->assertEquals($e, $e1);
+ }
+ }
+}
+
+class NonCmdbAbstractObject{
+
}
diff --git a/webservices/export-v2.php b/webservices/export-v2.php
index 8b193fc9a..07c194a4d 100644
--- a/webservices/export-v2.php
+++ b/webservices/export-v2.php
@@ -50,6 +50,7 @@ function ReportErrorAndExit($sErrorMessage)
else
{
$oP = new WebPage("iTop - Export");
+ $oP->add_header('X-Frame-Options: deny');
$oP->p('ERROR: '.$sErrorMessage);
$oP->output();
exit(EXIT_CODE_ERROR);
@@ -69,6 +70,7 @@ function ReportErrorAndUsage($sErrorMessage)
else
{
$oP = new WebPage("iTop - Export");
+ $oP->add_header('X-Frame-Options: deny');
$oP->p('ERROR: '.$sErrorMessage);
Usage($oP);
$oP->output();
@@ -737,6 +739,7 @@ try
if($oExporter instanceof HTMLBulkExport)
{
$oP = new NiceWebPage('iTop export');
+ $oP->add_header('X-Frame-Options: deny');
$oP->add_ready_script("$('table.listResults').tablesorter({widgets: ['MyZebra']});");
$oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/all.min.css');
$oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/font-awesome/css/v4-shims.min.css');
@@ -744,6 +747,7 @@ try
else
{
$oP = new WebPage('iTop export');
+ $oP->add_header('X-Frame-Options: deny');
$oP->add_style("table br { mso-data-placement:same-cell; }"); // Trick for Excel: keep line breaks inside the same cell !
}
$oP->add_style("body { overflow: auto; }");
@@ -767,6 +771,7 @@ catch (BulkExportMissingParameterException $e)
catch (Exception $e)
{
$oP = new WebPage('iTop Export');
+ $oP->add_header('X-Frame-Options: deny');
$oP->add('Error: '.$e->getMessage());
IssueLog::Error($e->getMessage()."\n".$e->getTraceAsString());
$oP->output();
|