From 4eb1930dda72f943756a47dfe484bb905b58ef5e Mon Sep 17 00:00:00 2001 From: Henry Lin Date: Tue, 7 Jun 2022 03:34:49 +0200 Subject: [PATCH] Tomcat: initial integration (#7790) Initial integration --- projects/tomcat/Dockerfile | 38 ++++++++++++++++++++ projects/tomcat/HttpParserFuzzer.java | 10 ++++++ projects/tomcat/build.sh | 51 +++++++++++++++++++++++++++ projects/tomcat/project.yaml | 12 +++++++ 4 files changed, 111 insertions(+) create mode 100644 projects/tomcat/Dockerfile create mode 100644 projects/tomcat/HttpParserFuzzer.java create mode 100755 projects/tomcat/build.sh create mode 100644 projects/tomcat/project.yaml diff --git a/projects/tomcat/Dockerfile b/projects/tomcat/Dockerfile new file mode 100644 index 000000000..5bc18ff1d --- /dev/null +++ b/projects/tomcat/Dockerfile @@ -0,0 +1,38 @@ +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +################################################################################ + +FROM gcr.io/oss-fuzz-base/base-builder-jvm + +RUN curl -L https://dlcdn.apache.org//ant/binaries/apache-ant-1.10.12-bin.tar.gz -o ant.tar.gz && \ + mkdir -p $SRC/ant && \ + tar -zxvf ant.tar.gz -C $SRC/ant --strip-components=1 && \ + rm -rf ant.tar.gz + +ARG java_home="/out/open-jdk-17" + +RUN apt update && apt install -y openjdk-17-jdk +ENV JAVA_HOME $java_home +ENV PATH "${java_home}:${PATH}" +ENV JVM_LD_LIBRARY_PATH "$java_home/lib/server" + +ENV ANT_HOME=$SRC/ant +ENV ANT $SRC/ant/bin/ant + +RUN git clone --depth 1 https://github.com/apache/tomcat + +COPY build.sh $SRC/ +COPY *Fuzzer.java $SRC/ +WORKDIR $SRC/tomcat \ No newline at end of file diff --git a/projects/tomcat/HttpParserFuzzer.java b/projects/tomcat/HttpParserFuzzer.java new file mode 100644 index 000000000..602908aa6 --- /dev/null +++ b/projects/tomcat/HttpParserFuzzer.java @@ -0,0 +1,10 @@ +import com.code_intelligence.jazzer.api.FuzzedDataProvider; +import com.code_intelligence.jazzer.api.FuzzerSecurityIssueHigh; +import org.apache.tomcat.util.http.parser.HttpParser; + +public class HttpParserFuzzer { + public static void fuzzerTestOneInput(FuzzedDataProvider data) { + String input = data.consumeRemainingAsString(); + HttpParser.unquote(input); + } +} diff --git a/projects/tomcat/build.sh b/projects/tomcat/build.sh new file mode 100755 index 000000000..86709efdc --- /dev/null +++ b/projects/tomcat/build.sh @@ -0,0 +1,51 @@ +#!/bin/bash +# Copyright 2022 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +################################################################################ + +cp -r "/usr/lib/jvm/java-17-openjdk-amd64/" "$JAVA_HOME" + +$ANT + +cp "output/build/lib/tomcat-coyote.jar" "$OUT/tomcat-coyote.jar" +cp "output/build/lib/tomcat-util.jar" "$OUT/tomcat-util.jar" + +ALL_JARS="tomcat-coyote.jar tomcat-util.jar" + +# The classpath at build-time includes the project jars in $OUT as well as the +# Jazzer API. +BUILD_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "$OUT/%s:"):$JAZZER_API_PATH + +# All .jar and .class files lie in the same directory as the fuzzer at runtime. +RUNTIME_CLASSPATH=$(echo $ALL_JARS | xargs printf -- "\$this_dir/%s:"):\$this_dir + +for fuzzer in $(find $SRC -name '*Fuzzer.java'); do + fuzzer_basename=$(basename -s .java $fuzzer) + javac -cp $BUILD_CLASSPATH $fuzzer --release 17 + cp $SRC/$fuzzer_basename.class $OUT/ + + # Create an execution wrapper that executes Jazzer with the correct arguments. + echo "#!/bin/sh +# LLVMFuzzerTestOneInput for fuzzer detection. +this_dir=\$(dirname \"\$0\") +JAVA_HOME=\"\$this_dir/open-jdk-17/\" \ +LD_LIBRARY_PATH=\"$JVM_LD_LIBRARY_PATH\":\$this_dir \ +\$this_dir/jazzer_driver --agent_path=\$this_dir/jazzer_agent_deploy.jar \ +--cp=$RUNTIME_CLASSPATH \ +--target_class=$fuzzer_basename \ +--jvm_args=\"-Xmx2048m\" \ +\$@" > $OUT/$fuzzer_basename + chmod u+x $OUT/$fuzzer_basename +done \ No newline at end of file diff --git a/projects/tomcat/project.yaml b/projects/tomcat/project.yaml new file mode 100644 index 000000000..22a44b9c0 --- /dev/null +++ b/projects/tomcat/project.yaml @@ -0,0 +1,12 @@ +homepage: "https://github.com/apache/tomcat" +language: jvm +main_repo: "https://github.com/apache/tomcat" +fuzzing_engines: + - libfuzzer +sanitizers: + - address +vendor_ccs: + - "wagner@code-intelligence.com" + - "yakdan@code-intelligence.com" + - "glendowne@code-intelligence.com" + - "patrice.salathe@code-intelligence.com" \ No newline at end of file