structure appears to work

server/server.go

@@ -2,6 +2,7 @@ package server
 
 import (
 	"context"
+	"crypto/tls"
 	"log/slog"
 	"net/http"
 	"os"
@@ -11,16 +12,36 @@ import (
 
 // Server represents an HTTP server.
 type Server struct {
-	srv    *http.Server
-	logger *slog.Logger
+	srv             *http.Server
+	logger          *slog.Logger
+	disableTls      bool
+	tlsCertFilename string
+	tlsKeyFilename  string
 }
 
 // New creates a new server with the given logger, address and options.
 func New(logger *slog.Logger, addr string, opts ...Option) *Server {
+
+	// Set some options for TLS
+	tlsConfig := &tls.Config{
+		MinVersion:               tls.VersionTLS12,
+		CurvePreferences:         []tls.CurveID{tls.CurveP521, tls.CurveP384, tls.CurveP256},
+		PreferServerCipherSuites: true,
+		InsecureSkipVerify:       true,
+		CipherSuites: []uint16{
+			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+		},
+	}
+
 	srv := &http.Server{
 		Addr:         addr,
 		WriteTimeout: 15 * time.Second,
 		ReadTimeout:  15 * time.Second,
+		TLSConfig:    tlsConfig,
+		TLSNextProto: make(map[string]func(*http.Server, *tls.Conn, http.Handler)),
 	}
 	for _, opt := range opts {
 		opt(&Server{srv: srv})
@@ -56,6 +77,21 @@ func WithRouter(handler http.Handler) Option {
 	}
 }
 
+// DisableTls sets the disable tls value
+func (s *Server) DisableTls(disableTls bool) {
+	s.disableTls = disableTls
+}
+
+// SetCertificate sets the path to the certificate used for TLS, in PEM format
+func (s *Server) SetCertificate(tlsCertFilename string) {
+	s.tlsCertFilename = tlsCertFilename
+}
+
+// SetPrivateKey sets the path to the private key used for TLS, in PEM format
+func (s *Server) SetPrivateKey(tlsKeyFilename string) {
+	s.tlsKeyFilename = tlsKeyFilename
+}
+
 // StartAndWait starts the server and waits for a signal to shut down.
 func (s *Server) StartAndWait() {
 	s.Start()
@@ -64,11 +100,20 @@ func (s *Server) StartAndWait() {
 
 // Start starts the server.
 func (s *Server) Start() {
+
 	go func() {
-		s.logger.Info("starting server", "port", s.srv.Addr)
-		if err := s.srv.ListenAndServe(); err != nil {
-			s.logger.Warn("failed to start server", "error", err)
+		if s.disableTls {
+			s.logger.Info("starting server", "port", s.srv.Addr)
+			if err := s.srv.ListenAndServe(); err != nil {
+				s.logger.Warn("failed to start server", "error", err)
+			}
+		} else {
+			s.logger.Info("starting TLS server", "port", s.srv.Addr, "cert", s.tlsCertFilename, "key", s.tlsKeyFilename)
+			if err := s.srv.ListenAndServeTLS(s.tlsCertFilename, s.tlsKeyFilename); err != nil {
+				s.logger.Warn("failed to start server", "error", err)
+			}
 		}
+
 	}()
 }