github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

Revert "config/security: Add HOME to default exec env var whitelist"

Browse source 
There have been one report in the wild suggesting that this needs to be tested better before doing:

https://discourse.gohugo.io/t/hugo-mod-failing-in-v0-91-1-but-works-in-v0-91-0/36180/5

This reverts commit fca266ebbb.
This commit is contained in:
Bjørn Erik Pedersen 2021-12-23 12:46:04 +01:00
parent aee9e11a40
commit 623dda7174
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
config/security/securityConfig.go
View file

@ -42,7 +42,7 @@ var DefaultConfig = Config{
), ),
// These have been tested to work with Hugo's external programs // These have been tested to work with Hugo's external programs
// on Windows, Linux and MacOS. // on Windows, Linux and MacOS.
OsEnv: NewWhitelist("(?i)^(PATH|PATHEXT|APPDATA|HOME|TMP|TEMP|TERM)$"), OsEnv: NewWhitelist("(?i)^(PATH|PATHEXT|APPDATA|TMP|TEMP|TERM)$"),
}, },
Funcs: Funcs{ Funcs: Funcs{
Getenv: NewWhitelist("^HUGO_"), Getenv: NewWhitelist("^HUGO_"),
@ -110,6 +110,7 @@ func (c Config) CheckAllowedExec(name string) error {
} }
} }
return nil return nil
} }
func (c Config) CheckAllowedGetEnv(name string) error { func (c Config) CheckAllowedGetEnv(name string) error {
@ -158,6 +159,7 @@ func (c Config) ToSecurityMap() map[string]interface{} {
"security": m, "security": m,
} }
return sec return sec
} }
// DecodeConfig creates a privacy Config from a given Hugo configuration. // DecodeConfig creates a privacy Config from a given Hugo configuration.
@ -187,6 +189,7 @@ func DecodeConfig(cfg config.Provider) (Config, error) {
} }
return sc, nil return sc, nil
} }
func stringSliceToWhitelistHook() mapstructure.DecodeHookFuncType { func stringSliceToWhitelistHook() mapstructure.DecodeHookFuncType {
@ -202,6 +205,7 @@ func stringSliceToWhitelistHook() mapstructure.DecodeHookFuncType {
wl := types.ToStringSlicePreserveString(data) wl := types.ToStringSlicePreserveString(data)
return NewWhitelist(wl...), nil return NewWhitelist(wl...), nil
} }
} }

7
config/security/securityonfig_test.go
View file

@ -53,6 +53,7 @@ getEnv=["a", "b"]
c.Assert(pc.Exec.OsEnv.Accept("e"), qt.IsFalse) c.Assert(pc.Exec.OsEnv.Accept("e"), qt.IsFalse)
c.Assert(pc.Funcs.Getenv.Accept("a"), qt.IsTrue) c.Assert(pc.Funcs.Getenv.Accept("a"), qt.IsTrue)
c.Assert(pc.Funcs.Getenv.Accept("c"), qt.IsFalse) c.Assert(pc.Funcs.Getenv.Accept("c"), qt.IsFalse)
}) })
c.Run("String whitelist", func(c *qt.C) { c.Run("String whitelist", func(c *qt.C) {
@ -79,6 +80,7 @@ osEnv="b"
c.Assert(pc.Exec.Allow.Accept("d"), qt.IsFalse) c.Assert(pc.Exec.Allow.Accept("d"), qt.IsFalse)
c.Assert(pc.Exec.OsEnv.Accept("b"), qt.IsTrue) c.Assert(pc.Exec.OsEnv.Accept("b"), qt.IsTrue)
c.Assert(pc.Exec.OsEnv.Accept("e"), qt.IsFalse) c.Assert(pc.Exec.OsEnv.Accept("e"), qt.IsFalse)
}) })
c.Run("Default exec.osEnv", func(c *qt.C) { c.Run("Default exec.osEnv", func(c *qt.C) {
@ -103,6 +105,7 @@ allow="a"
c.Assert(pc.Exec.Allow.Accept("a"), qt.IsTrue) c.Assert(pc.Exec.Allow.Accept("a"), qt.IsTrue)
c.Assert(pc.Exec.OsEnv.Accept("PATH"), qt.IsTrue) c.Assert(pc.Exec.OsEnv.Accept("PATH"), qt.IsTrue)
c.Assert(pc.Exec.OsEnv.Accept("e"), qt.IsFalse) c.Assert(pc.Exec.OsEnv.Accept("e"), qt.IsFalse)
}) })
c.Run("Enable inline shortcodes, legacy", func(c *qt.C) { c.Run("Enable inline shortcodes, legacy", func(c *qt.C) {
@ -126,7 +129,9 @@ osEnv="b"
pc, err := DecodeConfig(cfg) pc, err := DecodeConfig(cfg)
c.Assert(err, qt.IsNil) c.Assert(err, qt.IsNil)
c.Assert(pc.EnableInlineShortcodes, qt.IsTrue) c.Assert(pc.EnableInlineShortcodes, qt.IsTrue)
}) })
} }
func TestToTOML(t *testing.T) { func TestToTOML(t *testing.T) {
@ -135,7 +140,7 @@ func TestToTOML(t *testing.T) {
got := DefaultConfig.ToTOML() got := DefaultConfig.ToTOML()
c.Assert(got, qt.Equals, c.Assert(got, qt.Equals,
"[security]\n enableInlineShortcodes = false\n [security.exec]\n allow = ['^dart-sass-embedded$', '^go$', '^npx$', '^postcss$']\n osEnv = ['(?i)^(PATH|PATHEXT|APPDATA|HOME|TMP|TEMP|TERM)$']\n\n [security.funcs]\n getenv = ['^HUGO_']\n\n [security.http]\n methods = ['(?i)GET|POST']\n urls = ['.*']", "[security]\n enableInlineShortcodes = false\n [security.exec]\n allow = ['^dart-sass-embedded$', '^go$', '^npx$', '^postcss$']\n osEnv = ['(?i)^(PATH|PATHEXT|APPDATA|TMP|TEMP|TERM)$']\n\n [security.funcs]\n getenv = ['^HUGO_']\n\n [security.http]\n methods = ['(?i)GET|POST']\n urls = ['.*']",
) )
} }

2
docs/data/docs.json
View file

@ -1839,7 +1839,7 @@
"^postcss$" "^postcss$"
], ],
"osEnv": [ "osEnv": [
"(?i)^(PATH|PATHEXT|APPDATA|HOME|TMP|TEMP|TERM)$" "(?i)^(PATH|PATHEXT|APPDATA|TMP|TEMP|TERM)$"
] ]
}, },
"funcs": { "funcs": {