Added primary contact email

projects/jxls/Dockerfile

@@ -16,17 +16,45 @@
 
 FROM gcr.io/oss-fuzz-base/base-builder-jvm
 
-RUN rm -rf $SRC/project-parent/jxls
-RUN git clone --depth 1 https://github.com/jxlsteam/jxls $SRC/jxls
-RUN chmod +x $SRC/jxls/gradlew
+# Install necessary packages
+RUN apt-get update && apt-get install -y wget apt-transport-https gnupg
+# Download and install JDK 17 from the official Oracle website
+RUN wget -q --no-cookies --no-check-certificate --header "Cookie: oraclelicense=accept-securebackup-cookie" "https://download.oracle.com/java/17/archive/jdk-17.0.10_linux-x64_bin.tar.gz" -O /tmp/jdk-17_linux-x64_bin.tar.gz
 
-RUN curl -L https://archive.apache.org/dist/maven/maven-3/3.8.7/binaries/apache-maven-3.8.7-bin.zip -o maven.zip && \
- unzip maven.zip -d $SRC/maven && \
- rm -rf maven.zip
-ENV MVN $SRC/maven/apache-maven-3.8.7/bin/mvn
+# extract JDK installation
+RUN mkdir -p /home/user/jdk
+RUN tar -zxvf /tmp/jdk-17_linux-x64_bin.tar.gz -C /home/user/jdk
 
-COPY *.patch $SRC/
+# Debug: List the contents of the user home directory
+RUN ls -la /home/user/jdk
+
+# Set the JAVA_HOME and PATH variables correctly
+ENV JAVA_HOME /home/user/jdk/jdk-17.0.10
+ENV PATH $JAVA_HOME/bin:$PATH
+
+# Debug: Print the JAVA_HOME, and PATH environment variables
+RUN echo "JAVA_HOME: $JAVA_HOME"
+RUN echo "PATH: $PATH"
+
+# Clean up
+RUN rm /tmp/jdk-17_linux-x64_bin.tar.gz
+
+# Confirm Java installation
+RUN java -version
+
+# Install Maven
+RUN apt-get update && apt-get install -y maven
+
+# Clone project
+RUN rm -rf $SRC
+RUN echo "Cloning jxls into $SRC"
+RUN git clone https://github.com/jxlsteam/jxls $SRC
+
+# Copy fuzzer files
 COPY build.sh $SRC/
 COPY *Fuzzer.java $SRC/
 COPY *.dict $SRC/
-WORKDIR $SRC/jxls
+WORKDIR $SRC
+
+RUN ls .
+

projects/jxls/ProcessTemplateFuzzer.java

@@ -14,25 +14,19 @@
 //
 
 import com.code_intelligence.jazzer.api.FuzzedDataProvider;
-import org.jxls.common.Context;
-import org.jxls.common.JxlsException;
-import org.jxls.util.CannotOpenWorkbookException;
-import org.jxls.util.JxlsHelper;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.apache.poi.ss.usermodel.Comment;
-import org.apache.poi.ss.usermodel.RichTextString;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.ss.usermodel.Drawing;
-
-import java.io.*;
-import java.nio.file.Files;
+import org.jxls.builder.JxlsOutputFile;
+import org.jxls.transform.poi.JxlsPoiTemplateFillerBuilder;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.nio.file.Path;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
 
 public class ProcessTemplateFuzzer {
  private static Path templatePath;
@@ -84,35 +78,23 @@ public static Path createDocument(FuzzedDataProvider data) throws IOException {
  return templatePath;
  }
 
- public static void fuzzerTestOneInput(FuzzedDataProvider data) {
- Path templatePath = null;
+ public static void fuzzerTestOneInput(FuzzedDataProvider data) throws FileNotFoundException {
+ Path templatePath;
  try {
  templatePath = ProcessTemplateFuzzer.createDocument(data);
  } catch (IOException | IllegalArgumentException e) {
  return;
  }
 
- Context context = new Context(ProcessTemplateFuzzer.generateHashMap(data));
- OutputStream os = new ByteArrayOutputStream();
- InputStream in = null;
- try {
- in = Files.newInputStream(templatePath.toFile().toPath());
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
 
- try {
- if (data.consumeBoolean()) {
- JxlsHelper.getInstance().processTemplate(in, os, context);
- } else {
- JxlsHelper.getInstance().processGridTemplateAtCell(
- in,
- os,
- context,
- data.consumeString(50),
- data.consumeString(50)
- );
- }
- } catch (IOException | JxlsException e) {}
+ Map<String, Object> dataMap = ProcessTemplateFuzzer.generateHashMap(data);
+
+ File output = new File("report.xlsx");
+
+ JxlsPoiTemplateFillerBuilder.newInstance()
+ .withTemplate(templatePath.toFile())
+ .build()
+ .fill(dataMap, new JxlsOutputFile(output));
+
  }
 }

projects/jxls/build.sh

@@ -14,17 +14,24 @@
 # limitations under the License.
 #
 ################################################################################
+echo $JAVA_HOME
 
+java --version
 
-CURRENT_VERSION=$(./gradlew properties --no-daemon --console=plain | sed -nr "s/^version:\ (.*)/\1/p")
-mv $SRC/*.dict $OUT
+echo $SRC
+echo $OUT
 
-git apply $SRC/build.patch --whitespace=fix --reject
+ls .
 
-./gradlew clean shadowJar -x :jxls:javadoc -x :jxls-poi:test
+mv *.dict $OUT
 
-cp "../jxls/jxls/build/libs/jxls-$CURRENT_VERSION-all.jar" $OUT/jxls.jar
-cp "../jxls/jxls-poi/build/libs/jxls-poi-$CURRENT_VERSION-all.jar" $OUT/jxls-poi.jar
+
+CURRENT_VERSION=$(mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout)
+
+mvn package
+
+cp "jxls/target/jxls-$CURRENT_VERSION.jar" $OUT/jxls.jar
+cp "jxls-poi/target/jxls-poi-$CURRENT_VERSION.jar" $OUT/jxls-poi.jar
 
 ALL_JARS=$(find $OUT/ -name *.jar ! -name jazzer*.jar -printf "%f ")
 
@@ -37,11 +44,10 @@ 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
+for fuzzer in $(find . -name '*Fuzzer.java'); do
  fuzzer_basename=$(basename -s .java $fuzzer)
  javac -cp $BUILD_CLASSPATH $fuzzer
- #cp $SRC/$fuzzer_basename.class $OUT/
- cp $SRC/*.class $OUT/
+ cp *.class $OUT/
 
  # Create an execution wrapper that executes Jazzer with the correct arguments.
  echo "#!/bin/bash
@@ -56,7 +62,7 @@ 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=\"\$mem_settings\" \
+--jvm_args=\"\$mem_settings:-Djava.awt.headless=true\" \
 \$@" > $OUT/$fuzzer_basename
- chmod u+x $OUT/$fuzzer_basename
-done
+ chmod +x $OUT/$fuzzer_basename
+done

projects/jxls/project.yaml

@@ -1,9 +1,10 @@
 homepage: "https://github.com/jxlsteam/jxls"
 language: jvm
+primary_contact: "[email protected]"
 fuzzing_engines:
  - libfuzzer
 main_repo: "https://github.com/jxlsteam/jxls"
 sanitizers:
  - address
 vendor_ccs:
- - "[email protected]"
+ - "[email protected]"