Open platform to collect and prioritize feedback
use configured SSL if compatible on AutoSSL mode (#153)
Guilherme Oenning8eb8648e6455
diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.goindex 62dc302f1..e22dd09ac 100644--- a/app/pkg/web/engine.go+++ b/app/pkg/web/engine.go@@ -6,8 +6,6 @@ import ("net/http""os"- "golang.org/x/crypto/acme/autocert"-"github.com/getfider/fider/app/models""github.com/getfider/fider/app/pkg/env""github.com/getfider/fider/app/pkg/log"@@ -49,8 +47,8 @@ func New(settings *models.AppSettings) *Engine {//Start an HTTP server.func (e *Engine) Start(address string) {- cert := env.GetEnvOrDefault("SSL_CERT", "")- key := env.GetEnvOrDefault("SSL_CERT_KEY", "")+ certFile := env.GetEnvOrDefault("SSL_CERT", "")+ keyFile := env.GetEnvOrDefault("SSL_CERT_KEY", "")autoSSL := env.GetEnvOrDefault("SSL_AUTO", "")server := &http.Server{@@ -60,25 +58,26 @@ func (e *Engine) Start(address string) {var err errorif autoSSL == "true" {- certManager := autocert.Manager{- Prompt: autocert.AcceptTOS,- Cache: autocert.DirCache("certs"),+ certManager, err := NewCertificateManager(certFile, keyFile, "certs")+ if err != nil {+ panic(err)}+server.TLSConfig = &tls.Config{GetCertificate: certManager.GetCertificate,}e.logger.Infof("https (auto ssl) server started on %s", address)err = server.ListenAndServeTLS("", "")- } else if cert == "" && key == "" {+ } else if certFile == "" && keyFile == "" {e.logger.Infof("http server started on %s", address)err = server.ListenAndServe()} else {e.logger.Infof("https server started on %s", address)- err = server.ListenAndServeTLS(cert, key)+ err = server.ListenAndServeTLS(certFile, keyFile)}if err != nil {- e.logger.Error(err)+ panic(err)}}diff --git a/app/pkg/web/ssl.go b/app/pkg/web/ssl.gonew file mode 100644index 000000000..79bfa447d--- /dev/null+++ b/app/pkg/web/ssl.go@@ -0,0 +1,52 @@+package web++import (+ "crypto/tls"+ "crypto/x509"++ "golang.org/x/crypto/acme/autocert"+)++//CertificateManager is used to manage SSL certificates+type CertificateManager struct {+ cert tls.Certificate+ leaf *x509.Certificate+ autossl autocert.Manager+}++//NewCertificateManager creates a new CertificateManager+func NewCertificateManager(certFile, keyFile, cacheDir string) (*CertificateManager, error) {+ manager := &CertificateManager{+ autossl: autocert.Manager{+ Prompt: autocert.AcceptTOS,+ Cache: autocert.DirCache(cacheDir),+ },+ }++ if certFile != "" && keyFile != "" {+ var err error+ manager.cert, err = tls.LoadX509KeyPair(certFile, keyFile)+ if err != nil {+ return nil, err+ }++ manager.leaf, err = x509.ParseCertificate(manager.cert.Certificate[0])+ if err != nil {+ return nil, err+ }+ }++ return manager, nil+}++//GetCertificate decides which certificate to use+//It first tries to use loaded certificate for incoming request if it's compatible+//Otherwise fallsback to a automatically generated certificate by Let's Encrypt+func (m *CertificateManager) GetCertificate(hello *tls.ClientHelloInfo) (*tls.Certificate, error) {+ if m.leaf != nil {+ if m.leaf.VerifyHostname(hello.ServerName) != nil {+ return &m.cert, nil+ }+ }+ return m.autossl.GetCertificate(hello)+}