Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
package org.elasticsearch.entitlement.bridge;

import java.io.File;
import java.io.FileFilter;
import java.io.FilenameFilter;
import java.io.InputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
Expand Down Expand Up @@ -510,6 +512,12 @@ public interface EntitlementChecker {
//

// old io (ie File)
void check$java_io_File$canExecute(Class<?> callerClass, File file);

void check$java_io_File$canRead(Class<?> callerClass, File file);

void check$java_io_File$canWrite(Class<?> callerClass, File file);

void check$java_io_File$createNewFile(Class<?> callerClass, File file);

void check$java_io_File$$createTempFile(Class<?> callerClass, String prefix, String suffix, File directory);
Expand All @@ -518,6 +526,28 @@ public interface EntitlementChecker {

void check$java_io_File$deleteOnExit(Class<?> callerClass, File file);

void check$java_io_File$exists(Class<?> callerClass, File file);

void check$java_io_File$isDirectory(Class<?> callerClass, File file);

void check$java_io_File$isFile(Class<?> callerClass, File file);

void check$java_io_File$isHidden(Class<?> callerClass, File file);

void check$java_io_File$lastModified(Class<?> callerClass, File file);

void check$java_io_File$length(Class<?> callerClass, File file);

void check$java_io_File$list(Class<?> callerClass, File file);

void check$java_io_File$list(Class<?> callerClass, File file, FilenameFilter filter);

void check$java_io_File$listFiles(Class<?> callerClass, File file);

void check$java_io_File$listFiles(Class<?> callerClass, File file, FileFilter filter);

void check$java_io_File$listFiles(Class<?> callerClass, File file, FilenameFilter filter);

void check$java_io_File$mkdir(Class<?> callerClass, File file);

void check$java_io_File$mkdirs(Class<?> callerClass, File file);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,21 @@ static Path readWriteFile() {
return testRootDir.resolve("read_write_file");
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileCanExecute() throws IOException {
readFile().toFile().canExecute();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileCanRead() throws IOException {
readFile().toFile().canRead();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileCanWrite() throws IOException {
readFile().toFile().canWrite();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileCreateNewFile() throws IOException {
readWriteDir().resolve("new_file").toFile().createNewFile();
Expand All @@ -70,6 +85,61 @@ static void fileDeleteOnExit() throws IOException {
toDelete.toFile().deleteOnExit();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileExists() throws IOException {
readFile().toFile().exists();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileIsDirectory() throws IOException {
readFile().toFile().isDirectory();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileIsFile() throws IOException {
readFile().toFile().isFile();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileIsHidden() throws IOException {
readFile().toFile().isHidden();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileLastModified() throws IOException {
readFile().toFile().lastModified();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileLength() throws IOException {
readFile().toFile().length();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileList() throws IOException {
readDir().toFile().list();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileListWithFilter() throws IOException {
readDir().toFile().list((dir, name) -> true);
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileListFiles() throws IOException {
readDir().toFile().listFiles();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileListFilesWithFileFilter() throws IOException {
readDir().toFile().listFiles(pathname -> true);
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileListFilesWithFilenameFilter() throws IOException {
readDir().toFile().listFiles((dir, name) -> true);
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileMkdir() throws IOException {
Path mkdir = readWriteDir().resolve("mkdir");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import org.elasticsearch.entitlement.runtime.policy.PolicyManager;

import java.io.File;
import java.io.FileFilter;
import java.io.FilenameFilter;
import java.io.InputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
Expand Down Expand Up @@ -951,6 +953,21 @@ public void checkSelectorProviderInheritedChannel(Class<?> callerClass, Selector

// old io (ie File)

@Override
public void check$java_io_File$canExecute(Class<?> callerClass, File file) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$canRead(Class<?> callerClass, File file) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$canWrite(Class<?> callerClass, File file) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$createNewFile(Class<?> callerClass, File file) {
policyManager.checkFileWrite(callerClass, file);
Expand All @@ -971,6 +988,61 @@ public void checkSelectorProviderInheritedChannel(Class<?> callerClass, Selector
policyManager.checkFileWrite(callerClass, file);
}

@Override
public void check$java_io_File$exists(Class<?> callerClass, File file) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$isDirectory(Class<?> callerClass, File file) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$isFile(Class<?> callerClass, File file) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$isHidden(Class<?> callerClass, File file) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$lastModified(Class<?> callerClass, File file) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$length(Class<?> callerClass, File file) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$list(Class<?> callerClass, File file) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$list(Class<?> callerClass, File file, FilenameFilter filter) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$listFiles(Class<?> callerClass, File file) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$listFiles(Class<?> callerClass, File file, FileFilter filter) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$listFiles(Class<?> callerClass, File file, FilenameFilter filter) {
policyManager.checkFileRead(callerClass, file);
}

@Override
public void check$java_io_File$mkdir(Class<?> callerClass, File file) {
policyManager.checkFileWrite(callerClass, file);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,8 @@ io.netty.common:
- inbound_network
- outbound_network
- manage_threads
- files:
- path: "/etc/os-release"
mode: "read"
- path: "/usr/lib/os-release"
mode: "read"
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ io.netty.common:
- manage_threads
- inbound_network
- outbound_network
- files:
- path: "/etc/os-release"
mode: "read"
- path: "/usr/lib/os-release"
mode: "read"
org.opensaml.xmlsec.impl:
- write_system_properties:
properties:
Expand Down