Compare commits
2 Commits
master
...
tls-entrie
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6e53bc224a | ||
|
|
c1cb81e758 |
@@ -13,10 +13,18 @@ import (
|
||||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"time"
|
||||
)
|
||||
|
||||
type TLSEntry struct {
|
||||
// Certificate Path to the certificate file
|
||||
Certificate string `yaml:"certificate"`
|
||||
// Key Path to the corresponding key file
|
||||
Key string `yaml:"key"`
|
||||
}
|
||||
|
||||
type Bind struct {
|
||||
Address string `yaml:"address"`
|
||||
Network string `yaml:"network"`
|
||||
@@ -28,11 +36,35 @@ type Bind struct {
|
||||
// TLSAcmeAutoCert URL to ACME directory, or letsencrypt
|
||||
TLSAcmeAutoCert string `yaml:"tls-acme-autocert"`
|
||||
|
||||
// TLSCertificate Alternate to TLSAcmeAutoCert
|
||||
// TLSEntries Alternate to TLSAcmeAutoCert. Allows multiple entries with matching.
|
||||
// Entries on this list can be live-reloaded if application implements SIGHUP handling
|
||||
TLSEntries []TLSEntry `yaml:"tls-entries"`
|
||||
|
||||
// TLSCertificate Alternate to TLSAcmeAutoCert. Preferred over TLSEntries if specified.
|
||||
TLSCertificate string `yaml:"tls-certificate"`
|
||||
// TLSPrivateKey Alternate to TLSAcmeAutoCert
|
||||
// TLSPrivateKey Alternate to TLSAcmeAutoCert. Preferred over TLSEntries if specified.
|
||||
TLSPrivateKey string `yaml:"tls-key"`
|
||||
|
||||
// General TLS config
|
||||
// TLSMinVersion TLS Minimum supported version.
|
||||
// Default is Golang's default, at writing time it's TLS 1.2. Lowest supported is TLS 1.0
|
||||
TLSMinVersion string `yaml:"tls-min-version"`
|
||||
|
||||
// TLSMaxVersion TLS Maximum supported version.
|
||||
// Default is Golang's default, at writing time it's TLS 1.3, and is automatically increased.
|
||||
// Lowest supported is TLS 1.2
|
||||
TLSMaxVersion string `yaml:"tls-max-version"`
|
||||
|
||||
// TLSCurves List of supported TLS curve ids from Golang internals
|
||||
// See this list https://github.com/golang/go/blob/go1.24.0/src/crypto/tls/common.go#L138-L153 for supported values
|
||||
// Default values are chosen by Golang. It's recommended to leave the default
|
||||
TLSCurves []tls.CurveID `yaml:"tls-curves"`
|
||||
|
||||
// TLSCiphers List of supported TLS ciphers from Golang internals, case sensitive. TLS 1.3 suites are not configurable.
|
||||
// See this list https://github.com/golang/go/blob/go1.24.0/src/crypto/tls/cipher_suites.go#L56-L73 for supported values
|
||||
// Default values are chosen by Golang. It's recommended to leave the default
|
||||
TLSCiphers []string `yaml:"tls-ciphers"`
|
||||
|
||||
// ReadTimeout is the maximum duration for reading the entire
|
||||
// request, including the body. A zero or negative value means
|
||||
// there will be no timeout.
|
||||
@@ -104,6 +136,105 @@ func (b *Bind) Server(backends map[string]http.Handler, acmeCachePath string) (*
|
||||
"TLS enabled",
|
||||
"certificate", b.TLSCertificate,
|
||||
)
|
||||
} else if len(b.TLSEntries) > 0 {
|
||||
tlsConfig = &tls.Config{}
|
||||
var err error
|
||||
|
||||
var certificatesPtr atomic.Pointer[[]tls.Certificate]
|
||||
|
||||
swapTls := func() error {
|
||||
certs := make([]tls.Certificate, 0, len(b.TLSEntries))
|
||||
for _, entry := range b.TLSEntries {
|
||||
cert, err := tls.LoadX509KeyPair(entry.Certificate, entry.Key)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to load TLS certificate %s: %w", entry.Certificate, err)
|
||||
}
|
||||
certs = append(certs, cert)
|
||||
}
|
||||
certificatesPtr.Swap(&certs)
|
||||
return nil
|
||||
}
|
||||
|
||||
tlsConfig.GetCertificate = func(clientHello *tls.ClientHelloInfo) (*tls.Certificate, error) {
|
||||
certs := certificatesPtr.Load()
|
||||
|
||||
if certs == nil || len(*certs) == 0 {
|
||||
panic("no certificates found")
|
||||
}
|
||||
|
||||
for _, cert := range *certs {
|
||||
if err := clientHello.SupportsCertificate(&cert); err == nil {
|
||||
return &cert, nil
|
||||
}
|
||||
}
|
||||
|
||||
// if none match, return first
|
||||
return &(*certs)[0], nil
|
||||
}
|
||||
|
||||
err = swapTls()
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
slog.Warn(
|
||||
"TLS enabled with multiple certificates",
|
||||
"certificates", len(b.TLSEntries),
|
||||
)
|
||||
}
|
||||
|
||||
if tlsConfig != nil {
|
||||
if b.TLSMinVersion != "" {
|
||||
switch strings.NewReplacer("-", "", "_", "", " ", "", ".", "").Replace(strings.ToLower(b.TLSMinVersion)) {
|
||||
case "13", "tls13":
|
||||
tlsConfig.MinVersion = tls.VersionTLS13
|
||||
case "12", "tls12":
|
||||
tlsConfig.MinVersion = tls.VersionTLS12
|
||||
case "11", "tls11":
|
||||
tlsConfig.MinVersion = tls.VersionTLS11
|
||||
case "10", "tls10":
|
||||
tlsConfig.MinVersion = tls.VersionTLS10
|
||||
default:
|
||||
return nil, nil, fmt.Errorf("unsupported minimum TLS version: %s", b.TLSMinVersion)
|
||||
}
|
||||
}
|
||||
|
||||
if b.TLSMaxVersion != "" {
|
||||
switch strings.NewReplacer("-", "", "_", "", " ", "", ".", "").Replace(strings.ToLower(b.TLSMaxVersion)) {
|
||||
case "13", "tls13":
|
||||
tlsConfig.MaxVersion = tls.VersionTLS13
|
||||
case "12", "tls12":
|
||||
tlsConfig.MaxVersion = tls.VersionTLS12
|
||||
default:
|
||||
return nil, nil, fmt.Errorf("unsupported maximum TLS version: %s", b.TLSMinVersion)
|
||||
}
|
||||
}
|
||||
|
||||
if len(b.TLSCiphers) > 0 {
|
||||
for _, cipher := range b.TLSCiphers {
|
||||
if c := func() *tls.CipherSuite {
|
||||
for _, c := range tls.CipherSuites() {
|
||||
if c.Name == cipher {
|
||||
return c
|
||||
}
|
||||
}
|
||||
for _, c := range tls.InsecureCipherSuites() {
|
||||
if c.Name == cipher {
|
||||
return c
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}(); c != nil {
|
||||
tlsConfig.CipherSuites = append(tlsConfig.CipherSuites, c.ID)
|
||||
} else {
|
||||
return nil, nil, fmt.Errorf("unsupported TLS cipher suite: %s", cipher)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if len(b.TLSCurves) > 0 {
|
||||
tlsConfig.CurvePreferences = append(tlsConfig.CurvePreferences, b.TLSCurves...)
|
||||
}
|
||||
}
|
||||
|
||||
var serverHandler atomic.Pointer[http.Handler]
|
||||
|
||||
Reference in New Issue
Block a user