jackon-modules-java8: initial integration (#7913)

Initial integration
This commit is contained in:
psy 2022-06-28 01:00:16 +02:00 committed by GitHub
parent 7c457cc481
commit a2e176a238
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 150 additions and 0 deletions

View File

@ -0,0 +1,50 @@
import com.code_intelligence.jazzer.api.FuzzedDataProvider;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.ObjectReader;
import java.io.IOException;
import java.util.Optional;
import java.util.List;
import com.code_intelligence.jazzer.api.FuzzerSecurityIssueLow;
import com.fasterxml.jackson.annotation.JsonMerge;
import java.util.OptionalDouble;
import java.util.OptionalInt;
import java.util.OptionalLong;
public class DatatypeFuzzer {
public static void fuzzerTestOneInput(FuzzedDataProvider data) {
String content = data.consumeString(100);
String merge = data.consumeRemainingAsString();
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new JavaTimeModule());
mapper.registerModule(new Jdk8Module());
try {
Dummy dummy1 = mapper.readValue(content, Dummy.class);
Dummy dummy2 = mapper.readValue(mapper.writeValueAsString(dummy1), Dummy.class);
if (!dummy1.equals(dummy2)) {
throw new FuzzerSecurityIssueLow("Different values " + dummy1.debug() + " != " + dummy2.debug());
}
mapper.readerForUpdating(merge);
} catch (IOException e) {
}
}
public static class Dummy {
public Optional<String> value = Optional.empty();
public Optional<Boolean> bool = Optional.empty();;
@JsonMerge
public Optional<List<String>> list = Optional.empty();
public OptionalInt optint = OptionalInt.empty();
public OptionalLong optlong = OptionalLong.empty();
public OptionalDouble optdouble = OptionalDouble.empty();
public String debug() {
return "%s %s %s %s %s %s".formatted(this.value, this.bool, this.list, this.optint, this.optlong, this.optdouble);
}
}
}

View File

@ -0,0 +1,33 @@
# 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
RUN git clone --depth 1 https://github.com/google/fuzzing && \
mv fuzzing/dictionaries/json.dict $SRC/YamlFuzzer.dict && \
rm -rf fuzzing
RUN git clone --depth 1 https://github.com/FasterXML/jackson-modules-java8
COPY build.sh $SRC/
COPY *Fuzzer.java $SRC/
WORKDIR $SRC/jackson-modules-java8

View File

@ -0,0 +1,54 @@
#!/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.
#
################################################################################
mv $SRC/*.dict $OUT
MAVEN_ARGS="-Djavac.src.version=15 -Djavac.target.version=15 -DskipTests"
$MVN package org.apache.maven.plugins:maven-shade-plugin:3.2.4:shade $MAVEN_ARGS
CURRENT_VERSION=$($MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
-Dexpression=project.version -q -DforceStdout)
cp "datetime/target/jackson-datatype-jsr310-$CURRENT_VERSION.jar" "$OUT/jackson-datetime.jar"
cp "datatypes/target/jackson-datatype-jdk8-$CURRENT_VERSION.jar" "$OUT/jackson-datatype.jar"
ALL_JARS="jackson-datatype.jar jackson-datetime.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
cp $SRC/$fuzzer_basename.class $OUT/
cp $SRC/$fuzzer_basename\$Dummy.class $OUT/
# 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 \
--instrumentation_includes=com.fasterxml.jackson.datatype.** \
--cp=$RUNTIME_CLASSPATH \
--target_class=$fuzzer_basename \
--jvm_args=\"-Xmx2048m\" \
\$@" > $OUT/$fuzzer_basename
chmod u+x $OUT/$fuzzer_basename
done

View File

@ -0,0 +1,13 @@
homepage: "https://github.com/FasterXML/jackson-modules-java8"
language: jvm
main_repo: "https://github.com/FasterXML/jackson-modules-java8.git"
primary_contact: "tatu@fasterxml.com"
fuzzing_engines:
- libfuzzer
sanitizers:
- address
vendor_ccs:
- "wagner@code-intelligence.com"
- "yakdan@code-intelligence.com"
- "glendowne@code-intelligence.com"
- "patrice.salathe@code-intelligence.com"