Skip to content

walkdir: avoid symlink loops when follow_symlinks == false #35006

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 2 commits into from
Mar 6, 2020
Merged

walkdir: avoid symlink loops when follow_symlinks == false #35006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c2efcd
walkdir: avoid symlink loops when `follow_symlinks == false`
staticfloat Mar 4, 2020
6e2177e
rm: When checking `filemode()`, use `lstat()` to avoid following syml…
staticfloat Mar 5, 2020
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
11 changes: 7 additions & 4 deletions base/file.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ function rm(path::AbstractString; force::Bool=false, recursive::Bool=false)
try
@static if Sys.iswindows()
# is writable on windows actually means "is deletable"
if (filemode(path) & 0o222) == 0
if (filemode(lstat(path)) & 0o222) == 0
chmod(path, 0o777)
end
end
Expand Down Expand Up @@ -853,10 +853,13 @@ function walkdir(root; topdown=true, follow_symlinks=false, onerror=throw)
dirs = Vector{eltype(content)}()
files = Vector{eltype(content)}()
for name in content
if isdir(joinpath(root, name))
push!(dirs, name)
else
path = joinpath(root, name)

# If we're not following symlinks, then treat all symlinks as files
if (!follow_symlinks && islink(path)) || !isdir(path)
push!(files, name)
else
push!(dirs, name)
end
end

Expand Down
40 changes: 36 additions & 4 deletions test/file.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1218,8 +1218,18 @@ cd(dirwalk) do

root, dirs, files = take!(chnl)
@test root == joinpath(".", "sub_dir1")
@test dirs == (has_symlinks ? ["link", "subsub_dir1", "subsub_dir2"] : ["subsub_dir1", "subsub_dir2"])
@test files == ["file1", "file2"]
if has_symlinks
if follow_symlinks
@test dirs == ["link", "subsub_dir1", "subsub_dir2"]
@test files == ["file1", "file2"]
else
@test dirs == ["subsub_dir1", "subsub_dir2"]
@test files == ["file1", "file2", "link"]
end
else
@test dirs == ["subsub_dir1", "subsub_dir2"]
@test files == ["file1", "file2"]
end

root, dirs, files = take!(chnl)
if follow_symlinks
Expand Down Expand Up @@ -1256,8 +1266,18 @@ cd(dirwalk) do
root, dirs, files = take!(chnl)
end
@test root == joinpath(".", "sub_dir1")
@test dirs == (has_symlinks ? ["link", "subsub_dir1", "subsub_dir2"] : ["subsub_dir1", "subsub_dir2"])
@test files == ["file1", "file2"]
if has_symlinks
if follow_symlinks
@test dirs == ["link", "subsub_dir1", "subsub_dir2"]
@test files == ["file1", "file2"]
else
@test dirs == ["subsub_dir1", "subsub_dir2"]
@test files == ["file1", "file2", "link"]
end
else
@test dirs == ["subsub_dir1", "subsub_dir2"]
@test files == ["file1", "file2"]
end

root, dirs, files = take!(chnl)
@test root == joinpath(".", "sub_dir2")
Expand Down Expand Up @@ -1289,6 +1309,18 @@ cd(dirwalk) do
@test root == joinpath(".", "sub_dir2")
@test dirs == []
@test files == ["file_dir2"]

# Test that symlink loops don't cause errors
if has_symlinks
mkdir(joinpath(".", "sub_dir3"))
symlink("foo", joinpath(".", "sub_dir3", "foo"))

@test_throws Base.IOError walkdir(joinpath(".", "sub_dir3"); follow_symlinks=true)
root, dirs, files = take!(walkdir(joinpath(".", "sub_dir3"); follow_symlinks=false))
@test root == joinpath(".", "sub_dir3")
@test dirs == []
@test files == ["foo"]
end
end
rm(dirwalk, recursive=true)

Expand Down