Skip to content

Add path information to InvalidPathError error message #1098

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
josevalim merged 4 commits into from
May 25, 2022
Merged

Add path information to InvalidPathError error message #1098

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
ead6295
add request_path info to InvalidPathError exception message
fchabouis May 24, 2022
abc92d9
update tests
fchabouis May 24, 2022
7034fad
Update lib/plug/static.ex
fchabouis May 25, 2022
26c5dff
Apply suggestions from code review
josevalim May 25, 2022
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 lib/plug/static.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ defmodule Plug.Static do
segments = Enum.map(segments, &uri_decode/1)

if invalid_path?(segments) do
raise InvalidPathError
raise InvalidPathError, "invalid path for static asset: #{conn.request_path}"
end

path = path(from, segments)
Expand Down
34 changes: 23 additions & 11 deletions test/plug/static_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,37 +206,49 @@ defmodule Plug.StaticTest do
end

test "returns 400 for unsafe paths" do
path = "/public/fixtures/../fixtures/static/file.txt"

exception =
assert_raise Plug.Static.InvalidPathError, "invalid path for static asset", fn ->
call(conn(:get, "/public/fixtures/../fixtures/static/file.txt"))
end
assert_raise Plug.Static.InvalidPathError,
"invalid path for static asset: #{path}",
fn ->
call(conn(:get, path))
end

assert Plug.Exception.status(exception) == 400

path = "/public/fixtures/%2E%2E/fixtures/static/file.txt"

exception =
assert_raise Plug.Static.InvalidPathError, "invalid path for static asset", fn ->
call(conn(:get, "/public/fixtures/%2E%2E/fixtures/static/file.txt"))
assert_raise Plug.Static.InvalidPathError, "invalid path for static asset: #{path}", fn ->
call(conn(:get, path))
end

assert Plug.Exception.status(exception) == 400

path = "/public/c:\\foo.txt"

exception =
assert_raise Plug.Static.InvalidPathError, "invalid path for static asset", fn ->
call(conn(:get, "/public/c:\\foo.txt"))
assert_raise Plug.Static.InvalidPathError, "invalid path for static asset: #{path}", fn ->
call(conn(:get, path))
end

assert Plug.Exception.status(exception) == 400

path = "/public/sample.txt%00.html"

exception =
assert_raise Plug.Static.InvalidPathError, "invalid path for static asset", fn ->
call(conn(:get, "/public/sample.txt%00.html"))
assert_raise Plug.Static.InvalidPathError, "invalid path for static asset: #{path}", fn ->
call(conn(:get, path))
end

assert Plug.Exception.status(exception) == 400

path = "/public/sample.txt\0.html"

exception =
assert_raise Plug.Static.InvalidPathError, "invalid path for static asset", fn ->
call(conn(:get, "/public/sample.txt\0.html"))
assert_raise Plug.Static.InvalidPathError, "invalid path for static asset: #{path}", fn ->
call(conn(:get, path))
end

assert Plug.Exception.status(exception) == 400
Expand Down