aboutsummaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <[email protected]>2021-12-12 12:11:11 +0100
committerBjørn Erik Pedersen <[email protected]>2021-12-16 09:40:22 +0100
commitf4389e48ce0a70807362772d66c12ab5cd9e15f8 (patch)
tree1334516a199dcdf4133758e3664348287e73e88b /modules
parent803f572e66c5e22213ddcc994c41b3e80e9c1f35 (diff)
downloadhugo-f4389e48ce0a70807362772d66c12ab5cd9e15f8.tar.gz
hugo-f4389e48ce0a70807362772d66c12ab5cd9e15f8.zip
Add some basic security policies with sensible defaults
This ommmit contains some security hardening measures for the Hugo build runtime. There are some rarely used features in Hugo that would be good to have disabled by default. One example would be the "external helpers". For `asciidoctor` and some others we use Go's `os/exec` package to start a new process. These are a predefined set of binary names, all loaded from `PATH` and with a predefined set of arguments. Still, if you don't use `asciidoctor` in your project, you might as well have it turned off. You can configure your own in the new `security` configuration section, but the defaults are configured to create a minimal amount of site breakage. And if that do happen, you will get clear instructions in the loa about what to do. The default configuration is listed below. Note that almost all of these options are regular expression _whitelists_ (a string or a slice); the value `none` will block all. ```toml [security] enableInlineShortcodes = false [security.exec] allow = ['^dart-sass-embedded$', '^go$', '^npx$', '^postcss$'] osEnv = ['(?i)^(PATH|PATHEXT|APPDATA|TMP|TEMP|TERM)$'] [security.funcs] getenv = ['^HUGO_'] [security.http] methods = ['(?i)GET|POST'] urls = ['.*'] ```
Diffstat (limited to 'modules')
-rw-r--r--modules/client.go29
-rw-r--r--modules/client_test.go4
2 files changed, 20 insertions, 13 deletions
diff --git a/modules/client.go b/modules/client.go
index fcb5957c3..1924cd5b4 100644
--- a/modules/client.go
+++ b/modules/client.go
@@ -28,6 +28,7 @@ import (
"strings"
"time"
+ "github.com/gohugoio/hugo/common/collections"
"github.com/gohugoio/hugo/common/hexec"
hglob "github.com/gohugoio/hugo/hugofs/glob"
@@ -79,7 +80,7 @@ func NewClient(cfg ClientConfig) *Client {
goModFilename = n
}
- env := os.Environ()
+ var env []string
mcfg := cfg.ModuleConfig
config.SetEnvVars(&env,
@@ -87,12 +88,9 @@ func NewClient(cfg ClientConfig) *Client {
"GO111MODULE", "on",
"GOPROXY", mcfg.Proxy,
"GOPRIVATE", mcfg.Private,
- "GONOPROXY", mcfg.NoProxy)
-
- if cfg.CacheDir != "" {
- // Module cache stored below $GOPATH/pkg
- config.SetEnvVars(&env, "GOPATH", cfg.CacheDir)
- }
+ "GONOPROXY", mcfg.NoProxy,
+ "GOPATH", cfg.CacheDir,
+ )
logger := cfg.Logger
if logger == nil {
@@ -609,16 +607,19 @@ func (c *Client) runGo(
}
stderr := new(bytes.Buffer)
- cmd, err := hexec.SafeCommandContext(ctx, "go", args...)
+
+ argsv := collections.StringSliceToInterfaceSlice(args)
+ argsv = append(argsv, hexec.WithEnviron(c.environ))
+ argsv = append(argsv, hexec.WithStderr(io.MultiWriter(stderr, os.Stderr)))
+ argsv = append(argsv, hexec.WithStdout(stdout))
+ argsv = append(argsv, hexec.WithDir(c.ccfg.WorkingDir))
+ argsv = append(argsv, hexec.WithContext(ctx))
+
+ cmd, err := c.ccfg.Exec.New("go", argsv...)
if err != nil {
return err
}
- cmd.Env = c.environ
- cmd.Dir = c.ccfg.WorkingDir
- cmd.Stdout = stdout
- cmd.Stderr = io.MultiWriter(stderr, os.Stderr)
-
if err := cmd.Run(); err != nil {
if ee, ok := err.(*exec.Error); ok && ee.Err == exec.ErrNotFound {
c.goBinaryStatus = goBinaryStatusNotFound
@@ -727,6 +728,8 @@ type ClientConfig struct {
// Eg. "production"
Environment string
+ Exec *hexec.Exec
+
CacheDir string // Module cache
ModuleConfig Config
}
diff --git a/modules/client_test.go b/modules/client_test.go
index f801af07d..75e3c2b08 100644
--- a/modules/client_test.go
+++ b/modules/client_test.go
@@ -21,6 +21,8 @@ import (
"sync/atomic"
"testing"
+ "github.com/gohugoio/hugo/common/hexec"
+ "github.com/gohugoio/hugo/config/security"
"github.com/gohugoio/hugo/hugofs/glob"
"github.com/gohugoio/hugo/htesting"
@@ -53,7 +55,9 @@ github.com/gohugoio/hugoTestModules1_darwin/[email protected] github.com/gohugoio/h
ccfg := ClientConfig{
Fs: hugofs.Os,
WorkingDir: workingDir,
+ CacheDir: filepath.Join(workingDir, "modcache"),
ThemesDir: themesDir,
+ Exec: hexec.New(security.DefaultConfig),
}
withConfig(&ccfg)