MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config: don't expand 'environment variables'

Browse Source 
fixes https://github.com/pterodactyl/panel/issues/3692, again :)
This commit is contained in:
Matthew Penner 2021-11-15 10:35:59 -07:00
parent 44dfb8fdd7
commit 43d66d14b2
No known key found for this signature in database
GPG Key ID: BAB67850901908A8
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
config/config.go
View File

@ -455,31 +455,17 @@ func FromFile(path string) error {
if err != nil { if err != nil {
return err 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 return err
} }
// Store this configuration in the global state. // Store this configuration in the global state.
Set(c) Set(c)
return nil 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, // system. These directories are created so that only the owner can read the data,
// and no other users. // and no other users.
// //