Arsharth/dex
1
0
Fork 0
forked from mystiq/dex
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix merge error in config.go

Browse source 
Signed-off-by: justin-slowik <justin.slowik@thermofisher.com>
This commit is contained in:
justin-slowik 2020-07-08 16:30:08 -04:00
parent 1404477326
commit 1ea2892b79
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cmd/dex/config.go
View file

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