feat: DNS Server

Author: mirkobrombin

cmd/goup/main.go

@@ -1,21 +1,14 @@
 package main
 
 import (
-	"fmt"
-	"os"
-
 	"github.com/mirkobrombin/goup/internal/cli"
-	"github.com/mirkobrombin/goup/internal/config"
 	"github.com/mirkobrombin/goup/internal/plugin"
 	"github.com/mirkobrombin/goup/plugins"
 )
 
 func main() {
 	// Load global configuration
-	if err := config.LoadGlobalConfig(); err != nil {
-		fmt.Printf("Error loading global config: %v\n", err)
-		os.Exit(1)
-	}
+	// Global config is now loaded via CLI PersistentPreRun to support flags
 
 	pluginManager := plugin.NewPluginManager()
 	plugin.SetDefaultPluginManager(pluginManager)

go.mod

@@ -31,6 +31,7 @@ require (
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/miekg/dns v1.1.72 // indirect
 	github.com/onsi/ginkgo/v2 v2.9.5 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect

go.sum

@@ -49,6 +49,8 @@ github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APP
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
 github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI=
+github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs=
 github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
 github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
 github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
@@ -137,6 +139,7 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
 golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
 golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

internal/cli/cli.go

@@ -17,12 +17,19 @@ import (
 var tuiMode bool
 var benchMode bool
 var configPath string
+var globalConfigPath string
 
 // rootCmd represents the base command when called without any subcommands.
 var rootCmd = &cobra.Command{
 	Use:   "goup",
 	Short: "GoUP is a minimal configurable web server",
 	Long:  `GoUP is a minimal configurable web server written in Go.`,
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		if err := config.LoadGlobalConfig(globalConfigPath); err != nil {
+			fmt.Printf("Error loading global config: %v\n", err)
+			os.Exit(1)
+		}
+	},
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.
@@ -37,6 +44,8 @@ func init() {
 	rootCmd.AddCommand(generateCmd)
 	rootCmd.AddCommand(genPassCmd)
 	rootCmd.AddCommand(startCmd)
+	rootCmd.AddCommand(startWebCmd)
+	rootCmd.AddCommand(startDNSCmd)
 	rootCmd.AddCommand(validateCmd)
 	rootCmd.AddCommand(listCmd)
 	rootCmd.AddCommand(pluginsCmd)
@@ -45,7 +54,8 @@ func init() {
 	startCmd.Flags().BoolVarP(&benchMode, "bench", "b", false, "Enable benchmark mode")
 
 	// Global flags
-	rootCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "Path to specific configuration file")
+	rootCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "Path to specific site configuration file")
+	rootCmd.PersistentFlags().StringVar(&globalConfigPath, "global-config", "", "Path to specific global configuration file")
 }
 
 var generateCmd = &cobra.Command{
@@ -155,21 +165,10 @@ var startCmd = &cobra.Command{
 }
 
 func start(cmd *cobra.Command, args []string) {
-	var configs []config.SiteConfig
-	var err error
-
-	if configPath != "" {
-		configs, err = config.LoadConfigsFromFile(configPath)
-		if err != nil {
-			fmt.Printf("Error loading config from %s: %v\n", configPath, err)
-			os.Exit(1)
-		}
-	} else {
-		configs, err = config.LoadAllConfigs()
-		if err != nil {
-			fmt.Printf("Error loading configurations: %v\n", err)
-			os.Exit(1)
-		}
+	configs, err := loadConfigs()
+	if err != nil {
+		fmt.Printf("Error loading configurations: %v\n", err)
+		os.Exit(1)
 	}
 
 	if len(configs) == 0 {
@@ -181,8 +180,8 @@ func start(cmd *cobra.Command, args []string) {
 		os.Exit(1)
 	}
 
-	fmt.Println("Starting servers...")
-	server.StartServers(configs, tuiMode, benchMode)
+	fmt.Println("Starting full GoUp server (Web + DNS)...")
+	server.StartServers(configs, tuiMode, benchMode, server.ModeAll)
 
 	// Wait indefinitely if not in TUI mode, the servers will keep running
 	// and loggers will keep writing to both the stdout and the log files.
@@ -191,6 +190,53 @@ func start(cmd *cobra.Command, args []string) {
 	}
 }
 
+var startWebCmd = &cobra.Command{
+	Use:   "start-web",
+	Short: "Start only the web server",
+	Run:   startWeb,
+}
+
+func startWeb(cmd *cobra.Command, args []string) {
+	configs, err := loadConfigs()
+	if err != nil {
+		fmt.Printf("Error loading configurations: %v\n", err)
+		os.Exit(1)
+	}
+
+	fmt.Println("Starting GoUp Web Server...")
+	server.StartServers(configs, tuiMode, benchMode, server.ModeWeb)
+
+	if !tuiMode {
+		select {}
+	}
+}
+
+var startDNSCmd = &cobra.Command{
+	Use:   "start-dns",
+	Short: "Start only the DNS server",
+	Run:   startDNS,
+}
+
+func startDNS(cmd *cobra.Command, args []string) {
+	// We might not strictly need site configs for DNS only, but StartServers expects them
+	// effectively ignoring them if ModeWeb is not set, except for context setup.
+	configs, _ := loadConfigs()
+
+	fmt.Println("Starting GoUp DNS Server...")
+	server.StartServers(configs, tuiMode, benchMode, server.ModeDNS)
+
+	if !tuiMode {
+		select {}
+	}
+}
+
+func loadConfigs() ([]config.SiteConfig, error) {
+	if configPath != "" {
+		return config.LoadConfigsFromFile(configPath)
+	}
+	return config.LoadAllConfigs()
+}
+
 var validateCmd = &cobra.Command{
 	Use:   "validate",
 	Short: "Validate the configuration files",

internal/config/dns_config.go

@@ -0,0 +1,28 @@
+package config
+
+// DNSRecord represents a single DNS record entry.
+type DNSRecord struct {
+	Type  string `json:"type"`  // A, AAAA, CNAME, TXT, MX, NS
+	Name  string `json:"name"`  // @ for apex, or subdomain
+	Value string `json:"value"` // IP, target, or text
+	TTL   uint32 `json:"ttl"`   // Time-to-live in seconds
+	Prio  uint16 `json:"prio"`  // Priority (for MX records)
+}
+
+// DNSConfig defines configuration for the integrated DNS server.
+type DNSConfig struct {
+	Enable            bool                   `json:"enable"`
+	Port              int                    `json:"port"`               // Default: 53
+	UpstreamResolvers []string               `json:"upstream_resolvers"` // Optional forwarding
+	Zones             map[string][]DNSRecord `json:"zones"`              // zone -> records
+}
+
+// DefaultDNSConfig returns the default DNS configuration.
+func DefaultDNSConfig() *DNSConfig {
+	return &DNSConfig{
+		Enable:            false,
+		Port:              53,
+		UpstreamResolvers: []string{},
+		Zones:             make(map[string][]DNSRecord),
+	}
+}

internal/config/global_config.go

@@ -28,22 +28,30 @@ type GlobalConfig struct {
 	DashboardPort  int             `json:"dashboard_port"`
 	EnabledPlugins []string        `json:"enabled_plugins"` // empty means all enabled
 	SafeGuard      SafeGuardConfig `json:"safeguard"`
+	DNS            *DNSConfig      `json:"dns"`
 }
 
 // GlobalConf is the global configuration in memory.
 var GlobalConf *GlobalConfig
 var globalConfName = "conf.global.json"
 
 // LoadGlobalConfig loads the global configuration file.
-func LoadGlobalConfig() error {
-	configDir := GetConfigDir()
-	configFile := filepath.Join(configDir, globalConfName)
+func LoadGlobalConfig(customPath string) error {
+	var configFile string
+	if customPath != "" {
+		configFile = customPath
+	} else {
+		configDir := GetConfigDir()
+		configFile = filepath.Join(configDir, globalConfName)
+	}
+
 	if _, err := os.Stat(configFile); os.IsNotExist(err) {
 		GlobalConf = &GlobalConfig{
 			EnableAPI:      false,
 			APIPort:        6007,
 			DashboardPort:  0, // Disabled by default
 			EnabledPlugins: []string{},
+			DNS:            DefaultDNSConfig(),
 		}
 		return nil
 	}