As per review:

> Use common.Base64, common.UTF8 in switch saltEncoding across backends > Move saltEncoding log output from 'info' to 'debug'
iegomez · May 3, 2020 · 9f7bd72 · 9f7bd72
1 parent da40133
commit 9f7bd72
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 49 deletions.
diff --git a/backends/files.go b/backends/files.go
@@ -62,14 +62,12 @@ func NewFiles(authOpts map[string]string, logLevel log.Level) (Files, error) {
  }
 
  if saltEncoding, ok := authOpts["salt_encoding"]; ok {
- if saltEncoding == "base64" {
- files.SaltEncoding = saltEncoding
- log.Infof("files backend: set salt encoding to: %s", saltEncoding)
- } else if saltEncoding == "utf-8" {
- files.SaltEncoding = saltEncoding
- log.Infof("files backend: set salt encoding to: %s", saltEncoding)
- } else {
- log.Errorf("files backend: invalid salt encoding specified: %s", saltEncoding)
+ switch saltEncoding {
+ case common.Base64, common.UTF8:
+ files.SaltEncoding = saltEncoding
+ log.Debugf("files backend: set salt encoding to: %s", saltEncoding)
+ default:
+ log.Errorf("files backend: invalid salt encoding specified: %s, will default to base64 instead", saltEncoding)
  }
  }
 

diff --git a/backends/mongo.go b/backends/mongo.go
@@ -75,14 +75,12 @@ func NewMongo(authOpts map[string]string, logLevel log.Level) (Mongo, error) {
  }
 
  if saltEncoding, ok := authOpts["mongo_salt_encoding"]; ok {
- if saltEncoding == "base64" {
- m.SaltEncoding = saltEncoding
- log.Infof("mongo backend: set salt encoding to: %s", saltEncoding)
- } else if saltEncoding == "utf-8" {
- m.SaltEncoding = saltEncoding
- log.Infof("mongo backend: set salt encoding to: %s", saltEncoding)
- } else {
- log.Errorf("mongo backend: invalid salt encoding specified: %s", saltEncoding)
+ switch saltEncoding {
+ case common.Base64, common.UTF8:
+ m.SaltEncoding = saltEncoding
+ log.Debugf("mongo backend: set salt encoding to: %s", saltEncoding)
+ default:
+ log.Errorf("mongo backend: invalid salt encoding specified: %s, will default to base64 instead", saltEncoding)
  }
  }
 

diff --git a/backends/mysql.go b/backends/mysql.go
@@ -96,14 +96,12 @@ func NewMysql(authOpts map[string]string, logLevel log.Level) (Mysql, error) {
  }
 
  if saltEncoding, ok := authOpts["mysql_salt_encoding"]; ok {
- if saltEncoding == "base64" {
- mysql.SaltEncoding = saltEncoding
- log.Infof("mysql backend: set salt encoding to: %s", saltEncoding)
- } else if saltEncoding == "utf-8" {
- mysql.SaltEncoding = saltEncoding
- log.Infof("mysql backend: set salt encoding to: %s", saltEncoding)
- } else {
- log.Errorf("mysql backend: invalid salt encoding specified %s", saltEncoding)
+ switch saltEncoding {
+ case common.Base64, common.UTF8:
+ mysql.SaltEncoding = saltEncoding
+ log.Debugf("mysql backend: set salt encoding to: %s", saltEncoding)
+ default:
+ log.Errorf("mysql backend: invalid salt encoding specified: %s, will default to base64 instead", saltEncoding)
  }
  }
 

diff --git a/backends/postgres.go b/backends/postgres.go
@@ -80,14 +80,12 @@ func NewPostgres(authOpts map[string]string, logLevel log.Level) (Postgres, erro
  }
 
  if saltEncoding, ok := authOpts["pg_salt_encoding"]; ok {
- if saltEncoding == "base64" {
- postgres.SaltEncoding = saltEncoding
- log.Infof("postgres backend: set salt encoding to: %s", saltEncoding)
- } else if saltEncoding == "utf-8" {
- postgres.SaltEncoding = saltEncoding
- log.Infof("postgres backend: set salt encoding to: %s", saltEncoding)
- } else {
- log.Errorf("postgres backend: invalid salt encoding specified: %s", saltEncoding)
+ switch saltEncoding {
+ case common.Base64, common.UTF8:
+ postgres.SaltEncoding = saltEncoding
+ log.Debugf("postgres backend: set salt encoding to: %s", saltEncoding)
+ default:
+ log.Errorf("postgres backend: invalid salt encoding specified: %s, will default to base64 instead", saltEncoding)
  }
  }
 

diff --git a/backends/redis.go b/backends/redis.go
@@ -46,14 +46,12 @@ func NewRedis(authOpts map[string]string, logLevel log.Level) (Redis, error) {
  }
 
  if saltEncoding, ok := authOpts["redis_salt_encoding"]; ok {
- if saltEncoding == "base64" {
- redis.SaltEncoding = saltEncoding
- log.Infof("redis backend: set salt encoding to: %s", saltEncoding)
- } else if saltEncoding == "utf-8" {
- redis.SaltEncoding = saltEncoding
- log.Infof("redis backend: set salt encoding to: %s", saltEncoding)
- } else {
- log.Errorf("redis backend: invalid salt encoding specified: %s", saltEncoding)
+ switch saltEncoding {
+ case common.Base64, common.UTF8:
+ redis.SaltEncoding = saltEncoding
+ log.Debugf("redis backend: set salt encoding to: %s", saltEncoding)
+ default:
+ log.Errorf("redis backend: invalid salt encoding specified: %s, will default to base64 instead", saltEncoding)
  }
  }
 

diff --git a/backends/sqlite.go b/backends/sqlite.go
@@ -61,14 +61,12 @@ func NewSqlite(authOpts map[string]string, logLevel log.Level) (Sqlite, error) {
  }
 
  if saltEncoding, ok := authOpts["sqlite_salt_encoding"]; ok {
- if saltEncoding == "base64" {
- sqlite.SaltEncoding = saltEncoding
- log.Infof("sqlite backend: set salt encoding to: %s", saltEncoding)
- } else if saltEncoding == "utf-8" {
- sqlite.SaltEncoding = saltEncoding
- log.Infof("sqlite backend: set salt encoding to: %s", saltEncoding)
- } else {
- log.Errorf("sqlite backend: invalid salt encoding specified %s", saltEncoding)
+ switch saltEncoding {
+ case common.Base64, common.UTF8:
+ sqlite.SaltEncoding = saltEncoding
+ log.Debugf("sqlite backend: set salt encoding to: %s", saltEncoding)
+ default:
+ log.Errorf("sqlite backend: invalid salt encoding specified: %s, will default to base64 instead", saltEncoding)
  }
  }
 

diff --git a/common/utils.go b/common/utils.go
@@ -120,7 +120,7 @@ func hashWithSalt(password string, salt []byte, iterations int, algorithm string
  buffer.WriteString(strconv.Itoa(iterations))
  buffer.WriteString("$")
  // Re-encode salt, using encoding supplied in saltEncoding param
- switch saltEncoding{
+ switch saltEncoding {
  case UTF8:
  buffer.WriteString(string(salt))
  case Base64: