X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/b25c4a19420c2fde1f290dd360c68b84e4eaa1ed..041c2df698d4702816cf8472d212553d289a2c0c:/hotline/account.go

diff --git a/hotline/account.go b/hotline/account.go
index bcacc73..3da818f 100644
--- a/hotline/account.go
+++ b/hotline/account.go
@@ -3,6 +3,7 @@ package hotline
 import (
 	"encoding/binary"
 	"github.com/jhalter/mobius/concat"
+	"golang.org/x/crypto/bcrypt"
 )
 
 const GuestAccount = "guest" // default account used when no login is provided for a connection
@@ -14,41 +15,28 @@ type Account struct {
 	Access   *[]byte `yaml:"Access"` // 8 byte bitmap
 }
 
-// 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)))
+// MarshalBinary marshals an Account to byte slice
+func (a *Account) MarshalBinary() (out []byte) {
+	fields := []Field{
+		NewField(fieldUserName, []byte(a.Name)),
+		NewField(fieldUserLogin, negateString([]byte(a.Login))),
+		NewField(fieldUserAccess, *a.Access),
+	}
 
-	return concat.Slices(
-		[]byte{0x00, 0x3}, // param count -- always 3
+	if bcrypt.CompareHashAndPassword([]byte(a.Password), []byte("")) != nil {
+		fields = append(fields, NewField(fieldUserPassword, []byte("x")))
+	}
 
-		[]byte{0x00, 0x66}, // fieldUserName
-		nameLen,
-		[]byte(a.Name),
+	fieldCount := make([]byte, 2)
+	binary.BigEndian.PutUint16(fieldCount, uint16(len(fields)))
 
-		[]byte{0x00, 0x69}, // fieldUserLogin
-		loginLen,
-		negateString([]byte(a.Login)),
+	var fieldPayload []byte
+	for _, field := range fields {
+		fieldPayload = append(fieldPayload, field.Payload()...)
+	}
 
-		[]byte{0x00, 0x6e}, // fieldUserAccess
-		[]byte{0x00, 0x08},
-		*a.Access,
+	return concat.Slices(
+		fieldCount,
+		fieldPayload,
 	)
 }