Skip to content

Fix FileInterceptor to deduce the access level from the list of OpenOption #17816

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
andrross merged 1 commit into from
Apr 7, 2025
Merged

Fix FileInterceptor to deduce the access level from the list of OpenOption #17816

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 15 additions & 5 deletions libs/agent-sm/agent/src/main/java/org/opensearch/javaagent/FileInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@

import java.io.FilePermission;
import java.lang.reflect.Method;
import java.nio.file.OpenOption;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardOpenOption;
import java.security.Policy;
import java.security.ProtectionDomain;
import java.util.Collection;
Expand Down Expand Up @@ -59,13 +61,21 @@
final Collection<ProtectionDomain> callers = walker.walk(StackCallerProtectionDomainChainExtractor.INSTANCE);

final String name = method.getName();
final boolean isMutating = name.equals("copy")
|| name.equals("move")
|| name.equals("write")
|| name.equals("newByteChannel")
|| name.startsWith("create");
boolean isMutating = name.equals("copy") || name.equals("move") || name.equals("write") || name.startsWith("create");
final boolean isDelete = isMutating == false ? name.startsWith("delete") : false;

if (isMutating == false && isDelete == false && name.equals("newByteChannel") == true) {
if (args.length > 1 && args[1] instanceof OpenOption[] opts) {
for (final OpenOption opt : opts) {
if (opt != StandardOpenOption.READ) {
isMutating = true;
break;

Check warning on line 72 in libs/agent-sm/agent/src/main/java/org/opensearch/javaagent/FileInterceptor.java

View check run for this annotation

Codecov / codecov/patch

libs/agent-sm/agent/src/main/java/org/opensearch/javaagent/FileInterceptor.java#L71-L72 

Added lines #L71 - L72 were not covered by tests
}
}

}
}

// Check each permission separately
for (final ProtectionDomain domain : callers) {
// Handle FileChannel.open() separately to check read/write permissions properly
Expand Down
Loading