Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Internal change.

Browse Source 
PiperOrigin-RevId: 575006343
pull/14488/head
Protobuf Team Bot 1 year ago committed by Copybara-Service
parent 1b7615905f
commit d617c03221
2 changed files with 88 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      src/google/protobuf/text_format.cc
  2. 72
      src/google/protobuf/text_format_unittest.cc

64
src/google/protobuf/text_format.cc
Unescape View File

@ -2769,7 +2769,12 @@ void TextFormat::Printer::PrintUnknownFields(
case UnknownField::TYPE_VARINT:
OutOfLinePrintString(generator, field.number());
generator->PrintMaybeWithMarker(MarkerToken(), ": ");
OutOfLinePrintString(generator, field.varint());
if (redact_debug_string_) {
OutOfLinePrintString(generator, "UNKNOWN_VARINT ");
OutOfLinePrintString(generator, kFieldValueReplacement);
} else {
OutOfLinePrintString(generator, field.varint());
}
if (single_line_mode_) {
generator->PrintLiteral(" ");
} else {
@ -2778,9 +2783,15 @@ void TextFormat::Printer::PrintUnknownFields(
break;
case UnknownField::TYPE_FIXED32: {
OutOfLinePrintString(generator, field.number());
generator->PrintMaybeWithMarker(MarkerToken(), ": ", "0x");
OutOfLinePrintString(generator,
absl::Hex(field.fixed32(), absl::kZeroPad8));
if (redact_debug_string_) {
generator->PrintMaybeWithMarker(MarkerToken(), ": ",
"UNKNOWN_FIXED32 ");
OutOfLinePrintString(generator, kFieldValueReplacement);
} else {
generator->PrintMaybeWithMarker(MarkerToken(), ": ", "0x");
OutOfLinePrintString(generator,
absl::Hex(field.fixed32(), absl::kZeroPad8));
}
if (single_line_mode_) {
generator->PrintLiteral(" ");
} else {
@ -2790,9 +2801,15 @@ void TextFormat::Printer::PrintUnknownFields(
}
case UnknownField::TYPE_FIXED64: {
OutOfLinePrintString(generator, field.number());
generator->PrintMaybeWithMarker(MarkerToken(), ": ", "0x");
OutOfLinePrintString(generator,
absl::Hex(field.fixed64(), absl::kZeroPad16));
if (redact_debug_string_) {
generator->PrintMaybeWithMarker(MarkerToken(), ": ",
"UNKNOWN_FIXED64 ");
OutOfLinePrintString(generator, kFieldValueReplacement);
} else {
generator->PrintMaybeWithMarker(MarkerToken(), ": ", "0x");
OutOfLinePrintString(generator,
absl::Hex(field.fixed64(), absl::kZeroPad16));
}
if (single_line_mode_) {
generator->PrintLiteral(" ");
} else {
@ -2814,6 +2831,17 @@ void TextFormat::Printer::PrintUnknownFields(
embedded_unknown_fields.ParseFromCodedStream(&input_stream)) {
// This field is parseable as a Message.
// So it is probably an embedded message.
if (redact_debug_string_) {
generator->PrintMaybeWithMarker(MarkerToken(), ": ",
"UNKNOWN_MESSAGE ");
OutOfLinePrintString(generator, kFieldValueReplacement);
if (single_line_mode_) {
generator->PrintLiteral(" ");
} else {
generator->PrintLiteral("\n");
}
break;
}
if (single_line_mode_) {
generator->PrintMaybeWithMarker(MarkerToken(), " ", "{ ");
} else {
@ -2831,6 +2859,17 @@ void TextFormat::Printer::PrintUnknownFields(
} else {
// This field is not parseable as a Message (or we ran out of
// recursion budget). So it is probably just a plain string.
if (redact_debug_string_) {
generator->PrintMaybeWithMarker(MarkerToken(), ": ",
"UNKNOWN_STRING ");
OutOfLinePrintString(generator, kFieldValueReplacement);
if (single_line_mode_) {
generator->PrintLiteral(" ");
} else {
generator->PrintLiteral("\n");
}
break;
}
generator->PrintMaybeWithMarker(MarkerToken(), ": ", "\"");
generator->PrintString(absl::CEscape(value));
if (single_line_mode_) {
@ -2843,6 +2882,17 @@ void TextFormat::Printer::PrintUnknownFields(
}
case UnknownField::TYPE_GROUP:
OutOfLinePrintString(generator, field.number());
if (redact_debug_string_) {
generator->PrintMaybeWithMarker(MarkerToken(), ": ",
"UNKNOWN_GROUP ");
OutOfLinePrintString(generator, kFieldValueReplacement);
if (single_line_mode_) {
generator->PrintLiteral(" ");
} else {
generator->PrintLiteral("\n");
}
break;
}
if (single_line_mode_) {
generator->PrintMaybeWithMarker(MarkerToken(), " ", "{ ");
} else {

72
src/google/protobuf/text_format_unittest.cc
Unescape View File

@ -69,6 +69,8 @@ constexpr absl::string_view kEscapeTestStringEscaped =
"\"\\\"A string with \\' characters \\n and \\r newlines "
"and \\t tabs and \\001 slashes \\\\ and multiple spaces\"";
constexpr absl::string_view value_replacement = "\\[REDACTED\\]";
class TextFormatTest : public testing::Test {
public:
static void SetUpTestSuite() {
@ -172,35 +174,24 @@ TEST_F(TextFormatTest, ShortFormat) {
std::string value_replacement = "\\[REDACTED\\]";
EXPECT_THAT(google::protobuf::ShortFormat(proto),
testing::MatchesRegex(
"optional_redacted_string: " +
value_replacement +
" "
testing::MatchesRegex(absl::Substitute(
"optional_redacted_string: $0 "
"optional_unredacted_string: \"bar\" "
"repeated_redacted_string: " +
value_replacement +
" "
"repeated_redacted_string: " +
value_replacement +
" "
"repeated_redacted_string: $0 "
"repeated_redacted_string: $0 "
"repeated_unredacted_string: \"3\" "
"repeated_unredacted_string: \"4\" "
"optional_redacted_message: " +
value_replacement +
" "
"optional_redacted_message: $0 "
"optional_unredacted_message \\{ "
"optional_unredacted_nested_string: \"world\" \\} "
"repeated_redacted_message: " +
value_replacement +
" "
"repeated_redacted_message: $0 "
"repeated_unredacted_message "
"\\{ optional_unredacted_nested_string: \"7\" \\} "
"repeated_unredacted_message "
"\\{ optional_unredacted_nested_string: \"8\" \\} "
"map_redacted_string: " +
value_replacement +
" "
"map_unredacted_string \\{ key: \"ghi\" value: \"jkl\" \\}"));
"map_redacted_string: $0 "
"map_unredacted_string \\{ key: \"ghi\" value: \"jkl\" \\}",
value_replacement)));
}
TEST_F(TextFormatTest, Utf8Format) {
@ -234,39 +225,27 @@ TEST_F(TextFormatTest, Utf8Format) {
(*proto.mutable_map_redacted_string())["abc"] = "def";
(*proto.mutable_map_unredacted_string())["ghi"] = "jkl";
std::string value_replacement = "\\[REDACTED\\]";
EXPECT_THAT(google::protobuf::Utf8Format(proto),
testing::MatchesRegex(
"optional_redacted_string: " +
value_replacement +
"\n"
testing::MatchesRegex(absl::Substitute(
"optional_redacted_string: $0\n"
"optional_unredacted_string: \"bar\"\n"
"repeated_redacted_string: " +
value_replacement +
"\n"
"repeated_redacted_string: " +
value_replacement +
"\n"
"repeated_redacted_string: $0\n"
"repeated_redacted_string: $0\n"
"repeated_unredacted_string: \"3\"\n"
"repeated_unredacted_string: \"4\"\n"
"optional_redacted_message: " +
value_replacement +
"\n"
"optional_redacted_message: $0\n"
"optional_unredacted_message \\{\n "
"optional_unredacted_nested_string: "
"\"\xE8\xB0\xB7\xE6\xAD\x8C\"\n\\}\n"
"repeated_redacted_message: " +
value_replacement +
"\n"
"repeated_redacted_message: $0\n"
"repeated_unredacted_message \\{\n "
"optional_unredacted_nested_string: \"7\"\n\\}\n"
"repeated_unredacted_message \\{\n "
"optional_unredacted_nested_string: \"8\"\n\\}\n"
"map_redacted_string: " +
value_replacement +
"\n"
"map_redacted_string: $0\n"
"map_unredacted_string \\{\n "
"key: \"ghi\"\n value: \"jkl\"\n\\}\n"));
"key: \"ghi\"\n value: \"jkl\"\n\\}\n",
value_replacement)));
}
TEST_F(TextFormatTest, ShortPrimitiveRepeateds) {
@ -402,6 +381,17 @@ TEST_F(TextFormatTest, PrintUnknownFields) {
"8: 2\n"
"8: 3\n"),
message.DebugString());
EXPECT_THAT(absl::StrCat(message), testing::MatchesRegex(absl::Substitute(
"5: UNKNOWN_VARINT $0\n"
"5: UNKNOWN_FIXED32 $0\n"
"5: UNKNOWN_FIXED64 $0\n"
"5: UNKNOWN_STRING $0\n"
"5: UNKNOWN_GROUP $0\n"
"8: UNKNOWN_VARINT $0\n"
"8: UNKNOWN_VARINT $0\n"
"8: UNKNOWN_VARINT $0\n",
value_replacement)));
}
TEST_F(TextFormatTest, PrintUnknownFieldsDeepestStackWorks) {

Write Preview
Loading…
Cancel
Save