Skip to content

URL: avoid double slash at the start of the path #5187

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
antkmsft merged 6 commits into from
Nov 28, 2023
+51 −1
Merged

URL: avoid double slash at the start of the path #5187

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
56f7290
URL: avoid double slash at the start of the path
antkmsft Nov 25, 2023
2358b8f
Remove unnecessary change
antkmsft Nov 25, 2023
766fec2
More test coverage
antkmsft Nov 26, 2023
0ed1957
Changelog
antkmsft Nov 26, 2023
70b2083
Merge branch 'main' into url-doubleslash
antkmsft Nov 27, 2023
58b946b
Merge branch 'main' into url-doubleslash
antkmsft Nov 27, 2023
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: 2 additions & 0 deletions sdk/core/azure-core/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

### Bugs Fixed

- [[#5130]](https://github.com/Azure/azure-sdk-for-cpp/issues/5130) `Url::AppendPath()` and `Url::SetPath()` may end up with a double slash at the beginning of a path.

### Other Changes

## 1.11.0-beta.2 (2023-11-02)
Expand Down
5 changes: 4 additions & 1 deletion sdk/core/azure-core/src/http/url.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,10 @@ std::string Url::GetUrlWithoutQuery(bool relative) const
{
if (!relative)
{
url += "/";
if (m_encodedPath.empty() || m_encodedPath[0] != '/')
{
url += "/";
}
}

url += m_encodedPath;
Expand Down
45 changes: 45 additions & 0 deletions sdk/core/azure-core/test/ut/url_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,4 +333,49 @@ namespace Azure { namespace Core { namespace Test {
EXPECT_NE(params.find("param"), params.end());
EXPECT_EQ(params["param"], "value");
}

TEST(URL, LeadingSlashInPath)
{
Core::Url const u0("https://www.microsoft.com");
Core::Url const u1("https://www.microsoft.com/");

EXPECT_EQ(u0.GetAbsoluteUrl(), "https://www.microsoft.com");
EXPECT_EQ(u1.GetAbsoluteUrl(), "https://www.microsoft.com");

{
auto url0 = u0;
auto url1 = u1;
url0.AppendPath("path");
url1.AppendPath("path");
EXPECT_EQ(url0.GetAbsoluteUrl(), "https://www.microsoft.com/path");
EXPECT_EQ(url1.GetAbsoluteUrl(), "https://www.microsoft.com/path");
}

{
auto url0 = u0;
auto url1 = u1;
url0.AppendPath("/path");
url1.AppendPath("/path");
EXPECT_EQ(url0.GetAbsoluteUrl(), "https://www.microsoft.com/path");
EXPECT_EQ(url1.GetAbsoluteUrl(), "https://www.microsoft.com/path");
}

{
auto url0 = u0;
auto url1 = u1;
url0.SetPath("path");
url1.SetPath("path");
EXPECT_EQ(url0.GetAbsoluteUrl(), "https://www.microsoft.com/path");
EXPECT_EQ(url1.GetAbsoluteUrl(), "https://www.microsoft.com/path");
}

{
auto url0 = u0;
auto url1 = u1;
url0.SetPath("/path");
url1.SetPath("/path");
EXPECT_EQ(url0.GetAbsoluteUrl(), "https://www.microsoft.com/path");
EXPECT_EQ(url1.GetAbsoluteUrl(), "https://www.microsoft.com/path");
}
}
}}} // namespace Azure::Core::Test