From 9e96a69018343aad6a0ac106fd7ca41298385841 Mon Sep 17 00:00:00 2001 From: AdamKorcz <44787359+AdamKorcz@users.noreply.github.com> Date: Wed, 31 Mar 2021 15:28:20 +0100 Subject: [PATCH] [hugo] Fix build (#5538) --- projects/hugo/Dockerfile | 3 +- projects/hugo/build.sh | 1 + projects/hugo/fuzz.go | 61 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 projects/hugo/fuzz.go diff --git a/projects/hugo/Dockerfile b/projects/hugo/Dockerfile index 3584ce980..bfba1a283 100644 --- a/projects/hugo/Dockerfile +++ b/projects/hugo/Dockerfile @@ -16,7 +16,6 @@ FROM gcr.io/oss-fuzz-base/base-builder -ENV GO111MODULE on RUN git clone https://github.com/gohugoio/hugo -COPY build.sh $SRC/ +COPY build.sh fuzz.go $SRC/ WORKDIR $SRC/hugo diff --git a/projects/hugo/build.sh b/projects/hugo/build.sh index e9015c5ac..c1950ca1e 100755 --- a/projects/hugo/build.sh +++ b/projects/hugo/build.sh @@ -15,5 +15,6 @@ # ################################################################################ +mv $SRC/fuzz.go $SRC/hugo/tpl/transform/ compile_go_fuzzer github.com/gohugoio/hugo/tpl/transform FuzzMarkdownify fuzzmarkdownify diff --git a/projects/hugo/fuzz.go b/projects/hugo/fuzz.go new file mode 100644 index 000000000..7a22e6d50 --- /dev/null +++ b/projects/hugo/fuzz.go @@ -0,0 +1,61 @@ +// +build gofuzz + +// 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 transform + +import ( + "github.com/gohugoio/hugo/common/loggers" + "github.com/gohugoio/hugo/config" + "github.com/gohugoio/hugo/deps" + "github.com/gohugoio/hugo/helpers" + "github.com/gohugoio/hugo/hugofs" + "github.com/gohugoio/hugo/langs" + "github.com/spf13/afero" + "github.com/spf13/viper" +) + +func newFuzzDeps(cfg config.Provider) *deps.Deps { + cfg.Set("contentDir", "content") + cfg.Set("i18nDir", "i18n") + + l := langs.NewLanguage("en", cfg) + + cs, _ := helpers.NewContentSpec(l, loggers.NewErrorLogger(), afero.NewMemMapFs()) + + return &deps.Deps{ + Cfg: cfg, + Fs: hugofs.NewMem(l), + ContentSpec: cs, + } +} + +func FuzzMarkdownify(data []byte) int { + v := viper.New() + v.Set("contentDir", "content") + ns := New(newFuzzDeps(v)) + + for _, test := range []struct { + s interface{} + }{ + {string(data)}, + } { + _, err := ns.Markdownify(test.s) + if err != nil { + return 0 + } + } + return 1 +}