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.

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

Jump to bottom

🐛 (TfsEndpointOptions.cs): improve URL validation logic for Collection property #2388

Merged
merged 3 commits into from
Sep 23, 2024
Merged

🐛 (TfsEndpointOptions.cs): improve URL validation logic for Collection property #2388

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8f0fd4
🐛 (TfsEndpointOptions.cs): improve URL validation logic for Collectio…
MrHinsh Sep 23, 2024
16f3ed6
Merge branch 'main' into topic/update-url-validtor
MrHinsh Sep 23, 2024
43559bb
Add Uri.UnescapeDataString(options.Collection.ToString())
MrHinsh Sep 23, 2024
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
12 changes: 9 additions & 3 deletions src/MigrationTools.Clients.TfsObjectModel/Endpoints/TfsEndpointOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text.Encodings.Web;
using Microsoft.Extensions.Options;
using MigrationTools.Endpoints.Infrastructure;
using Newtonsoft.Json;
Expand Down Expand Up @@ -42,9 +43,14 @@ public ValidateOptionsResult Validate(string name, TfsEndpointOptions options)
{
errors.Add("The Collection property must not be null.");
}
else if (!Uri.IsWellFormedUriString(options.Collection.ToString(), UriKind.Absolute))
else
{
errors.Add("The Collection property must be a valid URL.");
Uri output;
if (!Uri.TryCreate(Uri.UnescapeDataString(options.Collection.ToString()), UriKind.Absolute, out output))
{
errors.Add("The Collection property must be a valid URL.");
}

}

// Validate Project - Must not be null or empty
Expand All @@ -66,7 +72,7 @@ public ValidateOptionsResult Validate(string name, TfsEndpointOptions options)
}
else
{
ValidateOptionsResult lmr= options.LanguageMaps.Validate(name, options.LanguageMaps);
ValidateOptionsResult lmr = options.LanguageMaps.Validate(name, options.LanguageMaps);
if (lmr != ValidateOptionsResult.Success)
{
errors.AddRange(lmr.Failures);
Expand Down
Loading