Allow to set the host for the local web server

fabpot · fabpot · commit 124d7265e28c · 2022-02-05T10:50:11.000+01:00
diff --git a/commands/local_server_start.go b/commands/local_server_start.go
@@ -62,6 +62,7 @@ var localServerStartCmd = &console.Command{
 		&console.BoolFlag{Name: "allow-http", Usage: "Prevent auto-redirection from HTTP to HTTPS"},
 		&console.StringFlag{Name: "document-root", Usage: "Project document root (auto-configured by default)"},
 		&console.StringFlag{Name: "passthru", Usage: "Project passthru index (auto-configured by default)"},
+		&console.StringFlag{Name: "host", Usage: "HTTP host"},
 		&console.IntFlag{Name: "port", DefaultValue: 8000, Usage: "Preferred HTTP port"},
 		&console.BoolFlag{Name: "daemon", Aliases: []string{"d"}, Usage: "Run the server in the background"},
 		&console.BoolFlag{Name: "no-humanize", Usage: "Do not format JSON logs"},
diff --git a/local/http/http.go b/local/http/http.go
@@ -45,6 +45,7 @@ type ServerCallback func(w http.ResponseWriter, r *http.Request, env map[string]
 type Server struct {
 	DocumentRoot string
 	Callback     ServerCallback
+	Host         string
 	PreferedPort int
 	PKCS12       string
 	AllowHTTP    bool
@@ -59,7 +60,7 @@ type Server struct {
 
 // Start starts the server
 func (s *Server) Start(errChan chan error) (int, error) {
-	ln, port, err := process.CreateListener(s.PreferedPort)
+	ln, port, err := process.CreateListener(s.Host, s.PreferedPort)
 	if err != nil {
 		return port, errors.WithStack(err)
 	}
diff --git a/local/process/listener.go b/local/process/listener.go
@@ -29,17 +29,21 @@ import (
 // CreateListener creates a listener on a port
 // Pass a prefered port (will increment by 1 if port is not available)
 // or pass 0 to auto-find any available port
-func CreateListener(preferedPort int) (net.Listener, int, error) {
+func CreateListener(host string, preferedPort int) (net.Listener, int, error) {
 	var ln net.Listener
 	var err error
 	port := preferedPort
 	max := 50
+	defaultHost := host
+	if defaultHost == "" {
+		defaultHost = "127.0.0.1"
+	}
 	for {
-		// we really want to test availability on 127.0.0.1
-		ln, err = net.Listen("tcp", "127.0.0.1:"+strconv.Itoa(port))
-		if err == nil {
+		// test availability on the "default" host first
+		ln, err = net.Listen("tcp", defaultHost+":"+strconv.Itoa(port))
+		if err == nil && host == "" {
 			ln.Close()
-			// but then, we want to listen to as many local IP's as possible
+			// but then, we want to listen to as many local IP's as possible if no specific host has been given
 			ln, err = net.Listen("tcp", ":"+strconv.Itoa(port))
 			if err == nil {
 				break
diff --git a/local/project/config.go b/local/project/config.go
@@ -36,6 +36,7 @@ type Config struct {
 	ProjectDir   string
 	DocumentRoot string `yaml:"document_root"`
 	Passthru     string `yaml:"passthru"`
+	Host         string `yaml:"host"`
 	PreferedPort int    `yaml:"prefered_port"`
 	PKCS12       string `yaml:"p12"`
 	Logger       zerolog.Logger
@@ -84,6 +85,9 @@ func NewConfigFromContext(c *console.Context, projectDir string) (*Config, *File
 	if c.IsSet("passthru") {
 		config.Passthru = c.String("passthru")
 	}
+	if c.IsSet("host") {
+		config.Host = c.String("host")
+	}
 	if c.IsSet("port") {
 		config.PreferedPort = c.Int("port")
 	}
