[reload4j] Initial Integration (#8428)

2022-09-18 00:55:50 +00:00 · 2022-09-18 00:55:50 +00:00 · 9c8bf5c834
parent 1279124c3c
commit 9c8bf5c834
7 changed files with 305 additions and 0 deletions
--- a/projects/reload4j/Dockerfile
+++ b/projects/reload4j/Dockerfile
@ -0,0 +1,35 @@
+# 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://downloads.apache.org/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.zip -o maven.zip && \
+unzip maven.zip -d $SRC/maven && \
+rm -rf maven.zip
+
+ENV MVN $SRC/maven/apache-maven-3.6.3/bin/mvn
+
+WORKDIR ${SRC}
+#
+# clone repository
+#
+RUN git clone https://github.com/qos-ch/reload4j
+COPY remove-jdk8-cap.diff $SRC/
+RUN  cd reload4j && (for i in ${SRC}/remove-jdk8-cap.diff; do tr -d '\015' < $i | git apply; done )
+
+ADD pom.xml build.sh ${SRC}/
+ADD src/ ${SRC}/src/
+WORKDIR ${SRC}/reload4j
--- a/projects/reload4j/build.sh
+++ b/projects/reload4j/build.sh
@ -0,0 +1,75 @@
+#!/bin/bash -eu
+# 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.
+#
+################################################################################
+
+MVN_FLAGS="-Dmaven.compiler.source=15 -Dmaven.compiler.target=15 -DskipTests -Djdk.version=15"
+ALL_JARS=""
+
+# install the build servers' jazzer-api into the maven repository
+pushd "/tmp"
+	${MVN} install:install-file -Dfile=${JAZZER_API_PATH} \
+		-DgroupId="com.code-intelligence" \
+		-DartifactId="jazzer-api" \
+		-Dversion="0.12.0" \
+		-Dpackaging=jar
+popd
+
+pushd "${SRC}/reload4j"
+	${MVN} package ${MVN_FLAGS}
+	${MVN} install ${MVN_FLAGS}
+	CURRENT_VERSION=$(${MVN} org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
+  -Dexpression=project.version -q -DforceStdout)
+popd
+
+pushd ${SRC}
+	${MVN} package -Dreload4jVersion="${CURRENT_VERSION}" ${MVN_FLAGS}
+	install -v target/reload4j-fuzzer-${CURRENT_VERSION}.jar ${OUT}/reload4j-fuzzer-${CURRENT_VERSION}.jar
+	ALL_JARS="${ALL_JARS} reload4j-fuzzer-${CURRENT_VERSION}.jar"
+popd
+
+
+
+# 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
+
+MVN_FUZZERS_PREFIX="src/main/java"
+
+for fuzzer in $(find ${SRC} -name '*Fuzzer.java'); do
+  stripped_path=$(echo ${fuzzer} | sed 's|^.*src/main/java/\(.*\).java$|\1|');
+  # the .java was stripped by sed
+  if (echo ${stripped_path} | grep ".java$"); then
+	continue;
+  fi
+
+  fuzzer_basename=$(basename -s .java $fuzzer)
+  fuzzer_classname=$(echo ${stripped_path} | sed 's|/|.|g');
+
+  # Create an execution wrapper that executes Jazzer with the correct arguments.
+  echo "#!/bin/sh
+# LLVMFuzzerTestOneInput for fuzzer detection.
+this_dir=\$(dirname \"\$0\")
+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_classname} \
+--jvm_args=\"-Xmx2048m\" \
+\$@" > $OUT/${fuzzer_basename}
+  chmod u+x $OUT/${fuzzer_basename}
+done
--- a/projects/reload4j/pom.xml
+++ b/projects/reload4j/pom.xml
@ -0,0 +1,58 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>ossfuzz</groupId>
+	<artifactId>reload4j-fuzzer</artifactId>
+	<version>${reload4jVersion}</version>
+	<packaging>jar</packaging>
+
+	<properties>
+		<maven.compiler.source>15</maven.compiler.source>
+		<maven.compiler.target>15</maven.compiler.target>
+		<exec.mainClass>ossfuzz.ASTFuzzer</exec.mainClass>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencies>
+		<!--
+		on the CI, install the jazzer file with
+		
+			mvn install:install-file -Dfile=${JAZZER_API_PATH} \
+				-DgroupId="com.code-intelligence" \
+				-DartifactId="jazzer-api" \
+				-Dversion="0.12.0" \
+				-Dpackaging=jar
+		
+		to avoid mismatching driver/api versions
+		-->
+		<dependency>
+			<groupId>com.code-intelligence</groupId>
+			<artifactId>jazzer-api</artifactId>
+			<version>0.12.0</version>
+		</dependency>
+		<dependency>
+			<groupId>ch.qos.reload4j</groupId>
+			<artifactId>reload4j</artifactId>
+			<version>${reload4jVersion}</version>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-shade-plugin</artifactId>
+				<version>3.3.0</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>shade</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
+</project>
--- a/projects/reload4j/project.yaml
+++ b/projects/reload4j/project.yaml
@ -0,0 +1,14 @@
+homepage: "https://reload4j.qos.ch"
+language: jvm
+main_repo: "https://github.com/qos-ch/reload4j.git"
+fuzzing_engines:
+  - libfuzzer
+sanitizers:
+  - address
+vendor_ccs:
+  - "wagner@code-intelligence.com"
+  - "yakdan@code-intelligence.com"
+  - "glendowne@code-intelligence.com"
+  - "patrice.salathe@code-intelligence.com"
+  - "hlin@code-intelligence.com"
+  - "schaich@code-intelligence.com"
--- a/projects/reload4j/remove-jdk8-cap.diff
+++ b/projects/reload4j/remove-jdk8-cap.diff
@ -0,0 +1,29 @@
+--- a/pom.xml
+++ b/pom.xml
+@@ -470,26 +470,6 @@
+             </plugin>
+           </plugins>
+         </pluginManagement>
+-        <plugins>
+-          <plugin>
+-            <groupId>org.apache.maven.plugins</groupId>
+-            <artifactId>maven-toolchains-plugin</artifactId>
+-            <executions>
+-              <execution>
+-                <goals>
+-                  <goal>toolchain</goal>
+-                </goals>
+-              </execution>
+-            </executions>
+-            <configuration>
+-              <toolchains>
+-                <jdk>
+-                  <version>[1.5, 8]</version>
+-                </jdk>
+-              </toolchains>
+-            </configuration>
+-          </plugin>
+-        </plugins>
+       </build>
+     </profile>
+   </profiles>
--- a/projects/reload4j/src/main/java/ossfuzz/LoggerFuzzer.java
+++ b/projects/reload4j/src/main/java/ossfuzz/LoggerFuzzer.java
@ -0,0 +1,68 @@
+package ossfuzz;
+
+import com.code_intelligence.jazzer.api.FuzzedDataProvider;
+
+import org.apache.log4j.*;
+
+public class LoggerFuzzer {
+	protected String m_fqcn;
+	protected Level m_level;
+	protected String m_diagnostic;
+	protected Exception m_throwable;
+	protected String m_key;
+	protected Object[] m_params;
+
+	LoggerFuzzer(FuzzedDataProvider fuzzedDataProvider) {
+		int n = fuzzedDataProvider.consumeInt(0, 10);
+		m_params = new Object[n];
+		for(int i=0; i<n; ++i) {
+			switch(fuzzedDataProvider.consumeInt(0,3)) {
+				case 0:
+					m_params[i] = new Integer(fuzzedDataProvider.consumeInt());
+					break;
+				case 1:
+					m_params[i] = new Double(fuzzedDataProvider.consumeDouble());
+					break;
+				case 2:
+					m_params[i] = new String(fuzzedDataProvider.consumeString(16));
+					break;
+			}
+		}
+
+		m_fqcn = fuzzedDataProvider.consumeString(16);
+		m_key  = fuzzedDataProvider.consumeString(16);
+		m_level = Level.toLevel(fuzzedDataProvider.consumeInt());
+		m_diagnostic = fuzzedDataProvider.consumeRemainingAsString();
+		m_throwable = new NullPointerException();
+	}
+
+	void test() {
+		Logger logger = Logger.getLogger(LoggerFuzzer.class);
+
+		logger.addAppender(new MyAppender());
+		
+		/*
+		 * the popular ones
+		 */
+		logger.debug(m_diagnostic);
+		logger.error(m_diagnostic);
+		logger.fatal(m_diagnostic);
+		logger.info(m_diagnostic);
+		logger.trace(m_diagnostic);
+
+		/*
+         * not so popular
+		 */
+		 logger.log(m_level, m_diagnostic);
+		 logger.log(m_fqcn, m_level, m_diagnostic, m_throwable);
+		 logger.l7dlog(m_level, m_key, m_throwable);
+		 logger.l7dlog(m_level, m_key, m_params, m_throwable);
+	}
+
+	public static void fuzzerTestOneInput(FuzzedDataProvider fuzzedDataProvider) {
+		LoggerFuzzer testClosure = new LoggerFuzzer(fuzzedDataProvider);
+		testClosure.test();
+		
+		
+	}
+}
--- a/projects/reload4j/src/main/java/ossfuzz/MyAppender.java
+++ b/projects/reload4j/src/main/java/ossfuzz/MyAppender.java
@ -0,0 +1,26 @@
+package ossfuzz;
+
+import org.apache.log4j.AppenderSkeleton;
+import org.apache.log4j.spi.LoggingEvent;
+
+public class MyAppender extends AppenderSkeleton {
+	public MyAppender() {
+	}
+
+	@Override
+	public void append(LoggingEvent event) {
+		//System.out.println(event.getRenderedMessage());
+	}
+	@Override
+	public synchronized void close() {
+		if (this.closed) {
+			return;
+		}
+		this.closed = true;
+	}
+	
+	@Override
+    public boolean requiresLayout() {
+		return false;
+	}
+}