X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/69af8ddbdff8e6d0dd551e9bdc72284469a86fc0..e995052ef530b1eae2d0476ff519f7225bbb481d:/hotline/account.go?ds=sidebyside

diff --git a/hotline/account.go b/hotline/account.go
index 9a0fb7d..4c5a9b9 100644
--- a/hotline/account.go
+++ b/hotline/account.go
@@ -3,7 +3,9 @@ package hotline
 import (
 	"encoding/binary"
 	"golang.org/x/crypto/bcrypt"
+	"io"
 	"log"
+	"slices"
 )
 
 const GuestAccount = "guest" // default account used when no login is provided for a connection
@@ -18,25 +20,24 @@ type Account struct {
 // 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)))
 
-	p = append(p, fieldCount...)
-
+	var fieldBytes []byte
 	for _, field := range fields {
-		p = append(p, field.Payload()...)
+		fieldBytes = append(fieldBytes, field.Payload()...)
 	}
 
-	return len(p), nil
+	return copy(p, slices.Concat(fieldCount, fieldBytes)), io.EOF
 }
 
 // hashAndSalt generates a password hash from a users obfuscated plaintext password