luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

pki health-check fails to read in int config values (#19265) 

* pki health-check fails to read in int config values

 - Go's default behavior when decoding numbers to an interface{} is to use a float64 type which parseutil.SafeParseIntRange does not handle.
 - Switch to having the JSON decoder use json.Number which our parseutil library
  properly handles.

* Add cl
This commit is contained in:
Steven Clark 2023-02-21 08:52:19 -05:00 committed by GitHub
parent b634bb897b
commit b6f3ba7d4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/19265.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:bug
cli/pki: Decode integer values properly in health-check configuration file
```

7
command/pki_health_check.go
View File

@ -243,13 +243,16 @@ func (c *PKIHealthCheckCommand) Run(args []string) int {
// Handle config merging.
external_config := map[string]interface{}{}
if c.flagConfig != "" {
contents, err := os.ReadFile(c.flagConfig)
contents, err := os.Open(c.flagConfig)
if err != nil {
c.UI.Error(fmt.Sprintf("Failed to read configuration file %v: %v", c.flagConfig, err))
return pkiRetUsage
}
if err := json.Unmarshal(contents, &external_config); err != nil {
decoder := json.NewDecoder(contents)
decoder.UseNumber() // Use json.Number instead of float64 values as we are decoding to an interface{}.
if err := decoder.Decode(&external_config); err != nil {
c.UI.Error(fmt.Sprintf("Failed to parse configuration file %v: %v", c.flagConfig, err))
return pkiRetUsage
}