-
Notifications
You must be signed in to change notification settings - Fork 329
Safely handle Files.exist on discovery and config when a Security Manager is present #10009
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.
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
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| plugins { | ||
| `java-library` | ||
| } | ||
|
|
||
| apply(from = "$rootDir/gradle/java.gradle") | ||
|
|
||
| dependencies { | ||
| testImplementation(project(":utils:test-utils")) | ||
| } |
30 changes: 30 additions & 0 deletions
30
utils/filesystem-utils/src/main/java/datadog/common/filesystem/Files.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| package datadog.common.filesystem; | ||
|
|
||
| import java.io.File; | ||
| import javax.annotation.Nonnull; | ||
|
|
||
| /** Utility methods related to file operations. */ | ||
| public class Files { | ||
|
|
||
| private Files() { | ||
| // Prevent instantiation | ||
| } | ||
|
|
||
| /** | ||
| * Determines whether the given file exists on the filesystem. | ||
| * | ||
| * <p>This method wraps {@link File#exists()} and safely handles {@link SecurityException}s that | ||
| * may occur if the caller does not have the required permissions to examine the file. In such | ||
| * cases, this method returns {@code false}. | ||
| * | ||
| * @param file the file to check for existence; must not be {@code null} | ||
| * @return {@code true} if the file exists and can be queried, {@code false} otherwise | ||
| */ | ||
| public static boolean exists(@Nonnull File file) { | ||
| try { | ||
| return file.exists(); | ||
| } catch (SecurityException ignored) { | ||
| return false; | ||
| } | ||
| } | ||
| } | ||
68 changes: 68 additions & 0 deletions
68
utils/filesystem-utils/src/test/groovy/datadog/common/filesystem/FilesTest.groovy
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| package datadog.common.filesystem | ||
|
|
||
|
|
||
| import datadog.environment.JavaVirtualMachine | ||
| import datadog.trace.test.util.DDSpecification | ||
| import java.security.Permission | ||
| import spock.lang.IgnoreIf | ||
|
|
||
| class FilesTest extends DDSpecification { | ||
amarziali marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| def "exists returns true when file exists and is accessible"() { | ||
| given: | ||
| def file = File.createTempFile("test", "txt") | ||
| file.deleteOnExit() | ||
|
|
||
| expect: | ||
| Files.exists(file) | ||
| } | ||
|
|
||
| def "exists returns false when file does not exist"() { | ||
| given: | ||
| // Create a temp file and delete it to ensure path is valid but file is gone | ||
| def file = File.createTempFile("missing", "txt") | ||
| file.delete() | ||
|
|
||
| expect: | ||
| !Files.exists(file) | ||
| } | ||
|
|
||
| @IgnoreIf({ | ||
| JavaVirtualMachine.isJavaVersionAtLeast(18) | ||
| }) | ||
| def "exists returns false when SecurityManager forbids file access"() { | ||
| setup: | ||
| def file = File.createTempFile("test", "txt") | ||
| file.deleteOnExit() | ||
|
|
||
| // install a restrictive security manager | ||
| def originalSM = System.getSecurityManager() | ||
| System.setSecurityManager(new SecurityManager() { | ||
| @Override | ||
| void checkRead(String filePath) { | ||
| // Only deny THIS file otherwise we'll deny classloading as well and will result in a StackOverflowError | ||
| if (filePath == file.absolutePath) { | ||
| throw new SecurityException("Access denied") | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| void checkPermission(Permission perm) { | ||
| // allow anything | ||
| } | ||
|
|
||
| @Override | ||
| void checkPermission(Permission perm, Object context) { | ||
| // allow anything | ||
| } | ||
| }) | ||
|
|
||
| when: | ||
| def result = Files.exists(file) | ||
|
|
||
| then: | ||
| !result | ||
|
|
||
| cleanup: | ||
| System.setSecurityManager(originalSM) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.