sour-is/go-passwd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

feat: BREAKING: change from string to []byte

Browse Source
This commit is contained in:
Jon Lundy
2022-12-10 08:58:08 -07:00
parent a4bb55f56a
commit fc8d628cc5
10 changed files with 188 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
pkg/unix/unix.go
View File

@@ -16,11 +16,11 @@ var All = []passwd.Passwder{
type MD5 struct{}
func (p *MD5) Passwd(pass string, check string) (string, error) {
func (p *MD5) Passwd(pass, check []byte) ([]byte, error) {
h := md5.New()
fmt.Fprint(h, pass)
h.Write(pass)
hash := fmt.Sprintf("$1$%x", h.Sum(nil))
hash := []byte(fmt.Sprintf("$1$%x", h.Sum(nil)))
return hashCheck(hash, check)
}
@@ -31,18 +31,18 @@ func (p *MD5) ApplyPasswd(passwd *passwd.Passwd) {
type Blowfish struct{}
func (p *Blowfish) Passwd(pass string, check string) (string, error) {
if check == "" {
b, err := bcrypt.GenerateFromPassword([]byte(pass), bcrypt.DefaultCost)
func (p *Blowfish) Passwd(pass, check []byte) ([]byte, error) {
if check == nil {
b, err := bcrypt.GenerateFromPassword(pass, bcrypt.DefaultCost)
if err != nil {
return "", err
return nil, err
}
return string(b), nil
return b, nil
}
err := bcrypt.CompareHashAndPassword([]byte(check), []byte(pass))
err := bcrypt.CompareHashAndPassword(check, pass)
if err != nil {
return "", err
return nil, err
}
return check, nil
}
@@ -51,42 +51,12 @@ func (p *Blowfish) ApplyPasswd(passwd *passwd.Passwd) {
passwd.Register("2a", p)
}
// type SHA256 struct{}
// func (p *SHA256) Passwd(pass string, check string) (string, error) {
// h := sha256.New()
// fmt.Fprint(h, pass)
// hash := fmt.Sprintf("$5$%x", h.Sum(nil))
// return hashCheck(hash, check)
// }
// func (p *SHA256) ApplyPasswd(passwd *passwd.Passwd) {
// passwd.Register("5", p)
// }
// type SHA512 struct{}
// func (p *SHA512) Passwd(pass string, check string) (string, error) {
// h := sha512.New()
// fmt.Fprint(h, pass)
// hash := fmt.Sprintf("$6$%x", h.Sum(nil))
// return hashCheck(hash, check)
// }
// func (p *SHA512) ApplyPasswd(passwd *passwd.Passwd) {
// passwd.Register("6", p)
// }
func hashCheck(hash, check string) (string, error) {
if check == "" {
func hashCheck(hash, check []byte) ([]byte, error) {
if check == nil {
return hash, nil
}
if subtle.ConstantTimeCompare([]byte(hash), []byte(check)) == 1 {
if subtle.ConstantTimeCompare(hash, check) == 1 {
return hash, nil
}

12
pkg/unix/unix_test.go
View File

@@ -12,20 +12,20 @@ import (
func TestPasswdHash(t *testing.T) {
type testCase struct {
pass, hash string
pass, hash []byte
}
tests := []testCase{
{"passwd", "$1$76a2173be6393254e72ffa4d6df1030a"},
{"passwd", "$2a$10$GkJwB.nOaaeAvRGgyl2TI.kruM8e.iIo.OozgdslegpNlC/vIFKRq"},
{[]byte("passwd"), []byte("$1$76a2173be6393254e72ffa4d6df1030a")},
{[]byte("passwd"), []byte("$2a$10$GkJwB.nOaaeAvRGgyl2TI.kruM8e.iIo.OozgdslegpNlC/vIFKRq")},
}
is := is.New(t)
// Generate additional test cases for each algo.
for _, algo := range unix.All {
hash, err := algo.Passwd("passwd", "")
hash, err := algo.Passwd([]byte("passwd"), nil)
is.NoErr(err)
tests = append(tests, testCase{"passwd", hash})
tests = append(tests, testCase{[]byte("passwd"), hash})
}
pass := passwd.New(unix.All...)
@@ -35,7 +35,7 @@ func TestPasswdHash(t *testing.T) {
is := is.New(t)
hash, err := pass.Passwd(tt.pass, tt.hash)
is.Equal(hash, tt.hash)
is.Equal(string(hash), string(tt.hash))
is.NoErr(err)
})
}