Browse Source

Option to add staticPasswords from environment variables

Signed-off-by: justin-slowik <justin.slowik@thermofisher.com>
pull/1706/head
krishnadurai 6 years ago committed by justin-slowik
parent
commit
776aa9dd53
  1. 6
      cmd/dex/config.go
  2. 2
      cmd/dex/config_test.go

6
cmd/dex/config.go

@ -103,7 +103,11 @@ func (p *password) UnmarshalJSON(b []byte) error {
data.Hash = os.Getenv(data.HashFromEnv)
}
if len(data.Hash) == 0 {
return fmt.Errorf("no password hash provided")
if len(data.HashFromEnv) > 0 {
data.Hash = os.Getenv(data.HashFromEnv)
} else {
return fmt.Errorf("no password hash provided")
}
}
// If this value is a valid bcrypt, use it.

2
cmd/dex/config_test.go

@ -4,6 +4,8 @@ import (
"os"
"testing"
"github.com/dexidp/dex/server"
"github.com/ghodss/yaml"
"github.com/kylelemons/godebug/pretty"

Loading…
Cancel
Save