Skip to content
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

Jump to bottom

junit: Only create .cifuzz-corpus if it is the generated corpus #855

Merged
merged 1 commit into from
Sep 20, 2023
Merged

junit: Only create .cifuzz-corpus if it is the generated corpus #855

Show file tree
Hide file tree
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 25 additions & 14 deletions src/main/java/com/code_intelligence/jazzer/junit/FuzzTestExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,12 @@ public static FuzzTestExecutor prepare(ExtensionContext context, String maxDurat
&& corpusFilesOrDirs.stream().map(Paths::get).allMatch(Files::isRegularFile)) {
javaSeedsDir = Optional.empty();
} else {
javaSeedsDir = Optional.of(addInputAndSeedDirs(context, libFuzzerArgs));
// Only create the default generated corpus directory if it is used as the generated corpus
// directory, i.e., if the user didn't provide any custom corpus directories that come before
// it on the libFuzzer command line.
boolean createDefaultGeneratedCorpusDir = corpusFilesOrDirs.isEmpty();
javaSeedsDir =
Optional.of(addInputAndSeedDirs(context, libFuzzerArgs, createDefaultGeneratedCorpusDir));
}

libFuzzerArgs.add("-max_total_time=" + durationStringToSeconds(maxDuration));
Expand Down Expand Up @@ -169,7 +174,8 @@ private static Optional<String> translateJUnitTimeoutToLibFuzzerFlag(ExtensionCo
*
* @return the temporary Java seed corpus directory
*/
private static Path addInputAndSeedDirs(ExtensionContext context, List<String> libFuzzerArgs)
private static Path addInputAndSeedDirs(
ExtensionContext context, List<String> libFuzzerArgs, boolean createDefaultGeneratedCorpusDir)
throws IOException {
Class<?> fuzzTestClass = context.getRequiredTestClass();
Method fuzzTestMethod = context.getRequiredTestMethod();
Expand All @@ -184,20 +190,25 @@ private static Path addInputAndSeedDirs(ExtensionContext context, List<String> l
// The path is specified relative to the current working directory, which with JUnit is the
// project directory.
Path generatedCorpusDir = baseDir.resolve(generatedCorpusPath(fuzzTestClass, fuzzTestMethod));
Files.createDirectories(generatedCorpusDir);
String absoluteCorpusDir = generatedCorpusDir.toAbsolutePath().toString();

// Even if support for long paths (+260 characters) is enabled on Windows,
// libFuzzer does not work properly. This can be circumvented by prepending "\\?\" to the path,
// see:
// https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry
// Error message: "GetFileAttributesA() failed for <path> (Error code: 3)."
// https://github.com/llvm/llvm-project/blob/release/17.x/compiler-rt/lib/fuzzer/FuzzerIOWindows.cpp#L65
if (Utils.isWindows()) {
absoluteCorpusDir = "\\\\?\\" + absoluteCorpusDir;
if (createDefaultGeneratedCorpusDir) {
Files.createDirectories(generatedCorpusDir);
}
if (Files.exists(generatedCorpusDir)) {
String absoluteCorpusDir = generatedCorpusDir.toAbsolutePath().toString();

// Even if support for long paths (+260 characters) is enabled on Windows,
// libFuzzer does not work properly. This can be circumvented by prepending "\\?\" to the
// path,
// see:
// https://learn.microsoft.com/en-us/windows/win32/fileio/maximum-file-path-limitation?tabs=registry
// Error message: "GetFileAttributesA() failed for <path> (Error code: 3)."
// https://github.com/llvm/llvm-project/blob/release/17.x/compiler-rt/lib/fuzzer/FuzzerIOWindows.cpp#L65
if (Utils.isWindows()) {
absoluteCorpusDir = "\\\\?\\" + absoluteCorpusDir;
}

libFuzzerArgs.add(absoluteCorpusDir);
libFuzzerArgs.add(absoluteCorpusDir);
}

// We can only emit findings into the source tree version of the inputs directory, not e.g. the
// copy under Maven's target directory. If it doesn't exist, collect the inputs in the current
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/code_intelligence/jazzer/junit/CorpusDirectoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,11 @@ public void fuzzingEnabled() throws IOException {
assertCrashFileExistsIn(artifactsDirectory);
assertNoCrashFileExistsIn(baseDir);
assertNoCrashFileExistsIn(explicitGeneratedCorpus);
assertNoCrashFileExistsIn(defaultGeneratedCorpus);
// Default generated corpus directory isn't used and thus should not have been created.
assertThat(Files.notExists(defaultGeneratedCorpus)).isTrue();

// Verify that corpus files are written to given corpus directory and not generated one.
assertThat(Files.list(explicitGeneratedCorpus)).isNotEmpty();
assertThat(Files.list(defaultGeneratedCorpus)).isEmpty();
}

@Test
Expand Down