mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-08-08 15:47:00 +02:00
Code Issues Projects Releases Wiki Activity

Vault-4279 reporting redundant/unused keys in config (#14752)

Browse Source 
* Vault-4279 reporting redundant/unused keys in config

* missing validate step

* CL

* Change the log level
This commit is contained in:
hghaf099 2022-04-01 10:34:27 -04:00 committed by GitHub
parent b1012f2e36
commit 6f6e901b0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/14752.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
core: report unused or redundant keys in server configuration
```

22
command/server.go
View File

@ -428,7 +428,7 @@ func (c *ServerCommand) parseConfig() (*server.Config, []configutil.ConfigError,
} }
func (c *ServerCommand) runRecoveryMode() int { func (c *ServerCommand) runRecoveryMode() int {
config, _, err := c.parseConfig() config, configErrors, err := c.parseConfig()
if err != nil { if err != nil {
c.UI.Error(err.Error()) c.UI.Error(err.Error())
return 1 return 1
@ -458,6 +458,11 @@ func (c *ServerCommand) runRecoveryMode() int {
JSONFormat: logFormat == logging.JSONFormat, JSONFormat: logFormat == logging.JSONFormat,
}) })
// reporting Errors found in the config
for _, cErr := range configErrors {
c.logger.Warn(cErr.String())
}
// Ensure logging is flushed if initialization fails // Ensure logging is flushed if initialization fails
defer c.flushLog() defer c.flushLog()
@ -1071,7 +1076,7 @@ func (c *ServerCommand) Run(args []string) int {
config.Listeners[0].Telemetry.UnauthenticatedMetricsAccess = true config.Listeners[0].Telemetry.UnauthenticatedMetricsAccess = true
} }
parsedConfig, _, err := c.parseConfig() parsedConfig, configErrors, err := c.parseConfig()
if err != nil { if err != nil {
c.UI.Error(err.Error()) c.UI.Error(err.Error())
return 1 return 1
@ -1116,6 +1121,11 @@ func (c *ServerCommand) Run(args []string) int {
}) })
} }
// reporting Errors found in the config
for _, cErr := range configErrors {
c.logger.Warn(cErr.String())
}
// Ensure logging is flushed if initialization fails // Ensure logging is flushed if initialization fails
defer c.flushLog() defer c.flushLog()
@ -1539,6 +1549,7 @@ func (c *ServerCommand) Run(args []string) int {
// Check for new log level // Check for new log level
var config *server.Config var config *server.Config
var level hclog.Level var level hclog.Level
var configErrors []configutil.ConfigError
for _, path := range c.flagConfigs { for _, path := range c.flagConfigs {
current, err := server.LoadConfig(path) current, err := server.LoadConfig(path)
if err != nil { if err != nil {
@ -1546,6 +1557,8 @@ func (c *ServerCommand) Run(args []string) int {
goto RUNRELOADFUNCS goto RUNRELOADFUNCS
} }
configErrors = append(configErrors, current.Validate(path)...)
if config == nil { if config == nil {
config = current config = current
} else { } else {
@ -1559,6 +1572,11 @@ func (c *ServerCommand) Run(args []string) int {
goto RUNRELOADFUNCS goto RUNRELOADFUNCS
} }
// reporting Errors found in the config
for _, cErr := range configErrors {
c.logger.Warn(cErr.String())
}
core.SetConfig(config) core.SetConfig(config)
// reloading custom response headers to make sure we have // reloading custom response headers to make sure we have