Skip to content

Fix URI.merge/2 trailing slash handling at root path #14346

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 1 commit into from
Mar 19, 2025
Merged

Fix URI.merge/2 trailing slash handling at root path #14346

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
2 changes: 2 additions & 0 deletions lib/elixir/lib/uri.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,6 +962,8 @@ defmodule URI do
defp remove_dot_segments([".." | tail], [_ | acc]), do: remove_dot_segments(tail, acc)
defp remove_dot_segments([head | tail], acc), do: remove_dot_segments(tail, [head | acc])

defp join_reversed_segments([:/]), do: "/"

defp join_reversed_segments(segments) do
case Enum.reverse(segments) do
[:/ | tail] -> ["" | tail]
Expand Down
52 changes: 52 additions & 0 deletions lib/elixir/test/elixir/uri_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@ defmodule URITest do
#
# https://w3c.github.io/json-ld-api/tests/toRdf-manifest#t0124
# https://w3c.github.io/json-ld-api/tests/toRdf-manifest#t0125
# https://w3c.github.io/json-ld-api/tests/toRdf-manifest#t0123

base1 = "http://a/bb/ccc/."

Expand Down Expand Up @@ -632,6 +633,57 @@ defmodule URITest do
for {rel, result} <- rel_and_result2 do
assert URI.merge(base2, rel) |> URI.to_string() == result
end

base3 = "http://a/bb/ccc/../d;p?q"

rel_and_result = %{
"g:h" => "g:h",
"g" => "http://a/bb/g",
"./g" => "http://a/bb/g",
"g/" => "http://a/bb/g/",
"/g" => "http://a/g",
"//g" => "http://g",
"?y" => "http://a/bb/ccc/../d;p?y",
"g?y" => "http://a/bb/g?y",
"#s" => "http://a/bb/ccc/../d;p?q#s",
"g#s" => "http://a/bb/g#s",
"g?y#s" => "http://a/bb/g?y#s",
";x" => "http://a/bb/;x",
"g;x" => "http://a/bb/g;x",
"g;x?y#s" => "http://a/bb/g;x?y#s",
"" => "http://a/bb/ccc/../d;p?q",
"." => "http://a/bb/",
"./" => "http://a/bb/",
".." => "http://a/",
"../" => "http://a/",
"../g" => "http://a/g",
"../.." => "http://a/",
"../../" => "http://a/",
"../../g" => "http://a/g",
"../../../g" => "http://a/g",
"../../../../g" => "http://a/g",
"/./g" => "http://a/g",
"/../g" => "http://a/g",
"g." => "http://a/bb/g.",
".g" => "http://a/bb/.g",
"g.." => "http://a/bb/g..",
"..g" => "http://a/bb/..g",
"./../g" => "http://a/g",
"./g/." => "http://a/bb/g/",
"g/./h" => "http://a/bb/g/h",
"g/../h" => "http://a/bb/h",
"g;x=1/./y" => "http://a/bb/g;x=1/y",
"g;x=1/../y" => "http://a/bb/y",
"g?y/./x" => "http://a/bb/g?y/./x",
"g?y/../x" => "http://a/bb/g?y/../x",
"g#s/./x" => "http://a/bb/g#s/./x",
"g#s/../x" => "http://a/bb/g#s/../x",
"http:g" => "http:g"
}

for {rel, result} <- rel_and_result do
assert URI.merge(base3, rel) |> URI.to_string() == result
end
end

test "append_query/2" do
Expand Down
Loading