diff options
author | gdemarcsek <gyorgy.demarcsek@protonmail.ch> | 2023-03-07 22:47:24 +0100 |
---|---|---|
committer | Norbert Schneider <mail@bertschneider.de> | 2023-06-13 08:57:04 +0200 |
commit | db1d69180693337c98259e522dc5ab80572ed34b (patch) | |
tree | c44d584edd33548f2fe147f17a522a0439dae865 | |
parent | fbe3feaa846e163077a363a7156708bc2d12016f (diff) | |
download | jazzer-api-db1d69180693337c98259e522dc5ab80572ed34b.tar.gz |
clang format on new java files
3 files changed, 38 insertions, 40 deletions
diff --git a/examples/src/main/java/com/example/CommonsTextFuzzer.java b/examples/src/main/java/com/example/CommonsTextFuzzer.java index ff3e1175..ef93639c 100644 --- a/examples/src/main/java/com/example/CommonsTextFuzzer.java +++ b/examples/src/main/java/com/example/CommonsTextFuzzer.java @@ -15,14 +15,15 @@ package com.example; import com.code_intelligence.jazzer.api.FuzzedDataProvider; -import org.apache.commons.text.StringSubstitutor; import com.code_intelligence.jazzer.api.Jazzer; +import org.apache.commons.text.StringSubstitutor; public class CommonsTextFuzzer { - public static void fuzzerTestOneInput(FuzzedDataProvider data) { - try { - StringSubstitutor.createInterpolator().replace(data.consumeAsciiString(20)); - } catch (java.lang.IllegalArgumentException | java.lang.ArrayIndexOutOfBoundsException ignored) { - } + public static void fuzzerTestOneInput(FuzzedDataProvider data) { + try { + StringSubstitutor.createInterpolator().replace(data.consumeAsciiString(20)); + } catch ( + java.lang.IllegalArgumentException | java.lang.ArrayIndexOutOfBoundsException ignored) { } + } } diff --git a/sanitizers/src/main/java/com/code_intelligence/jazzer/sanitizers/ScriptEngineInjection.java b/sanitizers/src/main/java/com/code_intelligence/jazzer/sanitizers/ScriptEngineInjection.java index fb29c7be..ca46187c 100644 --- a/sanitizers/src/main/java/com/code_intelligence/jazzer/sanitizers/ScriptEngineInjection.java +++ b/sanitizers/src/main/java/com/code_intelligence/jazzer/sanitizers/ScriptEngineInjection.java @@ -18,18 +18,16 @@ import static java.util.Collections.unmodifiableSet; import static java.util.stream.Collectors.toSet; import com.code_intelligence.jazzer.api.FuzzerSecurityIssueCritical; -import com.code_intelligence.jazzer.api.FuzzerSecurityIssueHigh; import com.code_intelligence.jazzer.api.HookType; import com.code_intelligence.jazzer.api.Jazzer; import com.code_intelligence.jazzer.api.MethodHook; import com.code_intelligence.jazzer.api.MethodHooks; +import java.io.IOException; +import java.io.Reader; import java.lang.invoke.MethodHandle; import java.util.Arrays; import java.util.Set; import java.util.stream.Stream; -import java.io.IOException; -import java.io.Reader; - import javax.script.ScriptEngineManager; /** @@ -53,7 +51,8 @@ public final class ScriptEngineInjection { private static final String ENGINE = "js"; private static final String PAYLOAD = "1+1"; - private static char[] guideMarkableReaderTowardsEquality(Reader reader, String target, int id) throws IOException { + private static char[] guideMarkableReaderTowardsEquality(Reader reader, String target, int id) + throws IOException { final int size = target.length(); char[] current = new char[size]; int n = 0; @@ -78,31 +77,35 @@ public final class ScriptEngineInjection { } @MethodHook(type = HookType.REPLACE, targetClassName = "javax.script.ScriptEngineManager", - targetMethod = "registerEngineName") - public static Object ensureScriptEngine(MethodHandle method, Object thisObject, Object[] arguments, int hookId) + targetMethod = "registerEngineName") + public static Object + ensureScriptEngine(MethodHandle method, Object thisObject, Object[] arguments, int hookId) throws Throwable { - return method.invokeWithArguments(Stream.concat(Stream.of(thisObject), - Stream.concat(Stream.of((Object) ENGINE), Arrays.stream(arguments, 1, arguments.length))).toArray()); + return method.invokeWithArguments(Stream + .concat(Stream.of(thisObject), + Stream.concat(Stream.of((Object) ENGINE), + Arrays.stream(arguments, 1, arguments.length))) + .toArray()); } - @MethodHook(type = HookType.REPLACE, - targetClassName = "javax.script.ScriptEngineManager", - targetMethod = "getEngineByName", - targetMethodDescriptor = "(Ljava/lang/String;)Ljavax/script/ScriptEngine;") - public static Object hookEngineName(MethodHandle method, Object thisObject, Object[] arguments, int hookId) + @MethodHook(type = HookType.REPLACE, targetClassName = "javax.script.ScriptEngineManager", + targetMethod = "getEngineByName", + targetMethodDescriptor = "(Ljava/lang/String;)Ljavax/script/ScriptEngine;") + public static Object + hookEngineName(MethodHandle method, Object thisObject, Object[] arguments, int hookId) throws Throwable { String engine = (String) arguments[0]; Jazzer.guideTowardsEquality(engine, ENGINE, hookId); - return method.invokeWithArguments(Stream.concat(Stream.of(thisObject), Arrays.stream(arguments)).toArray()); + return method.invokeWithArguments( + Stream.concat(Stream.of(thisObject), Arrays.stream(arguments)).toArray()); } @MethodHook(type = HookType.BEFORE, targetClassName = "javax.script.ScriptEngine", - targetMethod = "eval", - targetMethodDescriptor = "(Ljava/lang/String;)Ljava/lang/Object;") + targetMethod = "eval", targetMethodDescriptor = "(Ljava/lang/String;)Ljava/lang/Object;") @MethodHook(type = HookType.BEFORE, targetClassName = "javax.script.ScriptEngine", - targetMethod = "eval", - targetMethodDescriptor = "(Ljava/io/Reader;)Ljava/lang/Object;") - public static void checkScriptEngineExecute(MethodHandle method, Object thisObject, Object[] arguments, int hookId) + targetMethod = "eval", targetMethodDescriptor = "(Ljava/io/Reader;)Ljava/lang/Object;") + public static void + checkScriptEngineExecute(MethodHandle method, Object thisObject, Object[] arguments, int hookId) throws Throwable { String script = null; @@ -110,12 +113,12 @@ public final class ScriptEngineInjection { script = (String) arguments[0]; Jazzer.guideTowardsEquality(script, PAYLOAD, hookId); } else { - script = new String(guideMarkableReaderTowardsEquality((Reader) arguments[0], PAYLOAD, hookId)); + script = + new String(guideMarkableReaderTowardsEquality((Reader) arguments[0], PAYLOAD, hookId)); } if (script.equals(PAYLOAD)) { - Jazzer.reportFindingFromHook( - new FuzzerSecurityIssueCritical("Possible script execution")); + Jazzer.reportFindingFromHook(new FuzzerSecurityIssueCritical("Possible script execution")); } } } diff --git a/sanitizers/src/test/java/com/example/ScriptEngineInjection.java b/sanitizers/src/test/java/com/example/ScriptEngineInjection.java index 3d50a832..0785348e 100644 --- a/sanitizers/src/test/java/com/example/ScriptEngineInjection.java +++ b/sanitizers/src/test/java/com/example/ScriptEngineInjection.java @@ -16,10 +16,8 @@ package com.example; import com.code_intelligence.jazzer.api.FuzzedDataProvider; import com.code_intelligence.jazzer.api.FuzzerSecurityIssueCritical; - import java.io.Reader; import java.io.StringReader; - import javax.script.Bindings; import javax.script.ScriptContext; import javax.script.ScriptEngine; @@ -84,19 +82,15 @@ class DummyScriptEngine implements ScriptEngine { } @Override - public void put(String key, Object value) { - } + public void put(String key, Object value) {} @Override - public void setBindings(Bindings bindings, int scope) { - } + public void setBindings(Bindings bindings, int scope) {} @Override - public void setContext(ScriptContext context) { - } + public void setContext(ScriptContext context) {} - public DummyScriptEngine() { - } + public DummyScriptEngine() {} } public class ScriptEngineInjection { @@ -109,7 +103,7 @@ public class ScriptEngineInjection { public static void fuzzerTestOneInput(FuzzedDataProvider data) throws Exception { try { insecureScriptEval(data.consumeRemainingAsAsciiString()); - } catch(Exception ignored) { + } catch (Exception ignored) { } } } |