fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PMCORE-1782 Cannot import a PMTABLE.

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2020-07-14 13:46:17 -04:00
parent bd7aa4f1f8
commit acd24b40fb
2 changed files with 88 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
tests/unit/workflow/engine/controllers/PmTablesProxyTest.php
View File

@@ -1085,4 +1085,51 @@ class PmTablesProxyTest extends TestCase
$obj->delete($httpDataVarChar); $obj->delete($httpDataVarChar);
$obj->delete($httpDataTinyInt); $obj->delete($httpDataTinyInt);
} }
/**
* This test verifies the import of pmtable with post form error catching.
*
* Note: not all paths of this import method can be covered, because there is the
* definition of constants at the beginning of the method. Removing the
* constants would imply a very big change.
* @test
* @covers ::import()
*/
public function it_should_test_import_method_with_post_form_error_catch()
{
$httpData = [
'form' => [
"TYPE_TABLE" => "admin",
"PRO_UID" => "false"
]
];
$_POST['form'] = [
'TYPE_TABLE' => 'admin',
'FROM_CONFIRM' => 'admin'
];
$_SESSION['FILES_FORM'] = [
'error' => [
'FILENAME' => -1
]
];
$_FILES['form'] = [];
$pmTablesProxy = new pmTablesProxy();
$result = $pmTablesProxy->import($httpData);
//asserts
$this->assertObjectHasAttribute('fromAdmin', $result);
$this->assertObjectHasAttribute('arrayMessage', $result);
$this->assertObjectHasAttribute('arrayRelated', $result);
$this->assertObjectHasAttribute('arrayOverwrite', $result);
$this->assertObjectHasAttribute('validationType', $result);
$this->assertObjectHasAttribute('errorType', $result);
$this->assertObjectHasAttribute('buildResult', $result);
$this->assertObjectHasAttribute('success', $result);
$this->assertObjectHasAttribute('message', $result);
$this->assertObjectHasAttribute('type', $result);
$this->assertEquals($result->success, false);
$this->assertEquals($result->errorType, 'error');
}
} }

78
workflow/engine/controllers/pmTablesProxy.php
View File

