Skip to content

Commit

Permalink
Merge branch 'master' into fix-jvm-coverage-remove-redundant
Browse files Browse the repository at this point in the history
  • Loading branch information
arthurscchan authored Nov 7, 2024
2 parents a08c547 + 7f138b9 commit 06b63c3
Show file tree
Hide file tree
Showing 11 changed files with 140 additions and 12 deletions.
11 changes: 11 additions & 0 deletions projects/jupytext/project.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
homepage: "https://jupytext.readthedocs.io/en/latest/developing.html"
language: python
primary_contact: "[email protected]"
auto_ccs:
- "[email protected]"
fuzzing_engines:
- libfuzzer
sanitizers:
- address
- undefined
main_repo: "https://github.com/mwouts/jupytext.git"
20 changes: 20 additions & 0 deletions projects/kubearmor/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright 2024 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-go
ENV FUZZING_LANGUAGE=go
RUN git clone https://github.com/kubearmor/KubeArmor
COPY build.sh $SRC/
WORKDIR $SRC/KubeArmor/KubeArmor
19 changes: 19 additions & 0 deletions projects/kubearmor/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash -eu
# Copyright 2024 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.
#
################################################################################

chmod +x $SRC/KubeArmor/KubeArmor/fuzz/build.sh
$SRC/KubeArmor/KubeArmor/fuzz/build.sh
12 changes: 12 additions & 0 deletions projects/kubearmor/project.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
homepage: "https://kubearmor.io/"
main_repo: "https://github.com/kubearmor/KubeArmor"
primary_contact: "[email protected]"
auto_ccs :
- "[email protected]"
- "[email protected]"
- "[email protected]"
language: go
fuzzing_engines:
- libfuzzer
sanitizers:
- address
11 changes: 11 additions & 0 deletions projects/pdfplumber/project.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
homepage: "https://github.com/jsvine/pdfplumber"
language: python
primary_contact: "[email protected]"
auto_ccs:
- "[email protected]"
fuzzing_engines:
- libfuzzer
sanitizers:
- address
- undefined
main_repo: "https://github.com/jsvine/pdfplumber.git"
21 changes: 21 additions & 0 deletions projects/rinja/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Copyright 2024 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-rust
RUN apt-get update && apt-get install -y make autoconf automake libtool
RUN git clone --depth 1 --recurse-submodules --shallow-submodules https://github.com/rinja-rs/rinja.git rinja
WORKDIR rinja/fuzzing
COPY build.sh $SRC/
25 changes: 25 additions & 0 deletions projects/rinja/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/bin/bash
# Copyright 2024 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.
#
################################################################################

set -euxo pipefail

target_out_dir=target/x86_64-unknown-linux-gnu/release
cargo fuzz build --release
cargo fuzz list | while read i; do
zip --recurse-paths --junk-paths --quiet "${OUT}/${i}_seed_corpus.zip" "./fuzz/corpus/${i}/"
mv -t "${OUT}/" "$target_out_dir/${i}"
done
13 changes: 13 additions & 0 deletions projects/rinja/project.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
homepage: "https://rinja.readthedocs.io/"
main_repo: "https://github.com/rinja-rs/rinja"
language: rust
primary_contact: "[email protected]"
auto_ccs:
- "[email protected]"
sanitizers:
- address
fuzzing_engines:
- libfuzzer
coverage_extra_args: >
-ignore-filename-regex=.*/rustc/.*
-ignore-filename-regex=.*/rust/.
6 changes: 3 additions & 3 deletions projects/wasmer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@
FROM gcr.io/oss-fuzz-base/base-builder-rust

RUN apt-get update && apt-get install -y make autoconf automake libtool \
zlib1g-dev libffi-dev build-essential libxml2-dev
zlib1g-dev libffi-dev build-essential libxml2-dev

RUN git clone --depth 1 https://github.com/wasmerio/wasmer wasmer

RUN mkdir -p $SRC/.llvm && curl --proto '=https' --tlsv1.2 -sSf \
https://github.com/wasmerio/llvm-custom-builds/releases/download/15.x/llvm-linux-amd64.tar.xz -L -o - | \
https://github.com/wasmerio/llvm-custom-builds/releases/download/18.x/llvm-linux-amd64.tar.xz -L -o -| \
tar xJv -C $SRC/.llvm

WORKDIR wasmer

# dead code warnings with nightly-2024-07-12
ENV RUSTUP_TOOLCHAIN nightly-2024-02-12
ENV RUSTUP_TOOLCHAIN nightly-2024-10-10

COPY build.sh default.options $SRC/
6 changes: 1 addition & 5 deletions projects/wasmer/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,11 @@
#
################################################################################

export LLVM_SYS_150_PREFIX=$($SRC/.llvm/bin/llvm-config --prefix)
export LLVM_SYS_180_PREFIX=$($SRC/.llvm/bin/llvm-config --prefix)

# Needed for coverage to work.
nightly="+$RUSTUP_TOOLCHAIN"

pushd $SRC/wasmer/fuzz
cargo update -p serde --precise 1.0.203
popd

cargo $nightly fuzz build universal_cranelift --features=universal,cranelift -O
cargo $nightly fuzz build universal_llvm --features=universal,llvm -O
cargo $nightly fuzz build universal_singlepass --features=universal,singlepass -O
Expand Down
8 changes: 4 additions & 4 deletions projects/wasmer/project.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
homepage: "https://github.com/wasmerio/wasmer"
language: rust
main_repo: "https://github.com/wasmerio/wasmer"
primary_contact: "syrus@wasmer.io"
primary_contact: "edoardo@wasmer.io"
auto_ccs:
- michael@wasmer.io
- felix@wasmer.io
- sebastien@wasmer.io
- syrus@wasmer.io
- christoph@wasmer.io
- amin@wasmer.io
sanitizers:
- address
fuzzing_engines:
Expand Down

0 comments on commit 06b63c3

Please sign in to comment.