From da02c29e94fb8fbacc21a7c78815c4adbc32501b Mon Sep 17 00:00:00 2001 From: Reed Loden Date: Mon, 20 Jun 2022 20:31:10 -0700 Subject: [PATCH] teleport: Update to go1.18 native fuzzing (#7895) * Swap from `compile_go_fuzzer` to `compile_native_go_fuzzer` * Move building to an internal script `fuzz/oss-fuzz-build.sh` to ease addition of new fuzzing methods * Update `auto_ccs` --- projects/teleport/Dockerfile | 8 ++++---- projects/teleport/build.sh | 7 ++----- projects/teleport/project.yaml | 11 ++++++----- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/projects/teleport/Dockerfile b/projects/teleport/Dockerfile index 06abb029c..c7bced3e1 100644 --- a/projects/teleport/Dockerfile +++ b/projects/teleport/Dockerfile @@ -1,4 +1,4 @@ -# Copyright 2020 Google Inc. +# Copyright 2020 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,7 +14,7 @@ # ################################################################################ -FROM gcr.io/oss-fuzz-base/base-builder-go-codeintelligencetesting -RUN git clone --depth 1 https://github.com/gravitational/teleport.git +FROM gcr.io/oss-fuzz-base/base-builder-go +RUN git clone --depth 1 https://github.com/gravitational/teleport.git teleport +WORKDIR teleport COPY build.sh $SRC/ -WORKDIR $SRC/teleport diff --git a/projects/teleport/build.sh b/projects/teleport/build.sh index 3fbb548fa..df0e7d468 100644 --- a/projects/teleport/build.sh +++ b/projects/teleport/build.sh @@ -1,5 +1,5 @@ #!/bin/bash -eu -# Copyright 2020 Google Inc. +# Copyright 2020 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,7 +15,4 @@ # ################################################################################ -go mod tidy -rm /root/go/pkg/mod/github.com/aws/aws-sdk-go-v2/internal/ini@v1.2.2/fuzz.go -compile_go_fuzzer github.com/gravitational/teleport/lib/fuzz FuzzParseProxyJump utils_fuzz gofuzz -compile_go_fuzzer github.com/gravitational/teleport/lib/fuzz FuzzNewExpression parse_fuzz gofuzz +bash -x ./fuzz/oss-fuzz-build.sh diff --git a/projects/teleport/project.yaml b/projects/teleport/project.yaml index 4294579d8..6fa63d8a9 100644 --- a/projects/teleport/project.yaml +++ b/projects/teleport/project.yaml @@ -1,10 +1,11 @@ homepage: "https://github.com/gravitational/teleport" -main_repo: "https://github.com/gravitational/teleport" -primary_contact: "reed@goteleport.com" -auto_ccs : - - "adam@adalogics.com" - - "oss-fuzz@goteleport.com" language: go +primary_contact: "reed@goteleport.com" +main_repo: "https://github.com/gravitational/teleport" +auto_ccs: + - "oss-fuzz@goteleport.com" + - "zac.bergquist@goteleport.com" + - "ossfuzz1337@gmail.com" fuzzing_engines: - libfuzzer sanitizers: