From 3bb23a3cdc79b3469bcfd91e4a851bcf600f4158 Mon Sep 17 00:00:00 2001 From: AdamKorcz <44787359+AdamKorcz@users.noreply.github.com> Date: Fri, 17 Sep 2021 00:45:04 +0100 Subject: [PATCH] [etcd] Initial integration (#5953) * [etcd] Initial integration * Add ReadAll() to fuzzer * Change wording * Add maintainer email --- projects/etcd/Dockerfile | 20 +++++++++++++ projects/etcd/build.sh | 20 +++++++++++++ projects/etcd/project.yaml | 10 +++++++ projects/etcd/wal_fuzzer.go | 58 +++++++++++++++++++++++++++++++++++++ 4 files changed, 108 insertions(+) create mode 100644 projects/etcd/Dockerfile create mode 100644 projects/etcd/build.sh create mode 100644 projects/etcd/project.yaml create mode 100644 projects/etcd/wal_fuzzer.go diff --git a/projects/etcd/Dockerfile b/projects/etcd/Dockerfile new file mode 100644 index 000000000..791eba232 --- /dev/null +++ b/projects/etcd/Dockerfile @@ -0,0 +1,20 @@ +# Copyright 2021 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 +RUN git clone --depth 1 https://github.com/etcd-io/etcd +COPY wal_fuzzer.go build.sh $SRC/ +WORKDIR $SRC/etcd diff --git a/projects/etcd/build.sh b/projects/etcd/build.sh new file mode 100644 index 000000000..466fcb7ca --- /dev/null +++ b/projects/etcd/build.sh @@ -0,0 +1,20 @@ +#!/bin/bash -eu +# Copyright 2021 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/wal_fuzzer.go $SRC/etcd/server/wal/ +compile_go_fuzzer go.etcd.io/etcd/server/v3/wal FuzzWalCreate fuzz_wal_create + diff --git a/projects/etcd/project.yaml b/projects/etcd/project.yaml new file mode 100644 index 000000000..4470f5c58 --- /dev/null +++ b/projects/etcd/project.yaml @@ -0,0 +1,10 @@ +homepage: "https://etcd.io" +main_repo: "https://github.com/etcd-io/etcd" +primary_contact: "ptab@google.com" +auto_ccs : + - "adam@adalogics.com" +language: go +fuzzing_engines: + - libfuzzer +sanitizers: + - address diff --git a/projects/etcd/wal_fuzzer.go b/projects/etcd/wal_fuzzer.go new file mode 100644 index 000000000..36bc9589e --- /dev/null +++ b/projects/etcd/wal_fuzzer.go @@ -0,0 +1,58 @@ +// Copyright 2021 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 wal + +import ( + "bytes" + "io/ioutil" + "os" + + "go.etcd.io/etcd/raft/v3/raftpb" + "go.etcd.io/etcd/server/v3/wal/walpb" + "go.uber.org/zap" +) + +func FuzzWalCreate(data []byte) int { + p, err := ioutil.TempDir("/tmp", "waltest") + if err != nil { + return -1 + } + defer os.RemoveAll(p) + w, err := Create(zap.NewExample(), p, data) + if err != nil { + return 0 + } + if err = w.SaveSnapshot(walpb.Snapshot{}); err != nil { + return 0 + } + if err = w.Save(raftpb.HardState{}, []raftpb.Entry{{Index: 0}}); err != nil { + return 0 + } + w.Close() + neww, err := Open(zap.NewExample(), p, walpb.Snapshot{}) + if err != nil { + return 0 + } + defer neww.Close() + metadata, _, _, err := neww.ReadAll() + if err != nil { + return 0 + } + if !bytes.Equal(data, metadata) { + panic("data and metadata are not equal, but they should be") + } + return 1 +}