darroyo
512feaffd7
This is a backward-compatible MINOR bump (0.4.0 → 0.5.0).
BREAKING NOTES (for users upgrading from pre-0.5.0):
- The nfs_exports.clients column schema changed from []string to
[]NFSClient (per-host options). A migration (0005) transforms existing
string arrays into object arrays, taking export-level options as
defaults for each host.
- ValidateNFSClient now only accepts IPv4 (192.168.1.1) or IPv4/CIDR
(192.168.1.0/24). Hostnames, wildcards, netgroups are rejected.
- If you use NASCTL_IMPORT_ON_BOOT, re-import your /etc/exports to pick
up per-host options.
What changed:
- NFSClient type: {host, read_only, async, root_squash, subtree_check, advanced}
- NFSExport.Clients is now []NFSClient (was []string)
- export-level flags (ro/async/root_squash/subtree_check/advanced) are
preserved as template defaults for newly added hosts in the UI.
- buildExportLine generates: path host1(ro,sync,...) host2(rw,async,...) fsid=N
- ValidateNFSClient: strict IPv4/CIDR only (0-255 octets, /0-32 prefix)
- parseExportLine now parses per-host options from /etc/exports (previously
only the first host's options were kept, others were discarded)
- UI: per-host rows with toggles (ro/async/root_squash/subtree_check) and
advanced options (all_squash, secure, wdelay, hide, crossmnt)
97 lines
2.1 KiB
Go
97 lines
2.1 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
|
|
}
|
|
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)
|
|
VALUES (?, ?, ?, ?, ?, ?, ?)`,
|
|
share.Name, share.Path, share.Comment, readOnly, guestOK, validUsers, validGroups,
|
|
)
|
|
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()
|
|
}
|
|
|