feat: MAILCOW_RESOLVE_HOST für internes DNS-Routing hinzufügen
All checks were successful
Build Test Docker Image / docker-test (pull_request) Successful in 1m54s
Run Tests / test (pull_request) Successful in 4m49s

This commit is contained in:
2026-03-28 14:30:57 +01:00
parent 28285b254e
commit 838e702cf0
2 changed files with 43 additions and 9 deletions

View File

@@ -4,6 +4,7 @@ import (
"context"
"fmt"
"log/slog"
"net"
"net/http"
"os"
"strings"
@@ -56,11 +57,7 @@ func run() error {
userTokensLock: &sync.RWMutex{},
baseURL: mailcowBase,
stateFilepath: os.Getenv("STATEFILE"),
httpClient: &http.Client{
Transport: &http.Transport{
Proxy: http.ProxyFromEnvironment,
},
},
httpClient: &http.Client{Transport: buildTransport()},
}
if len(d.stateFilepath) == 0 {
d.stateFilepath = "state.json"
@@ -139,3 +136,31 @@ func (d *Daemon) processUser(ctx context.Context, m mailcow.Mailbox) error {
}
return nil
}
// buildTransport erstellt einen http.Transport.
// Wenn MAILCOW_RESOLVE_HOST gesetzt ist (z. B. "nginx-mailcow"), wird der
// tatsächliche TCP-Connect auf diesen Host umgeleitet, während TLS-SNI und
// Zertifikatsprüfung den Original-Hostnamen aus der URL verwenden.
// Damit wird das Hairpin-NAT-Problem in Docker-Netzen umgangen.
func buildTransport() *http.Transport {
resolveHost := os.Getenv("MAILCOW_RESOLVE_HOST")
t := &http.Transport{
Proxy: http.ProxyFromEnvironment,
}
if resolveHost != "" {
slog.Info("using internal resolve host for connections", "resolveHost", resolveHost)
dialer := &net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
}
t.DialContext = func(ctx context.Context, network, addr string) (net.Conn, error) {
_, port, err := net.SplitHostPort(addr)
if err != nil {
return nil, err
}
addr = net.JoinHostPort(resolveHost, port)
return dialer.DialContext(ctx, network, addr)
}
}
return t
}