From 43d66d14b2906e54b5411714d90f0fd3caaaabcd Mon Sep 17 00:00:00 2001 From: Matthew Penner Date: Mon, 15 Nov 2021 10:35:59 -0700 Subject: [PATCH] config: don't expand 'environment variables' fixes https://github.com/pterodactyl/panel/issues/3692, again :) --- config/config.go | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/config/config.go b/config/config.go index 997d4bc..91cf03b 100644 --- a/config/config.go +++ b/config/config.go @@ -455,31 +455,17 @@ func FromFile(path string) error { if err != nil { return err } - // Replace environment variables within the configuration file with their - // values from the host system. This function works almost identically to - // the default os.ExpandEnv function, except it supports escaping dollar - // signs in the text if you pass "$$" through. - // - // "some$$foo" -> "some$foo" - // "some$foo" -> "some" (or "someVALUE_OF_FOO" if FOO is defined in env) - // - // @see https://github.com/pterodactyl/panel/issues/3692 - exp := os.Expand(string(b), func(s string) string { - if s == "$" { - return s - } - return os.Getenv(s) - }) - if err := yaml.Unmarshal([]byte(exp), c); err != nil { + if err := yaml.Unmarshal([]byte(b), c); err != nil { return err } + // Store this configuration in the global state. Set(c) return nil } -// ConfigureDirectories ensures that all of the system directories exist on the +// ConfigureDirectories ensures that all the system directories exist on the // system. These directories are created so that only the owner can read the data, // and no other users. //