Skip to content

Fix UrlAttribute handling of relative Uris #115234

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
merged 4 commits into from
May 3, 2025
Merged

Fix UrlAttribute handling of relative Uris #115234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f42f2f4
Update UrlAttribute.cs
MihaZupan May 2, 2025
e0bcd1b
Update UrlAttributeTests.cs
MihaZupan May 2, 2025
21d80b4
Fix the test
MihaZupan May 2, 2025
c865cbb
Merge branch 'main' into urlattribute-absolute
MihaZupan May 2, 2025
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
2 changes: 1 addition & 1 deletion ...stem.ComponentModel.Annotations/src/System/ComponentModel/DataAnnotations/UrlAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public override bool IsValid(object? value)
{
switch (value)
{
case Uri valueAsUri:
case Uri valueAsUri when valueAsUri.IsAbsoluteUri:
{
return valueAsUri.Scheme == Uri.UriSchemeHttp
|| valueAsUri.Scheme == Uri.UriSchemeHttps
Expand Down
2 changes: 2 additions & 0 deletions ...mponentModel.Annotations/tests/System/ComponentModel/DataAnnotations/UrlAttributeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ protected override IEnumerable<TestCase> InvalidValues()
yield return new TestCase(new UrlAttribute(), new object());
yield return new TestCase(new UrlAttribute(), new Uri("file:///foo.bar"));
yield return new TestCase(new UrlAttribute(), new Uri("//foo.png"));
yield return new TestCase(new UrlAttribute(), new Uri("/foo.png", UriKind.RelativeOrAbsolute));
yield return new TestCase(new UrlAttribute(), new Uri("foo.png", UriKind.Relative));
}

[Fact]
Expand Down
Loading