IPv6: Support host address configured with enclosing square brackets (#31226)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

pkg/api/http_server.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"os"
 	"path"
 	"path"
 	"path/filepath"
 	"path/filepath"
+	"strings"
 	"sync"
 	"sync"
 
 
 	"github.com/grafana/grafana/pkg/services/live"
 	"github.com/grafana/grafana/pkg/services/live"
@@ -103,8 +104,10 @@ func (hs *HTTPServer) Run(ctx context.Context) error {
 
 
 	hs.applyRoutes()
 	hs.applyRoutes()
 
 
+	// Remove any square brackets enclosing IPv6 addresses, a format we support for backwards compatibility
+	host := strings.TrimSuffix(strings.TrimPrefix(setting.HttpAddr, "["), "]")
 	hs.httpSrv = &http.Server{
 	hs.httpSrv = &http.Server{
-		Addr:    net.JoinHostPort(setting.HttpAddr, setting.HttpPort),
+		Addr:    net.JoinHostPort(host, setting.HttpPort),
 		Handler: hs.macaron,
 		Handler: hs.macaron,
 	}
 	}
 	switch hs.Cfg.Protocol {
 	switch hs.Cfg.Protocol {

pkg/services/ldap/ldap.go

@@ -114,6 +114,8 @@ func (server *Server) Dial() error {
 		}
 		}
 	}
 	}
 	for _, host := range strings.Split(server.Config.Host, " ") {
 	for _, host := range strings.Split(server.Config.Host, " ") {
+		// Remove any square brackets enclosing IPv6 addresses, a format we support for backwards compatibility
+		host = strings.TrimSuffix(strings.TrimPrefix(host, "["), "]")
 		address := net.JoinHostPort(host, strconv.Itoa(server.Config.Port))
 		address := net.JoinHostPort(host, strconv.Itoa(server.Config.Port))
 		if server.Config.UseSSL {
 		if server.Config.UseSSL {
 			tlsCfg := &tls.Config{
 			tlsCfg := &tls.Config{