Skip to content

Commit

Permalink
fix(configuration): time duration decode hook panic (#2960)
Browse files Browse the repository at this point in the history
This fixes a potential panic in the time duration decode hook when the YAML value is a zero integer.
  • Loading branch information
james-d-elliott committed Mar 5, 2022
1 parent 67846fa commit 1c1030c
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 9 deletions.
14 changes: 5 additions & 9 deletions internal/configuration/decode_hooks.go
Expand Up @@ -67,7 +67,11 @@ func ToTimeDurationFunc() mapstructure.DecodeHookFuncType {

switch {
case f.Kind() == reflect.String:
break
dataStr := data.(string)

if duration, err = utils.ParseDurationString(dataStr); err != nil {
return nil, err
}
case f.Kind() == reflect.Int:
seconds := data.(int)

Expand All @@ -84,14 +88,6 @@ func ToTimeDurationFunc() mapstructure.DecodeHookFuncType {
duration = time.Second * time.Duration(seconds)
}

if duration == 0 {
dataStr := data.(string)

if duration, err = utils.ParseDurationString(dataStr); err != nil {
return nil, err
}
}

if ptr {
return &duration, nil
}
Expand Down
22 changes: 22 additions & 0 deletions internal/configuration/decode_hooks_test.go
Expand Up @@ -268,3 +268,25 @@ func TestToTimeDurationFunc_ShouldNotParse_FromBool(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, from, result)
}

func TestToTimeDurationFunc_ShouldParse_FromZero(t *testing.T) {
hook := ToTimeDurationFunc()

var (
from = 0
expected = time.Duration(0)

to time.Duration
ptrTo *time.Duration
result interface{}
err error
)

result, err = hook(reflect.TypeOf(from), reflect.TypeOf(to), from)
assert.NoError(t, err)
assert.Equal(t, expected, result)

result, err = hook(reflect.TypeOf(from), reflect.TypeOf(ptrTo), from)
assert.NoError(t, err)
assert.Equal(t, &expected, result)
}

0 comments on commit 1c1030c

Please sign in to comment.