1
0
Fork 0

Merge current v2.11 into v3.6

This commit is contained in:
mmatur 2026-01-09 17:50:52 +01:00
commit dc04dc1940
No known key found for this signature in database
GPG key ID: 2FFE42FC256CFF8E
8 changed files with 155 additions and 35 deletions

View file

@ -3,6 +3,7 @@ package tcp
import (
"bufio"
"bytes"
"context"
"crypto/tls"
"errors"
"io"
@ -222,7 +223,17 @@ func (r *Router) acmeTLSALPNHandler() tcp.Handler {
}
return tcp.HandlerFunc(func(conn tcp.WriteCloser) {
_ = tls.Server(conn, r.httpsTLSConfig).Handshake()
tlsConn := tls.Server(conn, r.httpsTLSConfig)
defer tlsConn.Close()
// This avoids stale connections when validating the ACME challenge,
// as we expect a validation request to complete in a short period of time.
ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second)
defer cancel()
if err := tlsConn.HandshakeContext(ctx); err != nil {
log.Debug().Err(err).Msg("Error during ACME-TLS/1 handshake")
}
})
}