Skip to content
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.

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

do not allow to extend same field twice to prevent the error #1784

Merged
merged 4 commits into from
Feb 7, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ coverage/
sandbox/
.nyc_output
dist/
.gitpod.yml
4 changes: 4 additions & 0 deletions src/root.js
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,10 @@ function tryHandleExtension(root, field) {
var extendedType = field.parent.lookup(field.extend);
if (extendedType) {
var sisterField = new Field(field.fullName, field.id, field.type, field.rule, undefined, field.options);
//do not allow to extend same field twice to prevent the error
if (extendedType.get(sisterField.name)) {
return true;
ThePlenkov marked this conversation as resolved.
Show resolved Hide resolved
}
sisterField.declaringField = field;
field.extensionField = sisterField;
extendedType.add(sisterField);
Expand Down
18 changes: 18 additions & 0 deletions tests/comp_import_extend.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
"use strict";
exports.__esModule = true;
var path = require("path");
var tape = require("tape");
var protobuf = require("../index");
// to extend Root
require("../ext/descriptor");
tape.test("extensions", function (test) {
// load document with extended field imported multiple times
var root = protobuf.loadSync(path.resolve(__dirname, "data/test-import-extend/main.proto"));
root.resolveAll();
// convert to Descriptor Set
var decodedDescriptorSet = root.toDescriptor("proto3");
// load back from descriptor set
var root2 = protobuf.Root.fromDescriptor(decodedDescriptorSet);
test.pass("should parse and resolve without errors");
test.end();
});
37 changes: 37 additions & 0 deletions tests/comp_import_extend.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import path = require("path");
import * as tape from "tape";

import * as protobuf from "../index";
import { IFileDescriptorSet } from "../ext/descriptor";
// to extend Root
require("../ext/descriptor");

interface Descriptor {
toDescriptor(
protoVersion: string
): protobuf.Message<IFileDescriptorSet> & IFileDescriptorSet;
fromDescriptor(
descriptor: IFileDescriptorSet | protobuf.Reader | Uint8Array
): protobuf.Root;
}

tape.test("extensions", function (test) {
// load document with extended field imported multiple times
const root = protobuf.loadSync(
path.resolve(__dirname, "data/test-import-extend/main.proto")
);
root.resolveAll();

// convert to Descriptor Set
const decodedDescriptorSet = (root as unknown as Descriptor).toDescriptor(
"proto3"
);

// load back from descriptor set
const root2 = (protobuf.Root as unknown as Descriptor).fromDescriptor(
decodedDescriptorSet
);

test.pass("should parse and resolve without errors");
test.end();
});
6 changes: 6 additions & 0 deletions tests/data/test-import-extend/main.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
syntax = "proto3";

package test.import.extend;

import "source_a.proto";
import "source_b.proto";
5 changes: 5 additions & 0 deletions tests/data/test-import-extend/source_a.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
syntax = "proto3";

package source.a;

import "validation.proto";
5 changes: 5 additions & 0 deletions tests/data/test-import-extend/source_b.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
syntax = "proto3";

package source.b;

import "validation.proto";
15 changes: 15 additions & 0 deletions tests/data/test-import-extend/validation.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
syntax = "proto3";

package validation;

import "../google/protobuf/descriptor.proto";

option java_package = "com.reserve.validation";
option java_outer_classname = "ValidationRules";

extend google.protobuf.FieldOptions { FieldRules rules = 70001; }

message FieldRules {
reserved 1;
reserved "optional";
}