Fix broken io.Reader implementations

[rbdr/mobius] / hotline / account.go

diff --git a/hotline/account.go b/hotline/account.go
index c51162d3c8b70c0388367db9ddbdc4c42c49ce43..18965ed5ea1b4a9ae5cb711eff4c0d181a11c255 100644 (file)
--- a/hotline/account.go
+++ b/hotline/account.go
@@ -2,8 +2,11 @@ package hotline
 
 import (
        "encoding/binary"
+       "fmt"
        "golang.org/x/crypto/bcrypt"
+       "io"
        "log"
+       "slices"
 )
 
 const GuestAccount = "guest" // default account used when no login is provided for a connection
@@ -12,14 +15,16 @@ type Account struct {
        Login    string       `yaml:"Login"`
        Name     string       `yaml:"Name"`
        Password string       `yaml:"Password"`
-       Access   accessBitmap `yaml:"Access"`
+       Access   accessBitmap `yaml:"Access,flow"`
+
+       readOffset int // Internal offset to track read progress
 }
 
 // Read implements io.Reader interface for Account
-func (a *Account) Read(p []byte) (n int, err error) {
+func (a *Account) Read(p []byte) (int, error) {
        fields := []Field{
                NewField(FieldUserName, []byte(a.Name)),
-               NewField(FieldUserLogin, negateString([]byte(a.Login))),
+               NewField(FieldUserLogin, encodeString([]byte(a.Login))),
                NewField(FieldUserAccess, a.Access[:]),
        }
 
@@ -30,13 +35,24 @@ func (a *Account) Read(p []byte) (n int, err error) {
        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()...)
+               b, err := io.ReadAll(&field)
+               if err != nil {
+                       return 0, fmt.Errorf("error reading field: %w", err)
+               }
+               fieldBytes = append(fieldBytes, b...)
        }
 
-       return len(p), nil
+       buf := slices.Concat(fieldCount, fieldBytes)
+       if a.readOffset >= len(buf) {
+               return 0, io.EOF // All bytes have been read
+       }
+
+       n := copy(p, buf[a.readOffset:])
+       a.readOffset += n
+
+       return n, nil
 }
 
 // hashAndSalt generates a password hash from a users obfuscated plaintext password