Skip to content

Fix PermissionUtils.FileType.of for sym links #217

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix PermissionUtils.FileType.of for sym links #217

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
e208a7f
Add test
kiendang Mar 13, 2025
8e821ba
Fix PermissionUtils.FileType.of for sym links
kiendang Mar 13, 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
3 changes: 2 additions & 1 deletion src/main/org/apache/tools/ant/util/PermissionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.LinkOption;
import java.nio.file.Path;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.attribute.PosixFileAttributeView;
Expand Down Expand Up @@ -219,7 +220,7 @@ public enum FileType {
*/
public static FileType of(Path p) throws IOException {
BasicFileAttributes attrs =
Files.readAttributes(p, BasicFileAttributes.class);
Files.readAttributes(p, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS);
if (attrs.isRegularFile()) {
return FileType.REGULAR_FILE;
} else if (attrs.isDirectory()) {
Expand Down
12 changes: 12 additions & 0 deletions src/tests/junit/org/apache/tools/ant/util/PermissionUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.PosixFileAttributeView;
import java.nio.file.attribute.PosixFilePermission;
import java.util.EnumSet;
Expand Down Expand Up @@ -92,6 +94,16 @@ public void detectsFileTypeOfDirectoryFromResource() throws IOException {
PermissionUtils.FileType.of(new FileResource(folder.newFolder("ant.tst"))));
}

@Test
public void detectsFileTypeOfSymbolicLinkFromPath() throws IOException {
if (!System.getProperty("os.name").contains("Windows")) {
Path symlink = folder.getRoot().toPath().resolve("link.tst");
Files.createSymbolicLink(symlink, folder.newFile("ant.tst").toPath());
assertEquals(PermissionUtils.FileType.SYMLINK,
PermissionUtils.FileType.of(symlink));
}
}

@Test
public void getSetPermissionsWorksForFiles() throws IOException {
File f = folder.newFile("ant.tst");
Expand Down