Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

improve error messages when restoring from invalid JSON data (#8210)

This commit is contained in:
Jan 2019-02-20 18:34:35 +01:00 committed by GitHub
parent 4557dfc0d5
commit 7596bac39c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -107,7 +107,8 @@ static bool ignoreHiddenEnterpriseCollection(std::string const& name, bool force
} }
static Result restoreDataParser(char const* ptr, char const* pos, static Result restoreDataParser(char const* ptr, char const* pos,
std::string const& collectionName, std::string& key, std::string const& collectionName, int line,
std::string& key,
VPackBuilder& builder, VPackSlice& doc, VPackBuilder& builder, VPackSlice& doc,
TRI_replication_operation_e& type) { TRI_replication_operation_e& type) {
builder.clear(); builder.clear();
@ -115,16 +116,11 @@ static Result restoreDataParser(char const* ptr, char const* pos,
try { try {
VPackParser parser(builder, builder.options); VPackParser parser(builder, builder.options);
parser.parse(ptr, static_cast<size_t>(pos - ptr)); parser.parse(ptr, static_cast<size_t>(pos - ptr));
} catch (VPackException const& ex) {
// Could not parse the given string
return Result{TRI_ERROR_HTTP_CORRUPTED_JSON,
"received invalid JSON data for collection '" +
collectionName + "': " + ex.what()};
} catch (std::exception const& ex) { } catch (std::exception const& ex) {
// Could not even build the string // Could not even build the string
return Result{TRI_ERROR_HTTP_CORRUPTED_JSON, return Result{TRI_ERROR_HTTP_CORRUPTED_JSON,
"received invalid JSON data for collection '" + "received invalid JSON data for collection '" +
collectionName + "': " + ex.what()}; collectionName + "' on line " + std::to_string(line) + ": " + ex.what()};
} catch (...) { } catch (...) {
return Result{TRI_ERROR_INTERNAL}; return Result{TRI_ERROR_INTERNAL};
} }
@ -134,7 +130,7 @@ static Result restoreDataParser(char const* ptr, char const* pos,
if (!slice.isObject()) { if (!slice.isObject()) {
return Result{TRI_ERROR_HTTP_CORRUPTED_JSON, return Result{TRI_ERROR_HTTP_CORRUPTED_JSON,
"received invalid JSON data for collection '" + "received invalid JSON data for collection '" +
collectionName + "': data is no object"}; collectionName + "' on line " + std::to_string(line) + ": data is no object"};
} }
type = REPLICATION_INVALID; type = REPLICATION_INVALID;
@ -143,7 +139,7 @@ static Result restoreDataParser(char const* ptr, char const* pos,
if (!pair.key.isString()) { if (!pair.key.isString()) {
return Result{TRI_ERROR_HTTP_CORRUPTED_JSON, return Result{TRI_ERROR_HTTP_CORRUPTED_JSON,
"received invalid JSON data for collection '" + "received invalid JSON data for collection '" +
collectionName + "': got a non-string key"}; collectionName + "' on line " + std::to_string(line) + ": got a non-string key"};
} }
if (pair.key.isEqualString(::typeString)) { if (pair.key.isEqualString(::typeString)) {
@ -174,13 +170,13 @@ static Result restoreDataParser(char const* ptr, char const* pos,
if (type == REPLICATION_MARKER_DOCUMENT && !doc.isObject()) { if (type == REPLICATION_MARKER_DOCUMENT && !doc.isObject()) {
return Result{TRI_ERROR_HTTP_BAD_PARAMETER, return Result{TRI_ERROR_HTTP_BAD_PARAMETER,
"got document marker without contents"}; "got document marker without object contents for collection '" + collectionName + "' on line " + std::to_string(line) + ": " + doc.toJson()};
} }
if (key.empty()) { if (key.empty()) {
return Result{TRI_ERROR_HTTP_BAD_PARAMETER, return Result{TRI_ERROR_HTTP_BAD_PARAMETER,
"received invalid JSON data for collection '" + "received invalid JSON data for collection '" +
collectionName + "': empty key"}; collectionName + "' on line " + std::to_string(line) + ": empty key"};
} }
return Result{TRI_ERROR_NO_ERROR}; return Result{TRI_ERROR_NO_ERROR};
@ -1209,6 +1205,7 @@ Result RestReplicationHandler::parseBatch(std::string const& collectionName,
// entry. // entry.
{ {
int line = 0;
VPackArrayBuilder guard(&allMarkers); VPackArrayBuilder guard(&allMarkers);
std::string key; std::string key;
while (ptr < end) { while (ptr < end) {
@ -1218,6 +1215,7 @@ Result RestReplicationHandler::parseBatch(std::string const& collectionName,
pos = end; pos = end;
} else { } else {
*((char*)pos) = '\0'; *((char*)pos) = '\0';
++line;
} }
if (pos - ptr > 1) { if (pos - ptr > 1) {
@ -1226,7 +1224,7 @@ Result RestReplicationHandler::parseBatch(std::string const& collectionName,
VPackSlice doc; VPackSlice doc;
TRI_replication_operation_e type = REPLICATION_INVALID; TRI_replication_operation_e type = REPLICATION_INVALID;
Result res = restoreDataParser(ptr, pos, collectionName, key, builder, doc, type); Result res = restoreDataParser(ptr, pos, collectionName, line, key, builder, doc, type);
if (res.fail()) { if (res.fail()) {
return res; return res;
} }