Convert hardcoded path separators to filepath.Join

[rbdr/mobius] / hotline / account.go

diff --git a/hotline/account.go b/hotline/account.go
index 736859210980c2c13851d0e1834567ec38ceeb31..3da818f1ddf5a59e1312ed5ea1c7697e53c6dd27 100644 (file)
--- a/hotline/account.go
+++ b/hotline/account.go
@@ -1,7 +1,9 @@
 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
@@ -15,10 +17,26 @@ type Account struct {
 
 // 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),
+       }
+
+       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)))
+
+       var fieldPayload []byte
+       for _, field := range fields {
+               fieldPayload = append(fieldPayload, field.Payload()...)
+       }
+
        return concat.Slices(
-               []byte{0x00, 0x3}, // param count -- always 3
-               NewField(fieldUserName, []byte(a.Name)).Payload(),
-               NewField(fieldUserLogin, negateString([]byte(a.Login))).Payload(),
-               NewField(fieldUserAccess, *a.Access).Payload(),
+               fieldCount,
+               fieldPayload,
        )
 }