Migrate user account yaml files to new Access flag format if needed

[rbdr/mobius] / hotline / account.go

diff --git a/hotline/account.go b/hotline/account.go
index 3ad068797294c91e5b8e159a64364d0cdf77ac48..39ea9740275c1771fa3892b1d4429661f4de0b8e 100644 (file)
--- a/hotline/account.go
+++ b/hotline/account.go
@@ -5,7 +5,6 @@ import (
        "fmt"
        "golang.org/x/crypto/bcrypt"
        "io"
        "fmt"
        "golang.org/x/crypto/bcrypt"
        "io"

-       "log"

        "slices"
 )
 
        "slices"
 )
 


@@ -15,16 +14,26 @@ type Account struct {
        Login    string       `yaml:"Login"`
        Name     string       `yaml:"Name"`
        Password string       `yaml:"Password"`
        Login    string       `yaml:"Login"`
        Name     string       `yaml:"Name"`
        Password string       `yaml:"Password"`

-       Access   accessBitmap `yaml:"Access"`
+       Access   AccessBitmap `yaml:"Access"`
+       FileRoot string       `yaml:"FileRoot"`

 
        readOffset int // Internal offset to track read progress
 }
 
 
        readOffset int // Internal offset to track read progress
 }
 

+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)),
 // Read implements io.Reader interface for Account
 func (a *Account) Read(p []byte) (int, error) {
        fields := []Field{
                NewField(FieldUserName, []byte(a.Name)),

-               NewField(FieldUserLogin, encodeString([]byte(a.Login))),
+               NewField(FieldUserLogin, EncodeString([]byte(a.Login))),

                NewField(FieldUserAccess, a.Access[:]),
        }
 
                NewField(FieldUserAccess, a.Access[:]),
        }
 


@@ -55,12 +64,9 @@ func (a *Account) Read(p []byte) (int, error) {
        return n, nil
 }
 
        return n, nil
 }
 

-// hashAndSalt generates a password hash from a users obfuscated plaintext password
-func hashAndSalt(pwd []byte) string {
-       hash, err := bcrypt.GenerateFromPassword(pwd, bcrypt.MinCost)
-       if err != nil {
-               log.Println(err)
-       }
+// 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)
 }
 
        return string(hash)
 }