MVEL: Initial integration. (#9856)

Initial integration for MVEL.
This commit is contained in:
Henry Lin 2023-03-06 15:22:41 +01:00 committed by GitHub
parent 2f00a255c8
commit 1c4b760e16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 246 additions and 0 deletions

4
projects/mvel/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
project-parent/mvel
project-parent/fuzz-targets/target
project-parent/fuzz-targets/src/test/resources
project-parent/fuzz-targets/pom.xml.versionsBackup

33
projects/mvel/Dockerfile Normal file
View File

@ -0,0 +1,33 @@
# Copyright 2023 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
# if not set python infra helper cannot be used for local testing
COPY project-parent $SRC/project-parent/
RUN rm -rf $SRC/project-parent/mvel
RUN git clone --depth 1 https://github.com/mvel/mvel/ $SRC/project-parent/mvel
COPY build.sh $SRC/
WORKDIR $SRC/

82
projects/mvel/build.sh Executable file
View File

@ -0,0 +1,82 @@
#!/bin/bash -eu
# Copyright 2023 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.
#
################################################################################
PROJECT=mvel
PROJECT_GROUP_ID=org.mvel
PROJECT_ARTIFACT_ID=mvel2
MAIN_REPOSITORY=https://github.com/mvel/mvel/
MAVEN_ARGS="-Djavac.src.version=15 -Djavac.target.version=15 -Denforcer.skip=true -DskipTests"
function set_project_version_in_fuzz_targets_dependency {
PROJECT_VERSION=$(cd $PROJECT && $MVN org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate -Dexpression=project.version -q -DforceStdout)
# set dependency project version in fuzz-targets
(cd fuzz-targets && $MVN versions:use-dep-version -Dincludes=$PROJECT_GROUP_ID:$PROJECT_ARTIFACT_ID -DdepVersion=$PROJECT_VERSION -DforceVersion=true)
}
cd project-parent
# LOCAL_DEV env variable need to be set in local development env
if [[ -v LOCAL_DEV ]]; then
MVN=mvn
# checkout latest project version
git -C $PROJECT pull || git clone $MAIN_REPOSITORY $PROJECT
set_project_version_in_fuzz_targets_dependency
#install
(cd $PROJECT && $MVN install $MAVEN_ARGS)
mvn -pl fuzz-targets install
else
# Move seed corpus and dictionary.
# mv $SRC/{*.zip,*.dict} $OUT
set_project_version_in_fuzz_targets_dependency
#install
(cd $PROJECT && $MVN install $MAVEN_ARGS -Dmaven.repo.local=$OUT/m2)
$MVN -pl fuzz-targets install -Dmaven.repo.local=$OUT/m2
# build classpath
$MVN -pl fuzz-targets dependency:build-classpath -Dmdep.outputFile=cp.txt -Dmaven.repo.local=$OUT/m2
cp -r $SRC/project-parent/fuzz-targets/target/test-classes/ $OUT/
RUNTIME_CLASSPATH_ABSOLUTE="$(cat fuzz-targets/cp.txt):$OUT/test-classes"
RUNTIME_CLASSPATH_RELATIVE=$(echo $RUNTIME_CLASSPATH_ABSOLUTE | sed "s|$OUT|.|g")
for fuzzer in $(find $SRC/project-parent/fuzz-targets -name '*Fuzzer.java'); do
fuzzer_basename=$(basename -s .java $fuzzer)
# Create an execution wrapper for every fuzztarget
echo "#!/bin/bash
# LLVMFuzzerTestOneInput comment for fuzzer detection by infrastructure.
if [[ \"\$@\" =~ (^| )-runs=[0-9]+($| ) ]]; then
mem_settings='-Xmx1900m -Xss900k'
else
mem_settings='-Xmx2048m -Xss1024k'
fi
java -cp $RUNTIME_CLASSPATH_RELATIVE \
\$mem_settings \
com.code_intelligence.jazzer.Jazzer \
--target_class=com.example.$fuzzer_basename \
--disabled_hooks=com.code_intelligence.jazzer.sanitizers.ExpressionLanguageInjection:com.code_intelligence.jazzer.sanitizers.RegexInjection \
\$@" > $OUT/$fuzzer_basename
chmod u+x $OUT/$fuzzer_basename
done
fi

View File

@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>com.fuzzer</groupId>
<artifactId>fuzz-targets</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>fuzz</name>
<description>fuzz</description>
<properties>
<java.version>15</java.version>
<maven.compiler.source>15</maven.compiler.source>
<maven.compiler.target>15</maven.compiler.target>
</properties>
<dependencies>
<dependency>
<groupId>com.code-intelligence</groupId>
<artifactId>jazzer-junit</artifactId>
<version>0.15.0</version>
</dependency>
<dependency>
<groupId>org.junit.platform</groupId>
<artifactId>junit-platform-launcher</artifactId>
<version>1.9.2</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.9.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
<version>2.4.16-SNAPSHOT</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.2</version>
</plugin>
</plugins>
<testResources>
<testResource>
<directory>${project.basedir}/src/test/resources</directory>
</testResource>
</testResources>
</build>
</project>

View File

@ -0,0 +1,41 @@
// Copyright 2023 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.
//
////////////////////////////////////////////////////////////////////////////////
package com.example;
import com.code_intelligence.jazzer.api.FuzzedDataProvider;
import com.code_intelligence.jazzer.junit.FuzzTest;
import org.mvel2.MVEL;
import org.mvel2.CompileException;
import org.mvel2.ScriptRuntimeException;
import org.mvel2.UnresolveablePropertyException;
class MvelFuzzer {
@FuzzTest
void myFuzzTest(FuzzedDataProvider data) {
String input = data.consumeRemainingAsString();
try {
MVEL.eval(input);
MVEL.compileExpression(input);
} catch (UnresolveablePropertyException | CompileException | ArithmeticException | ScriptRuntimeException e) {
// Documented Exceptions
} catch (java.lang.AssertionError | RuntimeException e) {
// Not expected to be thrown but we catch to reach deeper program states.
}
}
}

View File

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>com.fuzzer</groupId>
<artifactId>project-parent</artifactId>
<version>0.1.0</version>
<packaging>pom</packaging>
<modules>
<module>mvel</module>
<module>fuzz-targets</module>
</modules>
</project>

View File

@ -0,0 +1,9 @@
homepage: "https://github.com/mvel/mvel/"
language: jvm
fuzzing_engines:
- libfuzzer
main_repo: "https://github.com/mvel/mvel/"
sanitizers:
- address
vendor_ccs:
- "bug-disclosure@code-intelligence.com"