Skip to content

Use scram-sha-256 hash if postgresql parameter password_encryption set to do so. #995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 16, 2020
Merged

Use scram-sha-256 hash if postgresql parameter password_encryption set to do so. #995

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fcd35eb
Use scram-sha-256 hash if postgresql parameter password_encryption se…
yanchenko-igor May 28, 2020
45eac11
test fixed
yanchenko-igor May 28, 2020
7d74b06
Refactoring
yanchenko-igor May 28, 2020
99a2c43
code style
yanchenko-igor May 29, 2020
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
Prev Previous commit
code style
  • Loading branch information
@yanchenko-igor
yanchenko-igor committed Jul 10, 2020
commit 99a2c4359bef1a8b7057b3f69535b546bab23851
5 changes: 3 additions & 2 deletions pkg/util/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,17 @@ func NameFromMeta(meta metav1.ObjectMeta) spec.NamespacedName {
Name: meta.Name,
}
}

type Hasher func(user spec.PgUser) string
type Random func(n int) string

type Encryptor struct {
encrypt Hasher
random Random
random Random
}

func NewEncryptor(encryption string) *Encryptor {
e := Encryptor{random:RandomPassword}
e := Encryptor{random: RandomPassword}
m := map[string]Hasher{
"md5": e.PGUserPasswordMD5,
"scram-sha-256": e.PGUserPasswordScramSHA256,
Expand Down
6 changes: 3 additions & 3 deletions pkg/util/util_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
)

var pgUsers = []struct {
in spec.PgUser
outmd5 string
in spec.PgUser
outmd5 string
outscramsha256 string
}{{spec.PgUser{
Name: "test",
Expand Down Expand Up @@ -120,7 +120,7 @@ func TestPGUserPassword(t *testing.T) {
t.Errorf("PgUserPassword expected: %q, got: %q", tt.outmd5, pwd)
}
e = NewEncryptor("scram-sha-256")
e.random = func(n int) string {return "salt"}
e.random = func(n int) string { return "salt" }
pwd = e.PGUserPassword(tt.in)
if pwd != tt.outscramsha256 {
t.Errorf("PgUserPassword expected: %q, got: %q", tt.outscramsha256, pwd)
Expand Down