patch: v0.10.20

[rbdr/mobius] / hotline / account.go

diff --git a/hotline/account.go b/hotline/account.go
index b0e9ee5fed98ecf90c3b58e31fbeda4e3a2b6d7c..c51162d3c8b70c0388367db9ddbdc4c42c49ce43 100644 (file)
--- a/hotline/account.go
+++ b/hotline/account.go
@@ -2,53 +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"`
 }
 
-// Payload marshals an account to byte slice
-// Example:
-//     00 04 // fieldCount?
-//     00 66 // 102 - fieldUserName
-//     00 0d // 13
-//     61 64 6d 69 6e 69 73 74 72 61 74 6f 72 // administrator
-//     00 69 // 105 fieldUserLogin (encoded)
-//     00 05 // len
-//     9e 9b 92 96 91 // encoded login name
-//     00 6a // 106 fieldUserPassword
-//     00 01  // len
-//     78
-//     00 6e  // fieldUserAccess
-//     00 08
-//     ff d3 cf ef ff 80 00 00
-func (a *Account) Payload() (out []byte) {
-       nameLen := make([]byte, 2)
-       binary.BigEndian.PutUint16(nameLen, uint16(len(a.Name)))
-
-       loginLen := make([]byte, 2)
-       binary.BigEndian.PutUint16(loginLen, uint16(len(a.Login)))
-
-       return concat.Slices(
-               []byte{0x00, 0x3}, // param count -- always 3
-
-               []byte{0x00, 0x66}, // fieldUserName
-               nameLen,
-               []byte(a.Name),
-
-               []byte{0x00, 0x69}, // fieldUserLogin
-               loginLen,
-               []byte(NegatedUserString([]byte(a.Login))),
-
-               []byte{0x00, 0x6e}, // fieldUserAccess
-               []byte{0x00, 0x08},
-               *a.Access,
-       )
+// 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[:]),
+       }
+
+       if bcrypt.CompareHashAndPassword([]byte(a.Password), []byte("")) != nil {
+               fields = append(fields, NewField(FieldUserPassword, []byte("x")))
+       }
+
+       fieldCount := make([]byte, 2)
+       binary.BigEndian.PutUint16(fieldCount, uint16(len(fields)))
+
+       p = append(p, fieldCount...)
+
+       for _, field := range fields {
+               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 string(hash)
 }