Skip to content

Reject non-ASCII characters in GraphQL name validation #10389

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.

Sign up for GitHub

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

Merged
glen-84 merged 1 commit into from
Sep 14, 2026
Merged

Reject non-ASCII characters in GraphQL name validation #10389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/HotChocolate/Primitives/src/Primitives/Utilities/NameUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public static bool IsValidGraphQLName(this in ReadOnlySpan<byte> name)

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static bool IsLetterOrDigitOrUnderscore(this char c)
=> IsLetterOrDigitOrUnderscore((byte)c);
=> c is >= 'a' and <= 'z' or >= 'A' and <= 'Z' or >= '0' and <= '9' or '_';

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static bool IsLetterOrDigitOrUnderscore(this byte c)
Expand Down Expand Up @@ -188,5 +188,5 @@ private static bool IsLetterOrUnderscore(this byte c)

[MethodImpl(MethodImplOptions.AggressiveInlining)]
private static bool IsLetterOrUnderscore(this char c)
=> IsLetterOrUnderscore((byte)c);
=> c is >= 'a' and <= 'z' or >= 'A' and <= 'Z' or '_';
}
18 changes: 18 additions & 0 deletions src/HotChocolate/Primitives/test/Primitives.Tests/NameUtilsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ public class NameUtilsTests
[InlineData("1_Bar")]
[InlineData("B/ar")]
[InlineData("B+ar")]
[InlineData("Łar")]
[InlineData("Bŗar")]
[InlineData("Bİar")]
public void InvalidName(string name)
{
var message = Assert.Throws<ArgumentException>(() => name.EnsureGraphQLName()).Message;
Expand All @@ -33,4 +36,19 @@ public void ValidName(string name)
{
name.EnsureGraphQLName();
}

[Theory]
[InlineData("Łar", "_ar")]
[InlineData("Bŗar", "B_ar")]
[InlineData("Bİar", "B_ar")]
public void MakeValidGraphQLName_Should_ReplaceTheCharacter_When_ItIsNotAnAsciiNameCharacter(
string name,
string expected)
{
// act
var result = NameUtils.MakeValidGraphQLName(name);

// assert
Assert.Equal(expected, result);
}
}
Loading