Rename encode/decode methods

[rbdr/mobius] / hotline / account.go

diff --git a/hotline/account.go b/hotline/account.go
index 3da818f1ddf5a59e1312ed5ea1c7697e53c6dd27..b041f3cd6c4eb025381d961285eb3bacd7aefddf 100644 (file)
--- a/hotline/account.go
+++ b/hotline/account.go
@@ -2,41 +2,49 @@ package hotline
 
 import (
        "encoding/binary"
-       "github.com/jhalter/mobius/concat"
        "golang.org/x/crypto/bcrypt"
+       "log"
 )
 
 const GuestAccount = "guest" // default account used when no login is provided for a connection
 
 type Account struct {
-       Login    string  `yaml:"Login"`
-       Name     string  `yaml:"Name"`
-       Password string  `yaml:"Password"`
-       Access   *[]byte `yaml:"Access"` // 8 byte bitmap
+       Login    string       `yaml:"Login"`
+       Name     string       `yaml:"Name"`
+       Password string       `yaml:"Password"`
+       Access   accessBitmap `yaml:"Access"`
 }
 
-// MarshalBinary marshals an Account to byte slice
-func (a *Account) MarshalBinary() (out []byte) {
+// 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, encodeString([]byte(a.Login))),
+               NewField(FieldUserAccess, a.Access[:]),
        }
 
        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)
        binary.BigEndian.PutUint16(fieldCount, uint16(len(fields)))
 
-       var fieldPayload []byte
+       p = append(p, fieldCount...)
+
        for _, field := range fields {
-               fieldPayload = append(fieldPayload, field.Payload()...)
+               p = append(p, field.Payload()...)
+       }
+
+       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 concat.Slices(
-               fieldCount,
-               fieldPayload,
-       )
+       return string(hash)
 }