gproxy: listen on tls

Signed-off-by: Jens Langhammer <jens.langhammer@beryju.org>

internal/web/web.go

@@ -1,6 +1,9 @@
 package web
 
 import (
+	"context"
+	"errors"
+	"net"
 	"net/http"
 	"sync"
 
@@ -16,6 +19,8 @@ type WebServer struct {
 
 	LegacyProxy bool
 
+	stop chan struct{} // channel for waiting shutdown
+
 	m   *mux.Router
 	lh  *mux.Router
 	log *log.Entry
@@ -49,12 +54,45 @@ func (ws *WebServer) Run() {
 	}()
 	go func() {
 		defer wg.Done()
-		// ws.listenTLS()
+		ws.listenTLS()
 	}()
 	wg.Done()
 }
 
 func (ws *WebServer) listenPlain() {
+	ln, err := net.Listen("tcp", config.G.Web.Listen)
+	if err != nil {
+		ws.log.WithError(err).Fatalf("failed to listen")
+	}
+	ws.log.WithField("addr", config.G.Web.Listen).Info("Running")
+
+	ws.serve(ln)
+
 	ws.log.WithField("addr", config.G.Web.Listen).Info("Running")
 	http.ListenAndServe(config.G.Web.Listen, ws.m)
 }
+
+func (ws *WebServer) serve(listener net.Listener) {
+	srv := &http.Server{
+		Handler: ws.m,
+	}
+
+	// See https://golang.org/pkg/net/http/#Server.Shutdown
+	idleConnsClosed := make(chan struct{})
+	go func() {
+		<-ws.stop // wait notification for stopping server
+
+		// We received an interrupt signal, shut down.
+		if err := srv.Shutdown(context.Background()); err != nil {
+			// Error from closing listeners, or context timeout:
+			ws.log.Printf("HTTP server Shutdown: %v", err)
+		}
+		close(idleConnsClosed)
+	}()
+
+	err := srv.Serve(listener)
+	if err != nil && !errors.Is(err, http.ErrServerClosed) {
+		ws.log.Errorf("ERROR: http.Serve() - %s", err)
+	}
+	<-idleConnsClosed
+}

internal/web/web_ssl.go

@@ -0,0 +1,32 @@
+package web
+
+import (
+	"crypto/tls"
+	"net"
+
+	"goauthentik.io/internal/config"
+	"goauthentik.io/internal/crypto"
+)
+
+// ServeHTTPS constructs a net.Listener and starts handling HTTPS requests
+func (ws *WebServer) listenTLS() {
+	cert, err := crypto.GenerateSelfSignedCert()
+	if err != nil {
+		ws.log.WithError(err).Error("failed to generate default cert")
+	}
+	tlsConfig := &tls.Config{
+		MinVersion:   tls.VersionTLS12,
+		MaxVersion:   tls.VersionTLS12,
+		Certificates: []tls.Certificate{cert},
+	}
+
+	ln, err := net.Listen("tcp", config.G.Web.ListenTLS)
+	if err != nil {
+		ws.log.WithError(err).Fatalf("failed to listen")
+	}
+	ws.log.WithField("addr", config.G.Web.ListenTLS).Info("Running")
+
+	tlsListener := tls.NewListener(tcpKeepAliveListener{ln.(*net.TCPListener)}, tlsConfig)
+	ws.serve(tlsListener)
+	ws.log.Printf("closing %s", tlsListener.Addr())
+}

internal/web/web_utils.go

@@ -0,0 +1,31 @@
+package web
+
+import (
+	"log"
+	"net"
+	"time"
+)
+
+// tcpKeepAliveListener sets TCP keep-alive timeouts on accepted
+// connections. It's used by ListenAndServe and ListenAndServeTLS so
+// dead TCP connections (e.g. closing laptop mid-download) eventually
+// go away.
+type tcpKeepAliveListener struct {
+	*net.TCPListener
+}
+
+func (ln tcpKeepAliveListener) Accept() (net.Conn, error) {
+	tc, err := ln.AcceptTCP()
+	if err != nil {
+		return nil, err
+	}
+	err = tc.SetKeepAlive(true)
+	if err != nil {
+		log.Printf("Error setting Keep-Alive: %v", err)
+	}
+	err = tc.SetKeepAlivePeriod(3 * time.Minute)
+	if err != nil {
+		log.Printf("Error setting Keep-Alive period: %v", err)
+	}
+	return tc, nil
+}