Skip to content

SNOW-2107220: Add null check for write cache file #2188

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
sfc-gh-pbulawa merged 6 commits into from
May 21, 2025
Merged

SNOW-2107220: Add null check for write cache file #2188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3852fbd
Add null check for write cache file
sfc-gh-pbulawa May 20, 2025
a426d64
Format
sfc-gh-pbulawa May 20, 2025
285fa6e
Merge branch 'master' into SNOW-2107220-fix-file-null-check
sfc-gh-pbulawa May 20, 2025
486a91a
Add message
sfc-gh-pbulawa May 21, 2025
bb11578
Merge remote-tracking branch 'origin/SNOW-2107220-fix-file-null-check…
sfc-gh-pbulawa May 21, 2025
e1b6cad
Format
sfc-gh-pbulawa May 21, 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
6 changes: 4 additions & 2 deletions src/main/java/net/snowflake/client/core/FileCacheManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ synchronized <T> T withLock(Supplier<T> supplier) {
synchronized JsonNode readCacheFile() {
try {
if (!FileUtil.exists(cacheFile)) {
logger.debug("Cache file doesn't exist. File: {}", cacheFile);
logger.debug("Cache file doesn't exist. Ignoring read. File: {}", cacheFile);
return null;
}

Expand All @@ -290,7 +290,9 @@ synchronized JsonNode readCacheFile() {
synchronized void writeCacheFile(JsonNode input) {
logger.debug("Writing cache file. File: {}", cacheFile);
try {
if (input == null) {
if (input == null || !FileUtil.exists(cacheFile)) {
logger.debug(
"Cache file doesn't exist or input is null. Ignoring write. File: {}", cacheFile);
return;
}
try (Writer writer =
Expand Down
28 changes: 27 additions & 1 deletion src/test/java/net/snowflake/client/core/FileCacheManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ public void throwWhenReadCacheFileWithPermissionDifferentThanReadWriteForUserTes

@Test
@RunOnLinuxOrMac
public void notThrowExceptionWhenCacheFolderIsNotAccessible() throws IOException {
public void notThrowExceptionWhenCacheFolderIsNotAccessibleWhenReadFromCache()
throws IOException {
try {
Files.setPosixFilePermissions(
cacheFile.getParentFile().toPath(), PosixFilePermissions.fromString("---------"));
Expand All @@ -124,6 +125,31 @@ public void notThrowExceptionWhenCacheFolderIsNotAccessible() throws IOException
}
}

@Test
@RunOnLinuxOrMac
public void notThrowExceptionWhenCacheFolderIsNotAccessibleWhenWriteToCache() throws IOException {
String tmpDirPath = System.getProperty("java.io.tmpdir");
String cacheDirPath = tmpDirPath + File.separator + "snowflake-cache-dir-noaccess";
System.setProperty("FILE_CACHE_MANAGER_CACHE_PATH", cacheDirPath);
try {
Files.createDirectory(
Paths.get(cacheDirPath),
PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("---------")));

FileCacheManager fcm =
FileCacheManager.builder()
.setOnlyOwnerPermissions(false)
.setCacheDirectorySystemProperty("FILE_CACHE_MANAGER_CACHE_PATH")
.setCacheDirectoryEnvironmentVariable("NONEXISTENT")
.setBaseCacheFileName("cache-file")
.build();
assertDoesNotThrow(() -> fcm.writeCacheFile(mapper.createObjectNode()));
} finally {
Files.deleteIfExists(Paths.get(cacheDirPath));
System.clearProperty("FILE_CACHE_MANAGER_CACHE_PATH");
}
}

@Test
@RunOnLinuxOrMac
public void throwWhenOverrideCacheFileHasDifferentOwnerThanCurrentUserTest() {
Expand Down