feat: add invalid_users directive for Samba shares
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.
This commit is contained in:
@@ -24,13 +24,14 @@ func writeError(w http.ResponseWriter, status int, message string) {
|
||||
}
|
||||
|
||||
type sambaShareRequest struct {
|
||||
Name string `json:"name"`
|
||||
Path string `json:"path"`
|
||||
Comment string `json:"comment"`
|
||||
ReadOnly bool `json:"read_only"`
|
||||
GuestOK bool `json:"guest_ok"`
|
||||
ValidUsers []string `json:"valid_users"`
|
||||
ValidGroups []string `json:"valid_groups"`
|
||||
Name string `json:"name"`
|
||||
Path string `json:"path"`
|
||||
Comment string `json:"comment"`
|
||||
ReadOnly bool `json:"read_only"`
|
||||
GuestOK bool `json:"guest_ok"`
|
||||
ValidUsers []string `json:"valid_users"`
|
||||
ValidGroups []string `json:"valid_groups"`
|
||||
InvalidUsers []string `json:"invalid_users"`
|
||||
}
|
||||
|
||||
func (req sambaShareRequest) validate(allowedRoots []string) error {
|
||||
@@ -45,18 +46,24 @@ func (req sambaShareRequest) validate(allowedRoots []string) error {
|
||||
return err
|
||||
}
|
||||
}
|
||||
for _, user := range req.InvalidUsers {
|
||||
if err := system.ValidateUsername(user); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (req sambaShareRequest) toModel() db.SambaShare {
|
||||
return db.SambaShare{
|
||||
Name: req.Name,
|
||||
Path: req.Path,
|
||||
Comment: req.Comment,
|
||||
ReadOnly: req.ReadOnly,
|
||||
GuestOK: req.GuestOK,
|
||||
ValidUsers: req.ValidUsers,
|
||||
ValidGroups: req.ValidGroups,
|
||||
Name: req.Name,
|
||||
Path: req.Path,
|
||||
Comment: req.Comment,
|
||||
ReadOnly: req.ReadOnly,
|
||||
GuestOK: req.GuestOK,
|
||||
ValidUsers: req.ValidUsers,
|
||||
ValidGroups: req.ValidGroups,
|
||||
InvalidUsers: req.InvalidUsers,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user