Prevent symbolic links from themes

diff --git a/hugofs/nolstat_fs.go b/hugofs/nolstat_fs.go
new file mode 100644 (file)
index 0000000..6b27e8e
--- /dev/null
+++ b/hugofs/nolstat_fs.go
@@ -0,0 +1,39 @@
+// Copyright 2018 The Hugo Authors. All rights reserved.
+//
+// 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 hugofs
+
+import (
+       "os"
+
+       "github.com/spf13/afero"
+)
+
+var (
+       _ afero.Fs = (*noLstatFs)(nil)
+)
+
+type noLstatFs struct {
+       afero.Fs
+}
+
+// NewNoLstatFs creates a new filesystem with no Lstat support.
+func NewNoLstatFs(fs afero.Fs) afero.Fs {
+       return &noLstatFs{Fs: fs}
+}
+
+// LstatIfPossible always delegates to Stat.
+func (fs *noLstatFs) LstatIfPossible(name string) (os.FileInfo, bool, error) {
+       fi, err := fs.Stat(name)
+       return fi, false, err
+}

diff --git a/hugolib/filesystems/basefs.go b/hugolib/filesystems/basefs.go
index c8d568270d3210a3ee530f16809682e1c46283b2..77a68a8ae2939f00d3e8ffadf8dca9cee5887288 100644 (file)
--- a/hugolib/filesystems/basefs.go
+++ b/hugolib/filesystems/basefs.go
@@ -718,6 +718,7 @@ func createThemesOverlayFs(p *paths.Paths) (afero.Fs, []string, error) {
        }
 
        fs, err := createOverlayFs(p.Fs.Source, absPaths)
+       fs = hugofs.NewNoLstatFs(fs)
 
        return fs, absPaths, err
 

diff --git a/hugolib/filesystems/basefs_test.go b/hugolib/filesystems/basefs_test.go
index ffa430addc242157b95bb31d58f2897dabcd4d6b..9f4b512fd07ccb0dc6e03449e627bf5e569a323f 100644 (file)
--- a/hugolib/filesystems/basefs_test.go
+++ b/hugolib/filesystems/basefs_test.go
@@ -218,6 +218,12 @@ func TestRealDirs(t *testing.T) {
 
        checkFileCount(bfs.Resources.Fs, "", assert, 3)
 
+       assert.NotNil(bfs.themeFs)
+       fi, b, err := bfs.themeFs.(afero.Lstater).LstatIfPossible(filepath.Join("resources", "t1.txt"))
+       assert.NoError(err)
+       assert.False(b)
+       assert.Equal("t1.txt", fi.Name())
+
 }
 
 func TestStaticFs(t *testing.T) {