Chiebot-Mirror
/
protobuf
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Internal change

Browse Source 
PiperOrigin-RevId: 698068189
pull/19268/head
Protobuf Team Bot 4 months ago committed by Copybara-Service
parent ec5acb686c
commit 13157d471c
5 changed files with 52 additions and 44 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. 17
      csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
  2. 13
      src/google/protobuf/compiler/command_line_interface.cc
  3. 8
      src/google/protobuf/descriptor.cc
  4. 28
      src/google/protobuf/descriptor.h
  5. 30
      src/google/protobuf/descriptor_unittest.cc

17
csharp/src/Google.Protobuf/Reflection/FeatureSetDescriptor.g.cs
Unescape View File

@ -1,17 +0,0 @@
#region Copyright notice and license
// Protocol Buffers - Google's data interchange format
// Copyright 2008 Google Inc. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
#endregion
namespace Google.Protobuf.Reflection;
internal sealed partial class FeatureSetDescriptor
{
// Canonical serialized form of the edition defaults, generated by embed_edition_defaults.
private const string DefaultsBase64 =
"ChMYhAciACoMCAEQAhgCIAMoATACChMY5wciACoMCAIQARgBIAIoATABChMY6AciDAgBEAEYASACKAEwASoAIOYHKOgH";
}

13
src/google/protobuf/compiler/command_line_interface.cc
Unescape View File

