scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-31 18:48:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

VAULT-12299 Use file.Stat when checking file permissions (#19311)

Browse Source 
* use file.Stat for config files

* cleanup and add path

* include directory path

* revert changes to LoadConfigDir

* remove path, add additional test:

* add changelog
This commit is contained in:
miagilepner
2023-02-23 18:05:00 +01:00
committed by GitHub
parent 354af62b1d
commit 20b347e3cd
4 changed files with 127 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
command/server/config.go
View File

@@ -5,7 +5,6 @@ import (
"errors"
"fmt"
"io"
"io/ioutil"
"math"
"os"
"path/filepath"
@@ -465,9 +464,14 @@ func LoadConfig(path string) (*Config, error) {
return nil, errors.New("Error parsing the environment variable VAULT_ENABLE_FILE_PERMISSIONS_CHECK")
}
}
f, err := os.Open(path)
if err != nil {
return nil, err
}
defer f.Close()
if enableFilePermissionsCheck {
err = osutil.OwnerPermissionsMatch(path, 0, 0)
err = osutil.OwnerPermissionsMatchFile(f, 0, 0)
if err != nil {
return nil, err
}
@@ -496,8 +500,14 @@ func CheckConfig(c *Config, e error) (*Config, error) {
// LoadConfigFile loads the configuration from the given file.
func LoadConfigFile(path string) (*Config, error) {
// Open the file
f, err := os.Open(path)
if err != nil {
return nil, err
}
defer f.Close()
// Read the file
d, err := ioutil.ReadFile(path)
d, err := io.ReadAll(f)
if err != nil {
return nil, err
}
@@ -518,7 +528,7 @@ func LoadConfigFile(path string) (*Config, error) {
if enableFilePermissionsCheck {
// check permissions of the config file
err = osutil.OwnerPermissionsMatch(path, 0, 0)
err = osutil.OwnerPermissionsMatchFile(f, 0, 0)
if err != nil {
return nil, err
}