Use strings.ReplaceAll method

[rbdr/mobius] / hotline / account.go

diff --git a/hotline/account.go b/hotline/account.go
index a6808615f5fad507526b7b8b4ec3d59d52e0b9a6..c51162d3c8b70c0388367db9ddbdc4c42c49ce43 100644 (file)
--- a/hotline/account.go
+++ b/hotline/account.go
@@ -3,6 +3,7 @@ package hotline
 import (
        "encoding/binary"
        "golang.org/x/crypto/bcrypt"
 import (
        "encoding/binary"
        "golang.org/x/crypto/bcrypt"

+       "log"

 )
 
 const GuestAccount = "guest" // default account used when no login is provided for a connection
 )
 
 const GuestAccount = "guest" // default account used when no login is provided for a connection


@@ -17,13 +18,13 @@ type Account struct {
 // Read implements io.Reader interface for Account
 func (a *Account) Read(p []byte) (n int, err error) {
        fields := []Field{
 // Read implements io.Reader interface for Account
 func (a *Account) Read(p []byte) (n int, err error) {
        fields := []Field{

-               NewField(fieldUserName, []byte(a.Name)),
-               NewField(fieldUserLogin, negateString([]byte(a.Login))),
-               NewField(fieldUserAccess, a.Access[:]),
+               NewField(FieldUserName, []byte(a.Name)),
+               NewField(FieldUserLogin, negateString([]byte(a.Login))),
+               NewField(FieldUserAccess, a.Access[:]),

        }
 
        if bcrypt.CompareHashAndPassword([]byte(a.Password), []byte("")) != nil {
        }
 
        if bcrypt.CompareHashAndPassword([]byte(a.Password), []byte("")) != nil {

-               fields = append(fields, NewField(fieldUserPassword, []byte("x")))
+               fields = append(fields, NewField(FieldUserPassword, []byte("x")))

        }
 
        fieldCount := make([]byte, 2)
        }
 
        fieldCount := make([]byte, 2)


@@ -37,3 +38,13 @@ func (a *Account) Read(p []byte) (n int, err error) {
 
        return len(p), nil
 }
 
        return len(p), nil
 }

+
+// hashAndSalt generates a password hash from a users obfuscated plaintext password
+func hashAndSalt(pwd []byte) string {
+       hash, err := bcrypt.GenerateFromPassword(pwd, bcrypt.MinCost)
+       if err != nil {
+               log.Println(err)
+       }
+
+       return string(hash)
+}