Skip to content

src,test: fix JSON escaping in node-report #25626

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lundibundi wants to merge 3 commits into from
Closed

src,test: fix JSON escaping in node-report #25626

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
52a14fe
src,test: fix JSON escaping in node-report
lundibundi Jan 21, 2019
8f775a0
fixup! src,test: fix JSON escaping in node-report
lundibundi Jan 21, 2019
7415261
fixup! src,test: fix JSON escaping in node-report
lundibundi Jan 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions node.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -981,6 +981,7 @@
'test/cctest/test_node_postmortem_metadata.cc',
'test/cctest/test_environment.cc',
'test/cctest/test_platform.cc',
'test/cctest/test_report_util.cc',
'test/cctest/test_traced_value.cc',
'test/cctest/test_util.cc',
'test/cctest/test_url.cc'
Expand Down
53 changes: 33 additions & 20 deletions src/node_report_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,28 +271,41 @@ void WalkHandle(uv_handle_t* h, void* arg) {
writer->json_end();
}

static std::string findAndReplace(const std::string& str,
const std::string& old,
const std::string& neu) {
std::string ret = str;
std::string EscapeJsonChars(const std::string& str) {
std::string control_symbols[0x20] = {
Comment thread
lundibundi marked this conversation as resolved.
Resolved
"\\u0000", "\\u0001", "\\u0002", "\\u0003", "\\u0004", "\\u0005",
"\\u0006", "\\u0007", "\\b", "\\t", "\\n", "\\v", "\\f", "\\r",
"\\u000e", "\\u000f", "\\u0010", "\\u0011", "\\u0012", "\\u0013",
"\\u0014", "\\u0015", "\\u0016", "\\u0017", "\\u0018", "\\u0019",
"\\u001a", "\\u001b", "\\u001c", "\\u001d", "\\u001e", "\\u001f"
};

std::string ret = "";
size_t last_pos = 0;
size_t pos = 0;
while ((pos = ret.find(old, pos)) != std::string::npos) {
ret.replace(pos, old.length(), neu);
pos += neu.length();
for (; pos < str.size(); ++pos) {
std::string replace;
const char* ch = &str[pos];
Comment thread
lundibundi marked this conversation as resolved.
Resolved
if (*ch == '\\') {
replace = "\\\\";
} else if (*ch == '\"') {
replace = "\\\"";
} else {
size_t num = static_cast<size_t>(*ch);
if (num < 0x20) replace = control_symbols[num];
}
if (!replace.empty()) {
if (pos > last_pos) {
ret += str.substr(last_pos, pos - last_pos);
}
last_pos = pos + 1;
ret += replace;
}
}
// Append any remaining symbols.
if (last_pos < str.size()) {
ret += str.substr(last_pos, pos - last_pos);
}
return ret;
}

std::string EscapeJsonChars(const std::string& str) {
std::string ret = str;
ret = findAndReplace(ret, "\\", "\\\\");
ret = findAndReplace(ret, "\\u", "\\u");
ret = findAndReplace(ret, "\n", "\\n");
ret = findAndReplace(ret, "\f", "\\f");
ret = findAndReplace(ret, "\r", "\\r");
ret = findAndReplace(ret, "\b", "\\b");
ret = findAndReplace(ret, "\t", "\\t");
ret = findAndReplace(ret, "\"", "\\\"");
return ret;
}

Expand Down
26 changes: 26 additions & 0 deletions test/cctest/test_report_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#include "node_report_utils.cc"

#include "gtest/gtest.h"

TEST(ReportUtilTest, EscapeJsonChars) {
using report::EscapeJsonChars;
EXPECT_EQ("abc", EscapeJsonChars("abc"));
EXPECT_EQ("abc\\n", EscapeJsonChars("abc\n"));
EXPECT_EQ("abc\\nabc", EscapeJsonChars("abc\nabc"));
EXPECT_EQ("abc\\\\", EscapeJsonChars("abc\\"));
EXPECT_EQ("abc\\\"", EscapeJsonChars("abc\""));

std::string expected[0x20] = {
Comment thread
lundibundi marked this conversation as resolved.
Resolved
"\\u0000", "\\u0001", "\\u0002", "\\u0003", "\\u0004", "\\u0005",
"\\u0006", "\\u0007", "\\b", "\\t", "\\n", "\\v", "\\f", "\\r",
"\\u000e", "\\u000f", "\\u0010", "\\u0011", "\\u0012", "\\u0013",
"\\u0014", "\\u0015", "\\u0016", "\\u0017", "\\u0018", "\\u0019",
"\\u001a", "\\u001b", "\\u001c", "\\u001d", "\\u001e", "\\u001f"
};
for (int i = 0; i < 0x20; ++i) {
char symbols[1] = { i };
std::string input(symbols, 1);
EXPECT_EQ(expected[i], EscapeJsonChars(input));
EXPECT_EQ("a" + expected[i], EscapeJsonChars("a" + input));
}
}