Prior to this CL, upb MiniDescriptors only allowed per-message control over UTF-8. This CL adds a new field-level modifier to upb MiniDescriptors that can flip a field to the opposite of the message default, like we already have for packed, allowing per-field control over UTF-8 validation. PiperOrigin-RevId: 566638331pull/14134/head
Joshua Haberman
1 year ago
committed by
Copybara-Service
parent
df77c90305
commit
0f02930475
10 changed files with 335 additions and 3 deletions
@ -0,0 +1,149 @@ |
||||
// Protocol Buffers - Google's data interchange format
|
||||
// Copyright 2023 Google LLC. All rights reserved.
|
||||
// https://developers.google.com/protocol-buffers/
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without
|
||||
// modification, are permitted provided that the following conditions are
|
||||
// met:
|
||||
//
|
||||
// * Redistributions of source code must retain the above copyright
|
||||
// notice, this list of conditions and the following disclaimer.
|
||||
// * Redistributions in binary form must reproduce the above
|
||||
// copyright notice, this list of conditions and the following disclaimer
|
||||
// in the documentation and/or other materials provided with the
|
||||
// distribution.
|
||||
// * Neither the name of Google LLC nor the names of its
|
||||
// contributors may be used to endorse or promote products derived from
|
||||
// this software without specific prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
#include <stdlib.h> |
||||
|
||||
#include "gtest/gtest.h" |
||||
#include "upb/upb/base/string_view.h" |
||||
#include "upb/upb/mem/arena.h" |
||||
#include "upb/upb/mem/arena.hpp" |
||||
#include "upb/upb/message/utf8_test.upb.h" |
||||
#include "upb/upb/wire/decode.h" |
||||
|
||||
namespace { |
||||
|
||||
const char bad_utf8[] = "\xff"; |
||||
|
||||
static char* GetBadUtf8Payload(upb_Arena* arena, size_t* size) { |
||||
upb_test_TestUtf8Bytes* msg = upb_test_TestUtf8Bytes_new(arena); |
||||
upb_test_TestUtf8Bytes_set_data(msg, upb_StringView_FromString(bad_utf8)); |
||||
char* data = upb_test_TestUtf8Bytes_serialize(msg, arena, size); |
||||
EXPECT_TRUE(data != nullptr); |
||||
return data; |
||||
} |
||||
|
||||
TEST(Utf8Test, BytesFieldDoesntValidate) { |
||||
upb::Arena arena; |
||||
size_t size; |
||||
char* data = GetBadUtf8Payload(arena.ptr(), &size); |
||||
upb_test_TestUtf8Bytes* msg2 = |
||||
upb_test_TestUtf8Bytes_parse(data, size, arena.ptr()); |
||||
|
||||
// Parse succeeds, because the bytes field does not validate UTF-8.
|
||||
ASSERT_TRUE(msg2 != nullptr); |
||||
} |
||||
|
||||
TEST(Utf8Test, Proto3FieldValidates) { |
||||
upb::Arena arena; |
||||
size_t size; |
||||
char* data = GetBadUtf8Payload(arena.ptr(), &size); |
||||
|
||||
upb_test_TestUtf8Proto3String* msg = |
||||
upb_test_TestUtf8Proto3String_new(arena.ptr()); |
||||
|
||||
upb_DecodeStatus status = |
||||
upb_Decode(data, size, msg, &upb_test_TestUtf8Proto3String_msg_init, |
||||
nullptr, 0, arena.ptr()); |
||||
|
||||
// Parse fails, because proto3 string fields validate UTF-8.
|
||||
ASSERT_EQ(kUpb_DecodeStatus_BadUtf8, status); |
||||
} |
||||
|
||||
TEST(Utf8Test, RepeatedProto3FieldValidates) { |
||||
upb::Arena arena; |
||||
size_t size; |
||||
char* data = GetBadUtf8Payload(arena.ptr(), &size); |
||||
|
||||
upb_test_TestUtf8RepeatedProto3String* msg = |
||||
upb_test_TestUtf8RepeatedProto3String_new(arena.ptr()); |
||||
|
||||
upb_DecodeStatus status = upb_Decode( |
||||
data, size, msg, &upb_test_TestUtf8RepeatedProto3String_msg_init, nullptr, |
||||
0, arena.ptr()); |
||||
|
||||
// Parse fails, because proto3 string fields validate UTF-8.
|
||||
ASSERT_EQ(kUpb_DecodeStatus_BadUtf8, status); |
||||
} |
||||
|
||||
// begin:google_only
|
||||
// TEST(Utf8Test, Proto3MixedFieldValidates) {
|
||||
// upb::Arena arena;
|
||||
// size_t size;
|
||||
// char* data = GetBadUtf8Payload(arena.ptr(), &size);
|
||||
//
|
||||
// upb_test_TestUtf8Proto3StringMixed* msg =
|
||||
// upb_test_TestUtf8Proto3StringMixed_new(arena.ptr());
|
||||
//
|
||||
// upb_DecodeStatus status =
|
||||
// upb_Decode(data, size, msg, &upb_test_TestUtf8Proto3StringMixed_msg_init,
|
||||
// nullptr, 0, arena.ptr());
|
||||
//
|
||||
// // Parse fails, because proto3 string fields validate UTF-8.
|
||||
// ASSERT_EQ(kUpb_DecodeStatus_BadUtf8, status);
|
||||
// }
|
||||
//
|
||||
// TEST(Utf8Test, EnforceUtf8Options) {
|
||||
// upb::Arena arena;
|
||||
// size_t size;
|
||||
// char* data = GetBadUtf8Payload(arena.ptr(), &size);
|
||||
// upb_test_TestUtf8Proto3StringEnforceUtf8False* msg2 =
|
||||
// upb_test_TestUtf8Proto3StringEnforceUtf8False_parse(data, size,
|
||||
// arena.ptr());
|
||||
//
|
||||
// // Parse succeeds, because enforce_utf8=false inhibits utf-8 validation.
|
||||
// ASSERT_TRUE(msg2 != nullptr);
|
||||
// }
|
||||
//
|
||||
// TEST(Utf8Test, RepeatedEnforceUtf8Options) {
|
||||
// upb::Arena arena;
|
||||
// size_t size;
|
||||
// char* data = GetBadUtf8Payload(arena.ptr(), &size);
|
||||
// upb_test_TestUtf8RepeatedProto3StringEnforceUtf8False* msg2 =
|
||||
// upb_test_TestUtf8RepeatedProto3StringEnforceUtf8False_parse(data, size,
|
||||
// arena.ptr());
|
||||
//
|
||||
// // Parse succeeds, because enforce_utf8=false inhibits utf-8 validation.
|
||||
// ASSERT_TRUE(msg2 != nullptr);
|
||||
// }
|
||||
//
|
||||
// TEST(Utf8Test, EnforceUtf8OptionsMixed) {
|
||||
// upb::Arena arena;
|
||||
// size_t size;
|
||||
// char* data = GetBadUtf8Payload(arena.ptr(), &size);
|
||||
// upb_test_TestUtf8Proto3StringEnforceUtf8FalseMixed* msg2 =
|
||||
// upb_test_TestUtf8Proto3StringEnforceUtf8FalseMixed_parse(data, size,
|
||||
// arena.ptr());
|
||||
//
|
||||
// // Parse succeeds, because enforce_utf8=false inhibits utf-8 validation.
|
||||
// ASSERT_TRUE(msg2 != nullptr);
|
||||
// }
|
||||
// end:google_only
|
||||
|
||||
} // namespace
|
||||
@ -0,0 +1,71 @@ |
||||
// Protocol Buffers - Google's data interchange format |
||||
// Copyright 2023 Google LLC. All rights reserved. |
||||
// https://developers.google.com/protocol-buffers/ |
||||
// |
||||
// Redistribution and use in source and binary forms, with or without |
||||
// modification, are permitted provided that the following conditions are |
||||
// met: |
||||
// |
||||
// * Redistributions of source code must retain the above copyright |
||||
// notice, this list of conditions and the following disclaimer. |
||||
// * Redistributions in binary form must reproduce the above |
||||
// copyright notice, this list of conditions and the following disclaimer |
||||
// in the documentation and/or other materials provided with the |
||||
// distribution. |
||||
// * Neither the name of Google LLC nor the names of its |
||||
// contributors may be used to endorse or promote products derived from |
||||
// this software without specific prior written permission. |
||||
// |
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
||||
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
||||
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
||||
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
||||
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
||||
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
||||
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
||||
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
|
||||
syntax = "proto3"; |
||||
|
||||
package upb_test; |
||||
|
||||
message TestUtf8Bytes { |
||||
optional bytes data = 1; |
||||
} |
||||
|
||||
message TestUtf8Proto3String { |
||||
optional string data = 1; |
||||
} |
||||
|
||||
message TestUtf8RepeatedProto3String { |
||||
repeated string data = 1; |
||||
} |
||||
|
||||
// begin:google_only |
||||
message TestUtf8Proto3StringMixed { |
||||
optional string data = 1; |
||||
|
||||
// Add other fields with different enforce_utf8 values, to ensure we can |
||||
// handle the mix. |
||||
optional string other_data = 2; |
||||
} |
||||
|
||||
message TestUtf8Proto3StringEnforceUtf8False { |
||||
optional string data = 1; |
||||
} |
||||
|
||||
message TestUtf8RepeatedProto3StringEnforceUtf8False { |
||||
optional string data = 1; |
||||
} |
||||
|
||||
message TestUtf8Proto3StringEnforceUtf8FalseMixed { |
||||
optional string data = 1; |
||||
|
||||
// Add other fields with different enforce_utf8 values, to ensure we can |
||||
// handle the mix. |
||||
optional string other_data = 2; |
||||
} |
||||
// end:google_only |
||||
Loading…
Reference in new issue