summaryrefslogtreecommitdiff
path: root/internal/router/router.go
diff options
context:
space:
mode:
authorLibravatar Daenney <daenney@users.noreply.github.com>2023-03-04 18:24:02 +0100
committerLibravatar GitHub <noreply@github.com>2023-03-04 17:24:02 +0000
commitd2f6de01856917b19e1f1ba6028f7e05d60e674b (patch)
treea8dd7a0718f67dc7248a5e2c9c98db20a6fb2741 /internal/router/router.go
parentuse updateattachment when updating to ensure cache is invalidated (#1587) (diff)
downloadgotosocial-d2f6de01856917b19e1f1ba6028f7e05d60e674b.tar.xz
[feature] Allow loading TLS certs from disk (#1586)
Currently, GtS only supports using the built-in LE client directly for TLS. However, admins may still want to use GtS directly (so without a reverse proxy) but with certificates provided through some other mechanism. They may have some centralised way of provisioning these things themselves, or simply prefer to use LE but with a different challenge like DNS-01 which is not supported by autocert. This adds support for loading a public/private keypair from disk instead of using LE and reconfigures the server to use a TLS listener if we succeed in doing so. Additionally, being able to load TLS keypair from disk opens up the path to using a custom CA for testing purposes avoinding the need for a constellation of containers and something like Pebble or Step CA to provide LE APIs.
Diffstat (limited to 'internal/router/router.go')
-rw-r--r--internal/router/router.go21
1 files changed, 21 insertions, 0 deletions
diff --git a/internal/router/router.go b/internal/router/router.go
index 0b9b63494..edbf51cbb 100644
--- a/internal/router/router.go
+++ b/internal/router/router.go
@@ -20,6 +20,7 @@ package router
import (
"context"
+ "crypto/tls"
"fmt"
"net"
"net/http"
@@ -78,6 +79,26 @@ func (r *router) Start() {
// but updated to TLS if LetsEncrypt is enabled.
listen := r.srv.ListenAndServe
+ // During config validation we already checked that both Chain and Key are set
+ // so we can forego checking for both here
+ if chain := config.GetTLSCertificateChain(); chain != "" {
+ pkey := config.GetTLSCertificateKey()
+ cer, err := tls.LoadX509KeyPair(chain, pkey)
+ if err != nil {
+ log.Fatalf(
+ nil,
+ "tls: failed to load keypair from %s and %s, ensure they are PEM-encoded and can be read by this process: %s",
+ chain, pkey, err,
+ )
+ }
+ r.srv.TLSConfig = &tls.Config{
+ MinVersion: tls.VersionTLS12,
+ Certificates: []tls.Certificate{cer},
+ }
+ // TLS is enabled, update the listen function
+ listen = func() error { return r.srv.ListenAndServeTLS("", "") }
+ }
+
if config.GetLetsEncryptEnabled() {
// LetsEncrypt support is enabled