Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions utils/bootstrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ import (
"github.com/spf13/viper"
)

func validateSecret(secret string) error {
if len(secret) < 32 {
return fmt.Errorf("[service] invalid secret length: got %d, expected at least 32 bytes; please set a stronger `secret` in config or environment", len(secret))
}
return nil
}

func ReadConf() {
viper.SetConfigFile(configFile)

Expand All @@ -27,10 +34,8 @@ func ReadConf() {
viper.AutomaticEnv()
viper.SetEnvKeyReplacer(strings.NewReplacer(".", "_"))

secret := viper.GetString("secret")
if len(secret) < 32 {
globals.Warn(fmt.Sprintf("[service] invalid secret length: got %d, expected at least 32 bytes; starting in 10 seconds, please set a stronger `secret` in config or environment; future versions may panic on weak secrets", len(secret)))
time.Sleep(10 * time.Second)
if err := validateSecret(viper.GetString("secret")); err != nil {
panic(err)
}

if timeout := viper.GetInt("max_timeout"); timeout > 0 {
Expand Down
29 changes: 29 additions & 0 deletions utils/bootstrap_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package utils

import (
"strings"
"testing"
)

func TestValidateSecret(t *testing.T) {
tests := []struct {
name string
secret string
wantErr bool
}{
{name: "empty", secret: "", wantErr: true},
{name: "default example secret", secret: "secret", wantErr: true},
{name: "31 bytes", secret: strings.Repeat("a", 31), wantErr: true},
{name: "32 bytes", secret: strings.Repeat("a", 32), wantErr: false},
{name: "longer than 32", secret: strings.Repeat("b", 64), wantErr: false},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
err := validateSecret(tt.secret)
if (err != nil) != tt.wantErr {
t.Fatalf("validateSecret(%q) error = %v, wantErr %v", tt.secret, err, tt.wantErr)
}
})
}
}