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

N.440 Remote troubleshooting: when the REST/JSON API fails due to malformed utf8 characters, return a meaningful json error message (explain + debug information) instead of an empty response

Browse Source 
SVN:trunk[4417]
This commit is contained in:
Romain Quetiez
2016-09-26 19:11:08 +00:00
parent 915a88afd4
commit 8fd9acb2ce
1 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
webservices/rest.php
View File

@@ -86,6 +86,22 @@ class RestResultListOperations extends RestResult
} }
} }
if (!function_exists('json_last_error_msg')) {
function json_last_error_msg() {
static $ERRORS = array(
JSON_ERROR_NONE => 'No error',
JSON_ERROR_DEPTH => 'Maximum stack depth exceeded',
JSON_ERROR_STATE_MISMATCH => 'State mismatch (invalid or malformed JSON)',
JSON_ERROR_CTRL_CHAR => 'Control character error, possibly incorrectly encoded',
JSON_ERROR_SYNTAX => 'Syntax error',
JSON_ERROR_UTF8 => 'Malformed UTF-8 characters, possibly incorrectly encoded'
);
$error = json_last_error();
return isset($ERRORS[$error]) ? $ERRORS[$error] : 'Unknown error';
}
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// //
// Main // Main
@@ -215,6 +231,14 @@ catch(Exception $e)
// //
$sResponse = json_encode($oResult); $sResponse = json_encode($oResult);
if ($sResponse === false)
{
$oJsonIssue = new RestResult();
$oJsonIssue->code = RestResult::INTERNAL_ERROR;
$oJsonIssue->message = 'json encoding failed with message: '.json_last_error_msg().'. Full response structure for debugging purposes (print_r+bin2hex): '.bin2hex(print_r($oResult, true));
$sResponse = json_encode($oJsonIssue);
}
$oP->add_header('Access-Control-Allow-Origin: *'); $oP->add_header('Access-Control-Allow-Origin: *');
$sCallback = utils::ReadParam('callback', null); $sCallback = utils::ReadParam('callback', null);