X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/d2810ae9038b057e8f18e8b495a57d8f96ae5be6..72f8a1fd5e7fbd5224e3f1393f36cc9b0d58eb78:/hotline/account.go?ds=sidebyside

diff --git a/hotline/account.go b/hotline/account.go
index 3da818f..39ea974 100644
--- a/hotline/account.go
+++ b/hotline/account.go
@@ -2,41 +2,71 @@ package hotline
 
 import (
 	"encoding/binary"
-	"github.com/jhalter/mobius/concat"
+	"fmt"
 	"golang.org/x/crypto/bcrypt"
+	"io"
+	"slices"
 )
 
 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"`
+	FileRoot string       `yaml:"FileRoot"`
+
+	readOffset int // Internal offset to track read progress
 }
 
-// MarshalBinary marshals an Account to byte slice
-func (a *Account) MarshalBinary() (out []byte) {
+func NewAccount(login, name, password string, access AccessBitmap) *Account {
+	return &Account{
+		Login:    login,
+		Name:     name,
+		Password: HashAndSalt([]byte(password)),
+		Access:   access,
+	}
+}
+
+// Read implements io.Reader interface for Account
+func (a *Account) Read(p []byte) (int, 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)))
 
-	var fieldPayload []byte
+	var fieldBytes []byte
 	for _, field := range fields {
-		fieldPayload = append(fieldPayload, field.Payload()...)
+		b, err := io.ReadAll(&field)
+		if err != nil {
+			return 0, fmt.Errorf("error reading field: %w", err)
+		}
+		fieldBytes = append(fieldBytes, b...)
+	}
+
+	buf := slices.Concat(fieldCount, fieldBytes)
+	if a.readOffset >= len(buf) {
+		return 0, io.EOF // All bytes have been read
 	}
 
-	return concat.Slices(
-		fieldCount,
-		fieldPayload,
-	)
+	n := copy(p, buf[a.readOffset:])
+	a.readOffset += n
+
+	return n, nil
+}
+
+// HashAndSalt generates a password hash from a users obfuscated plaintext password
+func HashAndSalt(pwd []byte) string {
+	hash, _ := bcrypt.GenerateFromPassword(pwd, bcrypt.MinCost)
+
+	return string(hash)
 }