Skip to content

Fix order of access filter files by moving default to the start #875

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

Open
ArloL wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix order of access filter files by moving default to the start #875

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
14 changes: 4 additions & 10 deletions common/utils/src/main/java/org/graalvm/buildtools/agent/AgentConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ public AgentConfiguration(Collection<String> callerFilterFiles,
}

public List<String> getAgentCommandLine() {
addDefaultAccessFilter();
List<String> cmdLine = new ArrayList<>(agentMode.getAgentCommandLine());
appendOptionToValues("caller-filter-file=", callerFilterFiles, cmdLine);
appendOptionToValues("access-filter-file=", List.of(getDefaultAccessFilter()), cmdLine);
appendOptionToValues("access-filter-file=", accessFilterFiles, cmdLine);
addToCmd("builtin-caller-filter=", builtinCallerFilter, cmdLine);
addToCmd("builtin-heuristic-filter=", builtinHeuristicFilter, cmdLine);
Expand Down Expand Up @@ -141,18 +141,12 @@ private void addToCmd(String option, Boolean value, List<String> cmdLine) {
}
}

private void addDefaultAccessFilter() {
if (accessFilterFiles == null) {
// this could only happen if we instantiated disabled agent configuration
return;
}

private String getDefaultAccessFilter() {
String tempDir = System.getProperty("java.io.tmpdir");
Path agentDir = Path.of(tempDir).resolve("agent-config");
Path accessFilterFile = agentDir.resolve(ACCESS_FILTER_PREFIX + ACCESS_FILTER_SUFFIX);
if (Files.exists(accessFilterFile)) {
accessFilterFiles.add(accessFilterFile.toString());
return;
return accessFilterFile.toString();
}

try (InputStream accessFilterData = AgentConfiguration.class.getResourceAsStream(DEFAULT_ACCESS_FILTER_FILE_LOCATION)) {
Expand All @@ -176,7 +170,7 @@ private void addDefaultAccessFilter() {
logger.info(accessFilterFile + " already exists. Delete " + tmpAccessFilter);
}

accessFilterFiles.add(accessFilterFile.toString());
return accessFilterFile.toString();
} catch (IOException e) {
throw new RuntimeException("Cannot add default access-filter.json", e);
}
Expand Down