aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xinfra/base-images/base-builder/compile_go_fuzzer2
-rwxr-xr-xprojects/ipfs/build.sh2
-rw-r--r--projects/minify/Dockerfile3
-rwxr-xr-xprojects/nats/build.sh4
-rw-r--r--projects/quic-go/build.sh10
-rw-r--r--projects/radon/Dockerfile4
-rwxr-xr-xprojects/vitess/build.sh2
7 files changed, 17 insertions, 10 deletions
diff --git a/infra/base-images/base-builder/compile_go_fuzzer b/infra/base-images/base-builder/compile_go_fuzzer
index 1903e453..e3442aa0 100755
--- a/infra/base-images/base-builder/compile_go_fuzzer
+++ b/infra/base-images/base-builder/compile_go_fuzzer
@@ -31,7 +31,7 @@ go mod tidy || true
# project was downloaded with go get if go list fails
go list $tags $path || { cd $GOPATH/pkg/mod/ && cd `echo $path | cut -d/ -f1-3 | awk '{print $1"@*"}'`; }
# project does not have go.mod if go list fails again
-go list $tags $path || go mod init $path
+go list $tags $path || { go mod init $path && go mod tidy ;}
if [[ $SANITIZER = *coverage* ]]; then
fuzzed_package=`go list $tags -f '{{.Name}}' $path`
diff --git a/projects/ipfs/build.sh b/projects/ipfs/build.sh
index e476a396..e1d577c4 100755
--- a/projects/ipfs/build.sh
+++ b/projects/ipfs/build.sh
@@ -15,6 +15,8 @@
#
################################################################################
+cd fuzz
+
function compile_ds_fuzzer {
fuzzer=$1
diff --git a/projects/minify/Dockerfile b/projects/minify/Dockerfile
index 79babde3..3f3516ae 100644
--- a/projects/minify/Dockerfile
+++ b/projects/minify/Dockerfile
@@ -16,5 +16,6 @@
FROM gcr.io/oss-fuzz-base/base-builder
RUN git clone --depth 1 https://github.com/tdewolff/minify
+RUN git clone --depth 1 https://github.com/tdewolff/parse
COPY build.sh $SRC/
-WORKDIR $SRC/minify
+WORKDIR $SRC/
diff --git a/projects/nats/build.sh b/projects/nats/build.sh
index 25089d54..2235a6e4 100755
--- a/projects/nats/build.sh
+++ b/projects/nats/build.sh
@@ -17,6 +17,6 @@
-compile_go_fuzzer github.com/nats-io/nats-server/conf Fuzz fuzz_conf
-compile_go_fuzzer github.com/nats-io/nats-server/server FuzzClient fuzz_client
+compile_go_fuzzer ./conf Fuzz fuzz_conf
+compile_go_fuzzer ./server FuzzClient fuzz_client
diff --git a/projects/quic-go/build.sh b/projects/quic-go/build.sh
index d82b04d8..3e3d4aba 100644
--- a/projects/quic-go/build.sh
+++ b/projects/quic-go/build.sh
@@ -17,11 +17,14 @@
set -ex
-
-
+(
+cd qpack
# Fuzz qpack
compile_go_fuzzer github.com/marten-seemann/qpack/fuzzing Fuzz qpack_fuzzer
+)
+(
+cd quic-go
# Fuzz quic-go
compile_go_fuzzer github.com/lucas-clemente/quic-go/fuzzing/frames Fuzz frame_fuzzer
compile_go_fuzzer github.com/lucas-clemente/quic-go/fuzzing/header Fuzz header_fuzzer
@@ -30,12 +33,13 @@ compile_go_fuzzer github.com/lucas-clemente/quic-go/fuzzing/tokens Fuzz token_fu
compile_go_fuzzer github.com/lucas-clemente/quic-go/fuzzing/handshake Fuzz handshake_fuzzer
# generate seed corpora
-cd quic-go && go generate fuzzing/...
+go generate fuzzing/...
zip --quiet -r $OUT/header_fuzzer_seed_corpus.zip $GOPATH/src/github.com/lucas-clemente/quic-go/fuzzing/header/corpus
zip --quiet -r $OUT/frame_fuzzer_seed_corpus.zip $GOPATH/src/github.com/lucas-clemente/quic-go/fuzzing/frames/corpus
zip --quiet -r $OUT/transportparameter_fuzzer_seed_corpus.zip $GOPATH/src/github.com/lucas-clemente/quic-go/fuzzing/transportparameters/corpus
zip --quiet -r $OUT/handshake_fuzzer_seed_corpus.zip $GOPATH/src/github.com/lucas-clemente/quic-go/fuzzing/handshake/corpus
+)
# for debugging
ls -al $OUT
diff --git a/projects/radon/Dockerfile b/projects/radon/Dockerfile
index fe4c6ca5..3d7b583b 100644
--- a/projects/radon/Dockerfile
+++ b/projects/radon/Dockerfile
@@ -15,6 +15,6 @@
################################################################################
FROM gcr.io/oss-fuzz-base/base-builder
-RUN git clone --depth 1 https://github.com/radondb/radon
+RUN go get github.com/radondb/radon/src/fuzz/sqlparser@master
COPY build.sh $SRC/
-WORKDIR $SRC/radon
+WORKDIR $SRC/
diff --git a/projects/vitess/build.sh b/projects/vitess/build.sh
index d8e9780e..8fbd9c0c 100755
--- a/projects/vitess/build.sh
+++ b/projects/vitess/build.sh
@@ -15,4 +15,4 @@
#
################################################################################
-compile_go_fuzzer github.com/vitessio/vitess/go/vt/sqlparser Fuzz fuzz
+compile_go_fuzzer ./go/vt/sqlparser Fuzz fuzz