Merge pull request #20 from fosrl/dev

Dev

Author: miloschwartz

cmd/up/client/client.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"log"
+	"net"
 	"os"
 	"os/exec"
 	"os/signal"
@@ -55,6 +56,27 @@ type ClientUpCmdOpts struct {
 	UpstreamDNS   []string
 }
 
+// validateDNSIP ensures the given DNS server string is a valid IP address.
+// The input may be "ip" or "ip:port"; only the host part is validated.
+func validateDNSIP(s, field string) error {
+	s = strings.TrimSpace(s)
+	if s == "" {
+		return fmt.Errorf("%s: DNS server cannot be empty", field)
+	}
+	host := s
+	if strings.Contains(s, ":") {
+		var err error
+		host, _, err = net.SplitHostPort(s)
+		if err != nil {
+			return fmt.Errorf("%s: invalid address %q: %w", field, s, err)
+		}
+	}
+	if net.ParseIP(host) == nil {
+		return fmt.Errorf("%s: must be a valid IP address, got %q", field, host)
+	}
+	return nil
+}
+
 func ClientUpCmd() *cobra.Command {
 	opts := ClientUpCmdOpts{}
 
@@ -72,6 +94,15 @@ func ClientUpCmd() *cobra.Command {
 				return errors.New("--silent and --attached options conflict")
 			}
 
+			if err := validateDNSIP(opts.DNS, "netstack-dns"); err != nil {
+				return err
+			}
+			for i, server := range opts.UpstreamDNS {
+				if err := validateDNSIP(server, fmt.Sprintf("upstream-dns[%d]", i)); err != nil {
+					return err
+				}
+			}
+
 			return nil
 		},
 		Run: func(cmd *cobra.Command, args []string) {
@@ -97,8 +128,8 @@ func ClientUpCmd() *cobra.Command {
 	cmd.Flags().DurationVar(&opts.PingTimeout, "ping-timeout", 5*time.Second, "Ping `timeout`")
 	cmd.Flags().BoolVar(&opts.Holepunch, "holepunch", true, "Enable holepunching")
 	cmd.Flags().StringVar(&opts.TlsClientCert, "tls-client-cert", "", "TLS client certificate `path`")
-	cmd.Flags().BoolVar(&opts.OverrideDNS, "override-dns", true, "Override system DNS for resolving internal resource alias")
-	cmd.Flags().BoolVar(&opts.TunnelDNS, "tunnel-dns", false, "Use tunnel DNS for internal resource alias resolution")
+	cmd.Flags().BoolVar(&opts.OverrideDNS, "override-dns", true, "When enabled, the client uses custom DNS servers to resolve internal resources and aliases. This overrides your system's default DNS settings. Queries that cannot be resolved as a Pangolin resource will be forwarded to your configured Upstream DNS Server.")
+	cmd.Flags().BoolVar(&opts.TunnelDNS, "tunnel-dns", false, "When enabled, DNS queries are routed through the tunnel for remote resolution. To ensure queries are tunneled correctly, you must define the DNS server as a Pangolin resource and enter its address as an Upstream DNS Server.")
 	cmd.Flags().StringSliceVar(&opts.UpstreamDNS, "upstream-dns", []string{defaultDNSServer}, "List of DNS servers to use for external DNS resolution if overriding system DNS")
 	cmd.Flags().BoolVar(&opts.Attached, "attach", false, "Run in attached (foreground) mode, (default: detached (background) mode)")
 	cmd.Flags().BoolVar(&opts.Silent, "silent", false, "Disable TUI and run silently when detached")
@@ -196,7 +227,7 @@ func clientUpMain(cmd *cobra.Command, opts *ClientUpCmdOpts, extraArgs []string)
 		}
 
 		if newCredsGenerated {
-			fmt.Println("New creds generated saving them")
+			// fmt.Println("New creds generated saving them")
 			// Update the account in the store since ActiveAccount() returns a copy
 			if err := accountStore.UpdateActiveAccount(activeAccount); err != nil {
 				logger.Error("Failed to update account in store: %v", err)

docs/pangolin.md

@@ -22,4 +22,4 @@ Pangolin CLI
 * [pangolin update](pangolin_update.md)	 - Update Pangolin CLI to the latest version
 * [pangolin version](pangolin_version.md)	 - Print the version number
 
-###### Auto generated by spf13/cobra on 23-Jan-2026
+###### Auto generated by spf13/cobra on 27-Jan-2026

docs/pangolin_apply.md

@@ -17,4 +17,4 @@ Apply resources to the Pangolin server
 * [pangolin](pangolin.md)	 - Pangolin CLI
 * [pangolin apply blueprint](pangolin_apply_blueprint.md)	 - Apply a blueprint
 
-###### Auto generated by spf13/cobra on 23-Jan-2026
+###### Auto generated by spf13/cobra on 27-Jan-2026

docs/pangolin_apply_blueprint.md

@@ -22,4 +22,4 @@ pangolin apply blueprint [flags]
 
 * [pangolin apply](pangolin_apply.md)	 - Apply commands
 
-###### Auto generated by spf13/cobra on 23-Jan-2026
+###### Auto generated by spf13/cobra on 27-Jan-2026

docs/pangolin_auth.md

@@ -19,4 +19,4 @@ Manage authentication and sessions
 * [pangolin auth logout](pangolin_auth_logout.md)	 - Logout from Pangolin
 * [pangolin auth status](pangolin_auth_status.md)	 - Check authentication status
 
-###### Auto generated by spf13/cobra on 23-Jan-2026
+###### Auto generated by spf13/cobra on 27-Jan-2026

docs/pangolin_auth_login.md

@@ -20,4 +20,4 @@ pangolin auth login [hostname] [flags]
 
 * [pangolin auth](pangolin_auth.md)	 - Authentication commands
 
-###### Auto generated by spf13/cobra on 23-Jan-2026
+###### Auto generated by spf13/cobra on 27-Jan-2026

docs/pangolin_auth_logout.md

@@ -20,4 +20,4 @@ pangolin auth logout [flags]
 
 * [pangolin auth](pangolin_auth.md)	 - Authentication commands
 
-###### Auto generated by spf13/cobra on 23-Jan-2026
+###### Auto generated by spf13/cobra on 27-Jan-2026

docs/pangolin_auth_status.md

@@ -20,4 +20,4 @@ pangolin auth status [flags]
 
 * [pangolin auth](pangolin_auth.md)	 - Authentication commands
 
-###### Auto generated by spf13/cobra on 23-Jan-2026
+###### Auto generated by spf13/cobra on 27-Jan-2026

docs/pangolin_down.md

@@ -24,4 +24,4 @@ pangolin down [flags]
 * [pangolin](pangolin.md)	 - Pangolin CLI
 * [pangolin down client](pangolin_down_client.md)	 - Stop the client connection
 
-###### Auto generated by spf13/cobra on 23-Jan-2026
+###### Auto generated by spf13/cobra on 27-Jan-2026

docs/pangolin_down_client.md

@@ -20,4 +20,4 @@ pangolin down client [flags]
 
 * [pangolin down](pangolin_down.md)	 - Stop a connection
 
-###### Auto generated by spf13/cobra on 23-Jan-2026
+###### Auto generated by spf13/cobra on 27-Jan-2026