add validation for the create/edit form

internal/adapters/ui/handlers.go

@@ -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()

internal/adapters/ui/server_form.go

@@ -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"
+	title := sf.titleForMode()
-	if sf.mode == ServerFormEdit {
-		title = "Edit Server"
-	}
 
 	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

internal/core/services/server_service.go

@@ -15,9 +15,13 @@
 package services
 
 import (
+	"fmt"
+	"net"
 	"os"
 	"os/exec"
+	"regexp"
 	"sort"
+	"strings"
 
 	"github.com/Adembc/lazyssh/internal/core/domain"
 	"github.com/Adembc/lazyssh/internal/core/ports"
@@ -61,8 +65,48 @@ func (s *serverService) ListServers(query string) ([]domain.Server, error) {
 	return servers, nil
 }
 
+// validateServer performs core validation of server fields.
+func validateServer(srv domain.Server) error {
+	if strings.TrimSpace(srv.Alias) == "" {
+		return fmt.Errorf("alias is required")
+	}
+	if ok, _ := regexp.MatchString(`^[A-Za-z0-9_.-]+$`, srv.Alias); !ok {
+		return fmt.Errorf("alias may contain letters, digits, dot, dash, underscore")
+	}
+	if strings.TrimSpace(srv.Host) == "" {
+		return fmt.Errorf("Host/IP is required")
+	}
+	if ip := net.ParseIP(srv.Host); ip == nil {
+		if strings.Contains(srv.Host, " ") {
+			return fmt.Errorf("host must not contain spaces")
+		}
+		if ok, _ := regexp.MatchString(`^[A-Za-z0-9.-]+$`, srv.Host); !ok {
+			return fmt.Errorf("host contains invalid characters")
+		}
+		if strings.HasPrefix(srv.Host, ".") || strings.HasSuffix(srv.Host, ".") {
+			return fmt.Errorf("host must not start or end with a dot")
+		}
+		for _, lbl := range strings.Split(srv.Host, ".") {
+			if lbl == "" {
+				return fmt.Errorf("host must not contain empty labels")
+			}
+			if strings.HasPrefix(lbl, "-") || strings.HasSuffix(lbl, "-") {
+				return fmt.Errorf("hostname labels must not start or end with a hyphen")
+			}
+		}
+	}
+	if srv.Port != 0 && (srv.Port < 1 || srv.Port > 65535) {
+		return fmt.Errorf("port must be a number between 1 and 65535")
+	}
+	return nil
+}
+
 // UpdateServer updates an existing server with new details.
 func (s *serverService) UpdateServer(server domain.Server, newServer domain.Server) error {
+	if err := validateServer(newServer); err != nil {
+		s.logger.Warnw("validation failed on update", "error", err, "server", newServer)
+		return err
+	}
 	err := s.serverRepository.UpdateServer(server, newServer)
 	if err != nil {
 		s.logger.Errorw("failed to update server", "error", err, "server", server)
@@ -72,6 +116,10 @@ func (s *serverService) UpdateServer(server domain.Server, newServer domain.Serv
 
 // AddServer adds a new server to the repository.
 func (s *serverService) AddServer(server domain.Server) error {
+	if err := validateServer(server); err != nil {
+		s.logger.Warnw("validation failed on add", "error", err, "server", server)
+		return err
+	}
 	err := s.serverRepository.AddServer(server)
 	if err != nil {
 		s.logger.Errorw("failed to add server", "error", err, "server", server)