Skip to content

Fix missing encoding of project names in urls #1438

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
tmat merged 6 commits into from
Jul 9, 2025
Merged

Fix missing encoding of project names in urls #1438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1d6d427
url encode previously parsed url parts
mbxsuite May 21, 2025
1dbf39a
Update AzureDevOpsUrlParser.cs
mbxsuite May 21, 2025
0f33307
Merge pull request #1 from mbxsuite/mbxsuite-patch-1
mbxsuite May 21, 2025
fee6ad8
add test case
mbxsuite May 22, 2025
e48be1e
Merge pull request #2 from mbxsuite/bugfix/urlencode-rebuilt-url-parts
mbxsuite May 22, 2025
b46f9d7
Merge branch 'dotnet:main' into main
mbxsuite May 22, 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
6 changes: 3 additions & 3 deletions src/Common/AzureDevOps/AzureDevOpsUrlParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static bool TryParseHostedHttp(string host, string relativeUrl, [NotNullW
}

projectPath = projectName ?? repositoryName;

if (!isVisualStudioHost)
{
if (teamName != null)
Expand Down Expand Up @@ -106,7 +106,7 @@ public static bool TryParseOnPremHttp(string relativeUrl, string virtualDirector
return false;
}

projectPath = string.Join("/", parts, 0, virtualDirectoryParts.Length) + "/" + collection + "/" + (projectName ?? repositoryName);
projectPath = string.Join("/", parts, 0, virtualDirectoryParts.Length) + "/" + collection + "/" + Uri.EscapeDataString(projectName ?? repositoryName);
return true;
}

Expand Down Expand Up @@ -176,7 +176,7 @@ public static bool TryParseOnPremSsh(Uri uri, [NotNullWhen(true)]out string? rep
repositoryPath = string.Join("/", parts, 0, teamNameIndex + 1);
return true;
}

private static bool TryParsePath(string[] parts, int startIndex, string? type, [NotNullWhen(true)]out string? repositoryPath, [NotNullWhen(true)]out string? repositoryName)
{
if (TryParsePath(parts, startIndex, type, out var projectName, out var teamName, out repositoryName))
Expand Down
1 change: 1 addition & 0 deletions src/SourceLink.AzureDevOpsServer.Git.UnitTests/AzureDevOpsUrlParserOnPremTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ public void TryParseOnPremHttp_Error(string relativeUrl, string virtualDir = "/"
[Theory]
[InlineData("/collection/project/team/_git/repo", "/", "/collection/project", "repo")]
[InlineData("/collection/project/_git/repo", "/", "/collection/project", "repo")]
[InlineData("/collection/project name/_git/repo", "/", "/collection/project%20name", "repo")]
[InlineData("/collection/_git/repo/", "/", "/collection/repo", "repo")]
[InlineData("/collection/_git/repo", "/", "/collection/repo", "repo")]
[InlineData("/virtual/iis/path/collection/project/team/_git/repo", "/virtual/iis/path", "virtual/iis/path/collection/project", "repo")]
Expand Down