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

Backport "Prevent Infinite Loop in OverlappingFieldsCanBeMergedRule" to v15 #4000

Merged
merged 2 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 45 additions & 0 deletions src/validation/__tests__/OverlappingFieldsCanBeMergedRule-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -1011,18 +1011,63 @@ describe('Validate: Overlapping fields can be merged', () => {

it('does not infinite loop on recursive fragment', () => {
expectValid(`
{
...fragA
}

fragment fragA on Human { name, relatives { name, ...fragA } }
`);
});

it('does not infinite loop on immediately recursive fragment', () => {
expectValid(`
{
...fragA
}

fragment fragA on Human { name, ...fragA }
`);
});

it('does not infinite loop on recursive fragment with a field named after fragment', () => {
expectValid(`
{
...fragA
fragA
}
fragment fragA on Query { ...fragA }
`);
});

it('finds invalid cases even with field named after fragment', () => {
expectErrors(`
{
fragA
...fragA
}

fragment fragA on Type {
fragA: b
}
`).to.deep.equal([
{
message:
'Fields "fragA" conflict because "fragA" and "b" are different fields. Use different aliases on the fields to fetch both if this was intentional.',
locations: [
{ line: 3, column: 9 },
{ line: 8, column: 9 },
],
},
]);
});

it('does not infinite loop on transitively recursive fragment', () => {
expectValid(`
{
...fragA
fragB
}

fragment fragA on Human { name, ...fragB }
fragment fragB on Human { name, ...fragC }
fragment fragC on Human { name, ...fragA }
Expand Down
18 changes: 18 additions & 0 deletions src/validation/rules/OverlappingFieldsCanBeMergedRule.js
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,24 @@ function collectConflictsBetweenFieldsAndFragment(
// (E) Then collect any conflicts between the provided collection of fields
// and any fragment names found in the given fragment.
for (let i = 0; i < fragmentNames2.length; i++) {
const referencedFragmentName = fragmentNames2[i];

// Memoize so two fragments are not compared for conflicts more than once.
if (
comparedFragmentPairs.has(
referencedFragmentName,
fragmentName,
areMutuallyExclusive,
)
) {
continue;
}
comparedFragmentPairs.add(
referencedFragmentName,
fragmentName,
areMutuallyExclusive,
);

collectConflictsBetweenFieldsAndFragment(
context,
conflicts,
Expand Down
Loading