diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18386cb2d17720465720d974b91e13f0f266e0e7..4e419c1519d905167ad16887c9b825d4278f0b7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
* Fixed federation with some homeserver setups (delegation with ports). Thanks @MatMaul!
* Fixed the Synapse import script to not skip duplicated media. Thanks @jaywink!
* Fixed requests to IPv6 hosts. Thanks @MatMaul!
+* Fixed listening on IPv6 addresses.
* Removed excessive calls to the database during upload.
## [1.1.2] - April 21st, 2020
diff --git a/api/webserver/webserver.go b/api/webserver/webserver.go
index 162e0ae09be8623ac74a63f7e7ba5fd5033c5f0f..ba10cd1f967b4f61ce2e4317e114fa83d90647c8 100644
--- a/api/webserver/webserver.go
+++ b/api/webserver/webserver.go
@@ -3,6 +3,7 @@ package webserver
import (
"context"
"encoding/json"
+ "net"
"net/http"
"os"
"strconv"
@@ -192,7 +193,7 @@ func Init() *sync.WaitGroup {
handler = tollbooth.LimitHandler(limiter, rtr)
}
- address := config.Get().General.BindAddress + ":" + strconv.Itoa(config.Get().General.Port)
+ address := net.JoinHostPort(config.Get().General.BindAddress, strconv.Itoa(config.Get().General.Port))
httpMux := http.NewServeMux()
httpMux.Handle("/", handler)
diff --git a/controllers/preview_controller/previewers/http.go b/controllers/preview_controller/previewers/http.go
index 1e5e099d603e9f1985851161f93bd70ac8edc3f1..f006ecab16988675caf583f0442c7ba5d1ade2d8 100644
--- a/controllers/preview_controller/previewers/http.go
+++ b/controllers/preview_controller/previewers/http.go
@@ -4,7 +4,6 @@ import (
"context"
"crypto/tls"
"errors"
- "fmt"
"io"
"io/ioutil"
"mime"
@@ -59,19 +58,15 @@ func doHttpGet(urlPayload *preview_types.UrlPayload, languageHeader string, ctx
}
safeIpStr := safeIp.String()
- // IPv6 needs smthg of the form [::] because we explicitly happen the port
- if safeIp.To4() == nil {
- safeIpStr = "[" + safeIpStr + "]"
- }
- expectedAddr := fmt.Sprintf("%s:%s", urlPayload.ParsedUrl.Host, safePort)
- altAddr := fmt.Sprintf("%s:%s", urlPayload.ParsedUrl.Host, altPort)
+ expectedAddr := net.JoinHostPort(urlPayload.ParsedUrl.Host, safePort)
+ altAddr := net.JoinHostPort(urlPayload.ParsedUrl.Host, altPort)
returnAddr := ""
if addr == expectedAddr {
- returnAddr = fmt.Sprintf("%s:%s", safeIpStr, safePort)
+ returnAddr = net.JoinHostPort(safeIpStr, safePort)
} else if addr == altAddr && altPort != "" {
- returnAddr = fmt.Sprintf("%s:%s", safeIpStr, altPort)
+ returnAddr = net.JoinHostPort(safeIpStr, altPort)
}
if returnAddr != "" {
diff --git a/matrix/federation.go b/matrix/federation.go
index 626aad3c24fb65cb3caf78e2e1af038fdcc63e9d..ff10a4fee2e5bbcc7cac58efefa6c1d43194c44b 100644
--- a/matrix/federation.go
+++ b/matrix/federation.go
@@ -8,6 +8,7 @@ import (
"io/ioutil"
"net"
"net/http"
+ "strconv"
"strings"
"sync"
"time"
@@ -82,7 +83,7 @@ func GetServerApiUrl(hostname string) (string, string, error) {
// Step 1 of the discovery process: if the hostname is an IP, use that with explicit or default port
logrus.Debug("Testing if " + h + " is an IP address")
if is.IP(h) {
- url := fmt.Sprintf("https://%s:%s", h, p)
+ url := fmt.Sprintf("https://%s", net.JoinHostPort(h, p))
server := cachedServer{url, hostname}
apiUrlCacheInstance.Set(hostname, server, cache.DefaultExpiration)
logrus.Info("Server API URL for " + hostname + " is " + url + " (IP address)")
@@ -92,7 +93,7 @@ func GetServerApiUrl(hostname string) (string, string, error) {
// Step 2: if the hostname is not an IP address, and an explicit port is given, use that
logrus.Debug("Testing if a default port was used. Using default = ", defPort)
if !defPort {
- url := fmt.Sprintf("https://%s:%s", h, p)
+ url := fmt.Sprintf("https://%s", net.JoinHostPort(h, p))
server := cachedServer{url, h}
apiUrlCacheInstance.Set(hostname, server, cache.DefaultExpiration)
logrus.Info("Server API URL for " + hostname + " is " + url + " (explicit port)")
@@ -120,7 +121,7 @@ func GetServerApiUrl(hostname string) (string, string, error) {
// Step 3a: if the delegated host is an IP address, use that (regardless of port)
logrus.Debug("Checking if WK host is an IP: " + wkHost)
if is.IP(wkHost) {
- url := fmt.Sprintf("https://%s:%s", wkHost, wkPort)
+ url := fmt.Sprintf("https://%s", net.JoinHostPort(wkHost, wkPort))
server := cachedServer{url, wk.ServerAddr}
apiUrlCacheInstance.Set(hostname, server, cache.DefaultExpiration)
logrus.Info("Server API URL for " + hostname + " is " + url + " (WK; IP address)")
@@ -130,7 +131,7 @@ func GetServerApiUrl(hostname string) (string, string, error) {
// Step 3b: if the delegated host is not an IP and an explicit port is given, use that
logrus.Debug("Checking if WK is using default port? ", wkDefPort)
if !wkDefPort {
- wkHost = fmt.Sprintf("%s:%s", wkHost, wkPort)
+ wkHost = net.JoinHostPort(wkHost, wkPort)
url := fmt.Sprintf("https://%s", wkHost)
server := cachedServer{url, wkHost}
apiUrlCacheInstance.Set(hostname, server, cache.DefaultExpiration)
@@ -148,7 +149,7 @@ func GetServerApiUrl(hostname string) (string, string, error) {
if realAddr[len(realAddr)-1:] == "." {
realAddr = realAddr[0 : len(realAddr)-1]
}
- url := fmt.Sprintf("https://%s:%d", realAddr, addrs[0].Port)
+ url := fmt.Sprintf("https://%s", net.JoinHostPort(realAddr, strconv.Itoa(int(addrs[0].Port))))
server := cachedServer{url, wkHost}
apiUrlCacheInstance.Set(hostname, server, cache.DefaultExpiration)
logrus.Info("Server API URL for " + hostname + " is " + url + " (WK; SRV)")
@@ -157,7 +158,7 @@ func GetServerApiUrl(hostname string) (string, string, error) {
// Step 3d: use the delegated host as-is
logrus.Debug("Using .well-known as-is for ", wkHost)
- url := fmt.Sprintf("https://%s:%s", wkHost, wkPort)
+ url := fmt.Sprintf("https://%s", net.JoinHostPort(wkHost, wkPort))
server := cachedServer{url, wkHost}
apiUrlCacheInstance.Set(hostname, server, cache.DefaultExpiration)
logrus.Info("Server API URL for " + hostname + " is " + url + " (WK; fallback)")
@@ -177,7 +178,7 @@ func GetServerApiUrl(hostname string) (string, string, error) {
if realAddr[len(realAddr)-1:] == "." {
realAddr = realAddr[0 : len(realAddr)-1]
}
- url := fmt.Sprintf("https://%s:%d", realAddr, addrs[0].Port)
+ url := fmt.Sprintf("https://%s", net.JoinHostPort(realAddr, strconv.Itoa(int(addrs[0].Port))))
server := cachedServer{url, h}
apiUrlCacheInstance.Set(hostname, server, cache.DefaultExpiration)
logrus.Info("Server API URL for " + hostname + " is " + url + " (SRV)")
@@ -186,7 +187,7 @@ func GetServerApiUrl(hostname string) (string, string, error) {
// Step 5: use the target host as-is
logrus.Debug("Using host as-is: ", hostname)
- url := fmt.Sprintf("https://%s:%s", h, p)
+ url := fmt.Sprintf("https://%s", net.JoinHostPort(h, p))
server := cachedServer{url, h}
apiUrlCacheInstance.Set(hostname, server, cache.DefaultExpiration)
logrus.Info("Server API URL for " + hostname + " is " + url + " (fallback)")
diff --git a/metrics/webserver.go b/metrics/webserver.go
index 14339591943cdef65f522d838ae9c4c057ffed96..f039e45b54c79a29720e02c3b28643efd8ef4fa8 100644
--- a/metrics/webserver.go
+++ b/metrics/webserver.go
@@ -2,6 +2,7 @@ package metrics
import (
"context"
+ "net"
"net/http"
"strconv"
"time"
@@ -30,7 +31,7 @@ func Init() {
rtr.HandleFunc("/metrics", internalHandler)
rtr.HandleFunc("/_media/metrics", internalHandler)
- address := config.Get().Metrics.BindAddress + ":" + strconv.Itoa(config.Get().Metrics.Port)
+ address := net.JoinHostPort(config.Get().Metrics.BindAddress, strconv.Itoa(config.Get().Metrics.Port))
srv = &http.Server{Addr: address, Handler: rtr}
go func() {
logrus.WithField("address", address).Info("Started metrics listener. Listening at http://" + address)