@@ -729,8 +729,12 @@ class pmTablesProxy extends HttpProxyController
* *
* @param string $httpData->id * @param string $httpData->id
*/ */
public function import ($httpData) public function import($httpData)
{ {
//ob_start is for catching additional errors that have been printed on included files,
//this opening should be closed by ob_end_clean.
ob_start();
define('ERROR_PM_TABLES_OVERWRITE', 1); define('ERROR_PM_TABLES_OVERWRITE', 1);
define('ERROR_PROCESS_NOT_EXIST', 2); define('ERROR_PROCESS_NOT_EXIST', 2);
define('ERROR_RP_TABLES_OVERWRITE', 3); define('ERROR_RP_TABLES_OVERWRITE', 3);
@@ -738,63 +742,66 @@ class pmTablesProxy extends HttpProxyController
define('ERROR_OVERWRITE_RELATED_PROCESS', 5); define('ERROR_OVERWRITE_RELATED_PROCESS', 5);
$fromAdmin = false; $fromAdmin = false;
if (isset( $_POST["form"]["TYPE_TABLE"] ) && ! empty( $_POST["form"]["TYPE_TABLE"] )) { if (isset($_POST["form"]["TYPE_TABLE"]) && !empty($_POST["form"]["TYPE_TABLE"])) {
if($_POST["form"]["TYPE_TABLE"] == 'admin') { if ($_POST["form"]["TYPE_TABLE"] == 'admin') {
$fromAdmin = true; $fromAdmin = true;
} }
} }
$result = new stdClass();
$arrayOverwrite = [];
$arrayRelated = [];
$arrayMessage = [];
$validationType = 0;
try { try {
ValidationUploadedFiles::getValidationUploadedFiles()->dispatch(function($validator) { ValidationUploadedFiles::getValidationUploadedFiles()->dispatch(function($validator) {
throw new ExceptionRestApi($validator->getMessage()); throw new ExceptionRestApi($validator->getMessage());
}); });
$result = new stdClass();
$errors = ''; $errors = '';
$fromConfirm = false; $fromConfirm = false;
$overWrite = isset( $_POST['form']['OVERWRITE'] ) ? true : false; $overWrite = isset($_POST['form']['OVERWRITE']) ? true : false;
if (isset( $_POST["form"]["FROM_CONFIRM"] ) && ! empty( $_POST["form"]["FROM_CONFIRM"] )) { if (isset($_POST["form"]["FROM_CONFIRM"]) && !empty($_POST["form"]["FROM_CONFIRM"])) {
$fromConfirm = $_POST["form"]["FROM_CONFIRM"]; $fromConfirm = $_POST["form"]["FROM_CONFIRM"];
$_FILES['form'] = $_SESSION['FILES_FORM']; $_FILES['form'] = $_SESSION['FILES_FORM'];
} }
//save the file //save the file
if ($_FILES['form']['error']['FILENAME'] !== 0) { if ($_FILES['form']['error']['FILENAME'] !== 0) {
throw new Exception( G::loadTranslation( 'ID_PMTABLE_UPLOADING_FILE_PROBLEM' ) ); throw new Exception(G::loadTranslation('ID_PMTABLE_UPLOADING_FILE_PROBLEM'));
} }
$_SESSION['FILES_FORM'] = $_FILES['form']; $_SESSION['FILES_FORM'] = $_FILES['form'];
$PUBLIC_ROOT_PATH = PATH_DATA . 'sites' . PATH_SEP . config("system.workspace") . PATH_SEP . 'public' . PATH_SEP; $PUBLIC_ROOT_PATH = PATH_DATA . 'sites' . PATH_SEP . config("system.workspace") . PATH_SEP . 'public' . PATH_SEP;
$filename = $_FILES['form']['name']['FILENAME']; $filename = $_FILES['form']['name']['FILENAME'];
$tempName = $_FILES['form']['tmp_name']['FILENAME']; $tempName = $_FILES['form']['tmp_name']['FILENAME'];
if(!$fromConfirm) { if (!$fromConfirm) {
G::uploadFile( $tempName, $PUBLIC_ROOT_PATH, $filename ); G::uploadFile($tempName, $PUBLIC_ROOT_PATH, $filename);
} }
if ($fromConfirm == 'clear') { if ($fromConfirm == 'clear') {
$fromConfirm = true; $fromConfirm = true;
} }
$fileContent = file_get_contents( $PUBLIC_ROOT_PATH . $filename ); $fileContent = file_get_contents($PUBLIC_ROOT_PATH . $filename);
if (strpos( $fileContent, '-----== ProcessMaker Open Source Private Tables ==-----' ) === false) { if (strpos($fileContent, '-----== ProcessMaker Open Source Private Tables ==-----') === false) {
$result->success = false; $result->success = false;
$result->errorType = 'notice'; $result->errorType = 'notice';
$result->message = G::loadTranslation( 'ID_PMTABLE_INVALID_FILE', array ($filename)); $result->message = G::loadTranslation('ID_PMTABLE_INVALID_FILE', array($filename));
return $result; return $result;
} }
$currentProUid = ''; $currentProUid = '';
if (isset( $_POST["form"]["PRO_UID_HELP"] ) && !empty($_POST["form"]["PRO_UID_HELP"])) { if (isset($_POST["form"]["PRO_UID_HELP"]) && !empty($_POST["form"]["PRO_UID_HELP"])) {
$currentProUid = $_POST["form"]["PRO_UID_HELP"]; $currentProUid = $_POST["form"]["PRO_UID_HELP"];
} else { } else {
if(isset( $_POST["form"]["PRO_UID"]) && !empty( $_POST["form"]["PRO_UID"])){ if (isset($_POST["form"]["PRO_UID"]) && !empty($_POST["form"]["PRO_UID"])) {
$currentProUid = $_POST["form"]["PRO_UID"]; $currentProUid = $_POST["form"]["PRO_UID"];
$_SESSION['PROCESS'] = $currentProUid; $_SESSION['PROCESS'] = $currentProUid;
} else{ } else {
$currentProUid = $_SESSION['PROCESS']; $currentProUid = $_SESSION['PROCESS'];
} }
} }
@@ -816,7 +823,7 @@ class pmTablesProxy extends HttpProxyController
break; break;
case '@SCHEMA': case '@SCHEMA':
$fdataUid = intval(fread($f, 9)); $fdataUid = intval(fread($f, 9));
$uid = fread($f, $fdataUid ); $uid = fread($f, $fdataUid);
$fdata = intval(fread($f, 9)); $fdata = intval(fread($f, 9));
$schema = fread($f, $fdata); $schema = fread($f, $fdata);
@@ -854,23 +861,19 @@ class pmTablesProxy extends HttpProxyController
//First Validate the file //First Validate the file
$reportTable = new \ProcessMaker\BusinessModel\ReportTable(); $reportTable = new \ProcessMaker\BusinessModel\ReportTable();
$arrayOverwrite = array(); if (!$fromConfirm) {
$arrayRelated = array();
$arrayMessage = array();
$validationType = 0;
if(!$fromConfirm){
$aErrors = $reportTable->checkPmtFileThrowErrors( $aErrors = $reportTable->checkPmtFileThrowErrors(
$arrayTableSchema, $currentProUid, $fromAdmin, $overWrite, $_POST['form']['PRO_UID'] $arrayTableSchema, $currentProUid, $fromAdmin, $overWrite, $_POST['form']['PRO_UID']
); );
$countC = 0; $countC = 0;
$countM = 0; $countM = 0;
$countI = 0; $countI = 0;
foreach($aErrors as $row){ foreach ($aErrors as $row) {
if($row['ERROR_TYPE'] == ERROR_PM_TABLES_OVERWRITE || $row['ERROR_TYPE'] == ERROR_RP_TABLES_OVERWRITE){ if ($row['ERROR_TYPE'] == ERROR_PM_TABLES_OVERWRITE || $row['ERROR_TYPE'] == ERROR_RP_TABLES_OVERWRITE) {
$arrayOverwrite[$countC] = $row; $arrayOverwrite[$countC] = $row;
$countC++; $countC++;
} else { } else {
if($row['ERROR_TYPE'] == ERROR_OVERWRITE_RELATED_PROCESS){ if ($row['ERROR_TYPE'] == ERROR_OVERWRITE_RELATED_PROCESS) {
$arrayRelated[$countI] = $row; $arrayRelated[$countI] = $row;
$countI++; $countI++;
} else { } else {
@@ -879,17 +882,17 @@ class pmTablesProxy extends HttpProxyController
} }
} }
} }
if(sizeof($aErrors)){ if (sizeof($aErrors)) {
$validationType = 1; //Yes no $validationType = 1; //Yes no
throw new Exception(G::loadTranslation( 'ID_PMTABLE_IMPORT_WITH_ERRORS', array ($filename))); throw new Exception(G::loadTranslation('ID_PMTABLE_IMPORT_WITH_ERRORS', array($filename)));
} }
} }
//Then create the tables //Then create the tables
if(isset($_POST["form"]["TABLES_OF_NO"])){ if (isset($_POST["form"]["TABLES_OF_NO"])) {
$arrayOfNo = $_POST["form"]["TABLES_OF_NO"]; $arrayOfNo = $_POST["form"]["TABLES_OF_NO"];
$arrayOfNew = $_POST["form"]["TABLES_OF_NEW"]; $arrayOfNew = $_POST["form"]["TABLES_OF_NEW"];
$aTablesCreateNew = explode('|',$arrayOfNew); $aTablesCreateNew = explode('|', $arrayOfNew);
$aTablesNoCreate = explode('|',$arrayOfNo); $aTablesNoCreate = explode('|', $arrayOfNo);
$errors = $reportTable->createStructureOfTables( $errors = $reportTable->createStructureOfTables(
$arrayTableSchema, $arrayTableSchema,
$arrayTableData, $arrayTableData,
@@ -911,11 +914,11 @@ class pmTablesProxy extends HttpProxyController
if ($errors == '') { if ($errors == '') {
$result->success = true; $result->success = true;
$msg = G::loadTranslation( 'ID_DONE' ); $msg = G::loadTranslation('ID_DONE');
} else { } else {
$result->success = false; $result->success = false;
$result->errorType = 'warning'; $result->errorType = 'warning';
$msg = G::loadTranslation( 'ID_PMTABLE_IMPORT_WITH_ERRORS', array ($filename) ) . "\n\n" . $errors; $msg = G::loadTranslation('ID_PMTABLE_IMPORT_WITH_ERRORS', array($filename)) . "\n\n" . $errors;
} }
$result->message = $msg; $result->message = $msg;
@@ -933,19 +936,20 @@ class pmTablesProxy extends HttpProxyController
$result->validationType = $validationType; $result->validationType = $validationType;
$result->errorType = 'error'; $result->errorType = 'error';
$result->buildResult = ob_get_contents(); $result->buildResult = ob_get_contents();
ob_end_clean();
$result->success = false; $result->success = false;
// if it is a propel exception message // if it is a propel exception message
if (preg_match( '/(.*)\s\[(.*):\s(.*)\]\s\[(.*):\s(.*)\]/', $e->getMessage(), $match )) { if (preg_match('/(.*)\s\[(.*):\s(.*)\]\s\[(.*):\s(.*)\]/', $e->getMessage(), $match)) {
$result->message = $match[3]; $result->message = $match[3];
$result->type = G::loadTranslation( 'ID_ERROR' ); $result->type = G::loadTranslation('ID_ERROR');
} else { } else {
$result->message = $e->getMessage(); $result->message = $e->getMessage();
$result->type = G::loadTranslation( 'ID_EXCEPTION' ); $result->type = G::loadTranslation('ID_EXCEPTION');
} }
} }
//ob_end_clean is used to close the ob_start opening at the beginning of this method.
ob_end_clean();
return $result; return $result;
} }