@ -1253,12 +1253,13 @@ int CommandLineInterface::Run(int argc, const char* const argv[]) {
return EXIT_FAILURE;
}
// Enforce extension declarations only when compiling. We want to skip
// this enforcement when protoc is just being invoked to encode or decode
// protos.
if (mode_ == MODE_COMPILE
) {
descriptor_pool->EnforceExtensionDeclarations(true);
// Enforce extension declarations only when compiling. We want to skip this
// enforcement when protoc is just being invoked to encode or decode
// protos. If allowlist is disabled, we will not check for descriptor
// extensions declarations, either.
if (mode_ == MODE_COMPILE) {
descriptor_pool->EnforceExtensionDeclarations(
ExtDeclEnforcementLevel::kCustomExtensions);
}
if (!ParseInputFiles(descriptor_pool.get(), disk_source_tree.get(),
&parsed_files)) {

8
src/google/protobuf/descriptor.cc
Unescape View File

@ -2104,7 +2104,7 @@ DescriptorPool::DescriptorPool()
lazily_build_dependencies_(false),
allow_unknown_(false),
enforce_weak_(false),
enforce_extension_declarations_(false),
enforce_extension_declarations_(ExtDeclEnforcementLevel::kNoEnforcement),
disallow_enforce_utf8_(false),
deprecated_legacy_json_field_conflicts_(false) {}
@ -2119,7 +2119,7 @@ DescriptorPool::DescriptorPool(DescriptorDatabase* fallback_database,
lazily_build_dependencies_(false),
allow_unknown_(false),
enforce_weak_(false),
enforce_extension_declarations_(false),
enforce_extension_declarations_(ExtDeclEnforcementLevel::kNoEnforcement),
disallow_enforce_utf8_(false),
deprecated_legacy_json_field_conflicts_(false) {}
@ -2133,7 +2133,7 @@ DescriptorPool::DescriptorPool(const DescriptorPool* underlay)
lazily_build_dependencies_(false),
allow_unknown_(false),
enforce_weak_(false),
enforce_extension_declarations_(false),
enforce_extension_declarations_(ExtDeclEnforcementLevel::kNoEnforcement),
disallow_enforce_utf8_(false),
deprecated_legacy_json_field_conflicts_(false) {}
@ -8045,7 +8045,7 @@ void DescriptorBuilder::ValidateOptions(const FieldDescriptor* field,
return;
}
if (pool_->enforce_extension_declarations_) {
if (pool_->EnforceCustomExtensionDeclarations()) {
for (const auto& declaration : extension_range->options_->declaration()) {
if (declaration.number() != field->number()) continue;
if (declaration.reserved()) {

28
src/google/protobuf/descriptor.h
Unescape View File

@ -2041,6 +2041,18 @@ class PROTOBUF_EXPORT FileDescriptor : private internal::SymbolBase {
PROTOBUF_INTERNAL_CHECK_CLASS_SIZE(FileDescriptor, 168);
#ifndef SWIG
enum class ExtDeclEnforcementLevel : uint8_t {
// No enforcement.
kNoEnforcement = 0,
// All extensions excluding descriptor.proto extensions
// (go/extension-declarations#descriptor-proto)
kCustomExtensions = 1,
// All extensions including descriptor.proto extensions.
kAllExtensions = 2,
};
#endif // !SWIG
// ===================================================================
// Used to construct descriptors.
@ -2266,10 +2278,22 @@ class PROTOBUF_EXPORT DescriptorPool {
// This enforcement is disabled by default because it requires full
// descriptors with source-retention options, which are generally not
// available at runtime.
void EnforceExtensionDeclarations(bool enforce) {
void EnforceExtensionDeclarations(google::protobuf::ExtDeclEnforcementLevel enforce) {
enforce_extension_declarations_ = enforce;
}
bool EnforceDescriptorExtensionDeclarations() const {
return enforce_extension_declarations_ ==
ExtDeclEnforcementLevel::kAllExtensions;
}
bool EnforceCustomExtensionDeclarations() const {
return enforce_extension_declarations_ ==
ExtDeclEnforcementLevel::kAllExtensions ||
enforce_extension_declarations_ ==
ExtDeclEnforcementLevel::kCustomExtensions;
}
#ifndef SWIG
// Dispatch recursive builds to a callback that may stick them onto a separate
// thread. This is primarily to avoid stack overflows on untrusted inputs.
@ -2484,7 +2508,7 @@ class PROTOBUF_EXPORT DescriptorPool {
bool lazily_build_dependencies_;
bool allow_unknown_;
bool enforce_weak_;
bool enforce_extension_declarations_;
ExtDeclEnforcementLevel enforce_extension_declarations_;
bool disallow_enforce_utf8_;
bool deprecated_legacy_json_field_conflicts_;
mutable bool build_started_ = false;

30
src/google/protobuf/descriptor_unittest.cc
Unescape View File

@ -4300,7 +4300,7 @@ class ValidationErrorTest : public testing::Test {
void SetUp() override {
// Enable extension declaration enforcement since most test cases want to
// exercise the full validation.
pool_.EnforceExtensionDeclarations(true);
pool_.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
}
// Parse file_text as a FileDescriptorProto in text format and add it
// to the DescriptorPool. Expect no errors.
@ -11735,7 +11735,7 @@ TEST_F(ValidationErrorTest, ExtensionDeclarationsMismatchFullNameAllowed) {
// Make sure that extension declaration names and types are not validated
// outside of protoc. This is important for allowing extensions to be renamed
// safely.
pool_.EnforceExtensionDeclarations(false);
pool_.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kNoEnforcement);
BuildFile(
R"pb(
name: "foo.proto"
@ -11921,7 +11921,7 @@ TEST_P(ExtensionDeclarationsTest, DotPrefixTypeCompile) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
EXPECT_NE(pool.BuildFile(*file_proto), nullptr);
}
@ -11954,7 +11954,7 @@ TEST_P(ExtensionDeclarationsTest, EnumTypeCompile) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
EXPECT_NE(pool.BuildFile(*file_proto), nullptr);
}
@ -11991,7 +11991,7 @@ TEST_P(ExtensionDeclarationsTest, MismatchEnumType) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
MockErrorCollector error_collector;
EXPECT_EQ(pool.BuildFileCollectingErrors(*file_proto, &error_collector),
nullptr);
@ -12027,7 +12027,7 @@ TEST_P(ExtensionDeclarationsTest, DotPrefixFullNameCompile) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
EXPECT_NE(pool.BuildFile(*file_proto), nullptr);
}
@ -12056,7 +12056,7 @@ TEST_P(ExtensionDeclarationsTest, MismatchDotPrefixTypeExpectingMessage) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
MockErrorCollector error_collector;
EXPECT_EQ(pool.BuildFileCollectingErrors(*file_proto, &error_collector),
nullptr);
@ -12086,7 +12086,7 @@ TEST_P(ExtensionDeclarationsTest, MismatchDotPrefixTypeExpectingNonMessage) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
MockErrorCollector error_collector;
EXPECT_EQ(pool.BuildFileCollectingErrors(*file_proto, &error_collector),
nullptr);
@ -12121,7 +12121,7 @@ TEST_P(ExtensionDeclarationsTest, MismatchMessageType) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
MockErrorCollector error_collector;
EXPECT_EQ(pool.BuildFileCollectingErrors(*file_proto, &error_collector),
nullptr);
@ -12151,7 +12151,7 @@ TEST_P(ExtensionDeclarationsTest, NonMessageTypeCompile) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
EXPECT_NE(pool.BuildFile(*file_proto), nullptr);
}
@ -12180,7 +12180,7 @@ TEST_P(ExtensionDeclarationsTest, MismatchNonMessageType) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
MockErrorCollector error_collector;
EXPECT_EQ(pool.BuildFileCollectingErrors(*file_proto, &error_collector),
nullptr);
@ -12215,7 +12215,7 @@ TEST_P(ExtensionDeclarationsTest, MismatchCardinalityExpectingRepeated) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
MockErrorCollector error_collector;
EXPECT_EQ(pool.BuildFileCollectingErrors(*file_proto, &error_collector),
nullptr);
@ -12255,7 +12255,7 @@ TEST_P(ExtensionDeclarationsTest, MismatchCardinalityExpectingOptional) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
MockErrorCollector error_collector;
EXPECT_EQ(pool.BuildFileCollectingErrors(*file_proto, &error_collector),
nullptr);
@ -12287,7 +12287,7 @@ TEST_P(ExtensionDeclarationsTest, TypeDoesNotLookLikeIdentifier) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
MockErrorCollector error_collector;
EXPECT_EQ(pool.BuildFileCollectingErrors(*file_proto, &error_collector),
nullptr);
@ -12333,7 +12333,7 @@ TEST_P(ExtensionDeclarationsTest, MultipleDeclarationsInARangeCompile) {
ASSERT_OK(file_proto);
DescriptorPool pool;
pool.EnforceExtensionDeclarations(true);
pool.EnforceExtensionDeclarations(ExtDeclEnforcementLevel::kAllExtensions);
EXPECT_NE(pool.BuildFile(*file_proto), nullptr);
}

Write Preview
Loading…
Cancel
Save