darroyo
8003db49b3
Samba shares now support an 'invalid users' list (deny list), written as 'invalid users = u1,u2' in smb.conf. The UI shows a ChipPicker for valid_users and invalid_users, mutually exclusive, sourced from the system user list. feat: add ImportSystemUsers for fresh installations When NASCTL_IMPORT_ON_BOOT=true, nasctl now imports existing system users from /etc/passwd (UID 1000-60000) and /etc/group (supplemental groups), and detects which have Samba accounts via 'pdbedit -L'. Imported users are marked dirty so the admin can review before applying. New POST /api/import/users endpoint for manual re-import. This mirrors the existing import-on-boot flow for smb.conf and /etc/exports.
101 lines
2.2 KiB
Go
101 lines
2.2 KiB
Go
package db
|
|
|
|
import (
|
|
"fmt"
|
|
)
|
|
|
|
func (d *DB) ReplaceSambaShares(shares []SambaShare) error {
|
|
tx, err := d.conn.Begin()
|
|
if err != nil {
|
|
return fmt.Errorf("begin tx: %w", err)
|
|
}
|
|
defer func() { _ = tx.Rollback() }()
|
|
|
|
if _, err := tx.Exec(`DELETE FROM samba_shares`); err != nil {
|
|
return fmt.Errorf("clear samba_shares: %w", err)
|
|
}
|
|
|
|
for _, share := range shares {
|
|
validUsers, err := encodeJSONStrings(share.ValidUsers)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
validGroups, err := encodeJSONStrings(share.ValidGroups)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
invalidUsers, err := encodeJSONStrings(share.InvalidUsers)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
readOnly := 0
|
|
if share.ReadOnly {
|
|
readOnly = 1
|
|
}
|
|
guestOK := 0
|
|
if share.GuestOK {
|
|
guestOK = 1
|
|
}
|
|
_, err = tx.Exec(`
|
|
INSERT INTO samba_shares (name, path, comment, read_only, guest_ok, valid_users, valid_groups, invalid_users)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
|
|
share.Name, share.Path, share.Comment, readOnly, guestOK, validUsers, validGroups, invalidUsers,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("insert samba share %s: %w", share.Name, err)
|
|
}
|
|
}
|
|
|
|
return tx.Commit()
|
|
}
|
|
|
|
func (d *DB) ReplaceNFSExports(exports []NFSExport) error {
|
|
tx, err := d.conn.Begin()
|
|
if err != nil {
|
|
return fmt.Errorf("begin tx: %w", err)
|
|
}
|
|
defer func() { _ = tx.Rollback() }()
|
|
|
|
if _, err := tx.Exec(`DELETE FROM nfs_exports`); err != nil {
|
|
return fmt.Errorf("clear nfs_exports: %w", err)
|
|
}
|
|
|
|
for _, exp := range exports {
|
|
clients, err := encodeNFSClients(exp.Clients)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
readOnly := 0
|
|
if exp.ReadOnly {
|
|
readOnly = 1
|
|
}
|
|
async_ := 0
|
|
if exp.Async {
|
|
async_ = 1
|
|
}
|
|
rootSquash := 0
|
|
if exp.RootSquash {
|
|
rootSquash = 1
|
|
}
|
|
subtreeCheck := 0
|
|
if exp.SubtreeCheck {
|
|
subtreeCheck = 1
|
|
}
|
|
advanced := exp.Advanced
|
|
if advanced == "" {
|
|
advanced = "{}"
|
|
}
|
|
_, err = tx.Exec(`
|
|
INSERT INTO nfs_exports (path, clients, read_only, async_, root_squash, subtree_check, fsid, advanced)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
|
|
exp.Path, clients, readOnly, async_, rootSquash, subtreeCheck, exp.FSID, advanced,
|
|
)
|
|
if err != nil {
|
|
return fmt.Errorf("insert nfs export %s: %w", exp.Path, err)
|
|
}
|
|
}
|
|
|
|
return tx.Commit()
|
|
}
|
|
|