Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 13 additions & 4 deletions src/main/java/network/crypta/fs/Dirs.java
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,20 @@ static void ensureDir(Path path, String perms) {
throw new UncheckedIOException("Failed to create directory: " + path, e);
}
}
Set<PosixFilePermission> set;
try {
if (Files.getFileStore(path).supportsFileAttributeView("posix")) {
Set<PosixFilePermission> set = PosixFilePermissions.fromString(perms);
Files.setPosixFilePermissions(path, set);
}
set = PosixFilePermissions.fromString(perms);
} catch (IllegalArgumentException e) {
LOG.warn("Failed to set POSIX permissions '{}' on {}: {}", perms, path, e.getMessage(), e);
return;
}
try {
Files.setPosixFilePermissions(path, set);
} catch (UnsupportedOperationException _) {
LOG.debug(
"Skipping POSIX permissions '{}' on {} because POSIX attributes are unsupported",
perms,
path);
} catch (Exception e) {
LOG.warn("Failed to set POSIX permissions '{}' on {}: {}", perms, path, e.getMessage(), e);
}
Expand Down
45 changes: 45 additions & 0 deletions src/test/java/network/crypta/fs/DirsTest.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package network.crypta.fs;

import java.io.IOException;
import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.PosixFilePermission;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.io.TempDir;
import org.mockito.MockedStatic;
Expand Down Expand Up @@ -60,6 +63,48 @@ void ensureDir_whenPermissionsStringInvalid_expectNoException() {
assertTrue(Files.isDirectory(target));
}

@Test
void ensureDir_whenSettingPermissionsThrowsIOException_expectNoException() {
// Arrange
Path target = tempDir.resolve("io-permissions-error");

// Act
try (MockedStatic<Files> files = Mockito.mockStatic(Files.class, Mockito.CALLS_REAL_METHODS)) {
files
.when(
() ->
Files.setPosixFilePermissions(
Mockito.eq(target), Mockito.<Set<PosixFilePermission>>any()))
.thenThrow(new IOException("Mount point not found"));

assertDoesNotThrow(() -> Dirs.ensureDir(target, Dirs.PERM_GROUP_RX));
}

// Assert
assertTrue(Files.isDirectory(target));
}

@Test
void ensureDir_whenPosixUnsupported_expectNoException() {
// Arrange
Path target = tempDir.resolve("unsupported-posix");

// Act
try (MockedStatic<Files> files = Mockito.mockStatic(Files.class, Mockito.CALLS_REAL_METHODS)) {
files
.when(
() ->
Files.setPosixFilePermissions(
Mockito.eq(target), Mockito.<Set<PosixFilePermission>>any()))
.thenThrow(new UnsupportedOperationException("posix unsupported"));

assertDoesNotThrow(() -> Dirs.ensureDir(target, Dirs.PERM_GROUP_RX));
}

// Assert
assertTrue(Files.isDirectory(target));
}

@Test
void isUnitTestRuntime_whenRunningUnderJUnit_expectTrue() {
// Arrange
Expand Down
Loading