mirror of
https://github.com/Adembc/lazyssh.git
synced 2026-07-14 12:13:34 +02:00
add validation for the create/edit form
This commit is contained in:
@@ -162,12 +162,22 @@ func (t *tui) handleServerEdit() {
|
||||
}
|
||||
|
||||
func (t *tui) handleServerSave(server domain.Server, original *domain.Server) {
|
||||
var err error
|
||||
if original != nil {
|
||||
// Edit mode
|
||||
_ = t.serverService.UpdateServer(*original, server)
|
||||
err = t.serverService.UpdateServer(*original, server)
|
||||
} else {
|
||||
// Add mode
|
||||
_ = t.serverService.AddServer(server)
|
||||
err = t.serverService.AddServer(server)
|
||||
}
|
||||
if err != nil {
|
||||
// Stay on form; show a small modal with the error
|
||||
modal := tview.NewModal().
|
||||
SetText(fmt.Sprintf("Save failed: %v", err)).
|
||||
AddButtons([]string{"Close"}).
|
||||
SetDoneFunc(func(buttonIndex int, buttonLabel string) { t.handleModalClose() })
|
||||
t.app.SetRoot(modal, true)
|
||||
return
|
||||
}
|
||||
|
||||
t.refreshServerList()
|
||||
|
||||
@@ -16,6 +16,8 @@ package ui
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
@@ -50,10 +52,7 @@ func NewServerForm(mode ServerFormMode, original *domain.Server) *ServerForm {
|
||||
}
|
||||
|
||||
func (sf *ServerForm) build() {
|
||||
title := "Add Server"
|
||||
if sf.mode == ServerFormEdit {
|
||||
title = "Edit Server"
|
||||
}
|
||||
title := sf.titleForMode()
|
||||
|
||||
sf.Form.SetBorder(true).
|
||||
SetTitle(title).
|
||||
@@ -68,6 +67,13 @@ func (sf *ServerForm) build() {
|
||||
sf.Form.SetCancelFunc(sf.handleCancel)
|
||||
}
|
||||
|
||||
func (sf *ServerForm) titleForMode() string {
|
||||
if sf.mode == ServerFormEdit {
|
||||
return "Edit Server"
|
||||
}
|
||||
return "Add Server"
|
||||
}
|
||||
|
||||
func (sf *ServerForm) addFormFields() {
|
||||
var defaultValues ServerFormData
|
||||
if sf.mode == ServerFormEdit && sf.original != nil {
|
||||
@@ -117,10 +123,17 @@ func (sf *ServerForm) getFormData() ServerFormData {
|
||||
|
||||
func (sf *ServerForm) handleSave() {
|
||||
data := sf.getFormData()
|
||||
if data.Alias == "" || data.Host == "" {
|
||||
|
||||
if errMsg := validateServerForm(data); errMsg != "" {
|
||||
|
||||
sf.Form.SetTitle(fmt.Sprintf("%s — [red::b]%s[-]", sf.titleForMode(), errMsg))
|
||||
sf.Form.SetBorderColor(tcell.ColorRed)
|
||||
return
|
||||
}
|
||||
|
||||
sf.Form.SetTitle(sf.titleForMode())
|
||||
sf.Form.SetBorderColor(tcell.Color238)
|
||||
|
||||
server := sf.dataToServer(data)
|
||||
if sf.onSave != nil {
|
||||
sf.onSave(server, sf.original)
|
||||
@@ -160,6 +173,52 @@ func (sf *ServerForm) dataToServer(data ServerFormData) domain.Server {
|
||||
}
|
||||
}
|
||||
|
||||
// validateServerForm returns an error message string if validation fails; empty string means valid.
|
||||
func validateServerForm(data ServerFormData) string {
|
||||
|
||||
alias := data.Alias
|
||||
if alias == "" {
|
||||
return "Alias is required"
|
||||
}
|
||||
if !regexp.MustCompile(`^[A-Za-z0-9_.-]+$`).MatchString(alias) {
|
||||
return "Alias may contain letters, digits, dot, dash, underscore"
|
||||
}
|
||||
|
||||
host := data.Host
|
||||
if host == "" {
|
||||
return "Host/IP is required"
|
||||
}
|
||||
if ip := net.ParseIP(host); ip == nil {
|
||||
|
||||
if strings.Contains(host, " ") {
|
||||
return "Host must not contain spaces"
|
||||
}
|
||||
if !regexp.MustCompile(`^[A-Za-z0-9.-]+$`).MatchString(host) {
|
||||
return "Host contains invalid characters"
|
||||
}
|
||||
if strings.HasPrefix(host, ".") || strings.HasSuffix(host, ".") {
|
||||
return "Host must not start or end with a dot"
|
||||
}
|
||||
for _, lbl := range strings.Split(host, ".") {
|
||||
if lbl == "" {
|
||||
return "Host must not contain empty labels"
|
||||
}
|
||||
if strings.HasPrefix(lbl, "-") || strings.HasSuffix(lbl, "-") {
|
||||
return "Hostname labels must not start or end with a hyphen"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if data.Port != "" {
|
||||
p, err := strconv.Atoi(data.Port)
|
||||
if err != nil || p < 1 || p > 65535 {
|
||||
return "Port must be a number between 1 and 65535"
|
||||
}
|
||||
}
|
||||
|
||||
return ""
|
||||
}
|
||||
|
||||
func (sf *ServerForm) OnSave(fn func(domain.Server, *domain.Server)) *ServerForm {
|
||||
sf.onSave = fn
|
||||
return sf
|
||||
|
||||
Reference in New Issue
Block a user