Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

feature: add ALPN as a supported acme challenge (#979)

Guilherme Oenning5a22a7698ef9
diff --git a/app/cmd/ping.go b/app/cmd/ping.go
index f146d8247..37db5c3bf 100644
--- a/app/cmd/ping.go
+++ b/app/cmd/ping.go
@@ -12,7 +12,7 @@ import (
//Returns an exitcode, 0 for OK and 1 for ERROR
func RunPing() int {
protocol := "http://"
- if env.Config.SSLCert != "" || env.Config.AutoSSL {
+ if env.Config.TLS.Certificate != "" || env.Config.TLS.Automatic {
http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{
InsecureSkipVerify: true,
}
diff --git a/app/pkg/env/env.go b/app/pkg/env/env.go
index 90f576bd7..cdf5406db 100644
--- a/app/pkg/env/env.go
+++ b/app/pkg/env/env.go
@@ -30,15 +30,17 @@ func Version() string {
type config struct {
Environment string `env:"GO_ENV,default=production"`
SignUpDisabled bool `env:"SIGNUP_DISABLED,default=false"`
- AutoSSL bool `env:"SSL_AUTO,default=false"`
- SSLCert string `env:"SSL_CERT"`
- SSLCertKey string `env:"SSL_CERT_KEY"`
- Port string `env:"PORT,default=3000"`
- HostMode string `env:"HOST_MODE,default=single"`
- HostDomain string `env:"HOST_DOMAIN,required"`
- Locale string `env:"LOCALE,default=en"`
- JWTSecret string `env:"JWT_SECRET,required"`
- Rendergun struct {
+ TLS struct {
+ Automatic bool `env:"SSL_AUTO,default=false"`
+ Certificate string `env:"SSL_CERT"`
+ CertificateKey string `env:"SSL_CERT_KEY"`
+ }
+ Port string `env:"PORT,default=3000"`
+ HostMode string `env:"HOST_MODE,default=single"`
+ HostDomain string `env:"HOST_DOMAIN,required"`
+ Locale string `env:"LOCALE,default=en"`
+ JWTSecret string `env:"JWT_SECRET,required"`
+ Rendergun struct {
URL string `env:"RENDERGUN_URL"`
}
Experimental_SSR_SEO bool `env:"EXPERIMENTAL_SSR_SEO,default=false"`
diff --git a/app/pkg/web/autocert_test.go b/app/pkg/web/autocert_test.go
index 56d750abe..03027a27e 100644
--- a/app/pkg/web/autocert_test.go
+++ b/app/pkg/web/autocert_test.go
@@ -28,7 +28,7 @@ func TestUseAutoCert_WhenCNAMEAreRegistered(t *testing.T) {
bus.Init(fs.Service{})
bus.AddHandler(mockIsCNAMEAvailable)
- manager, err := NewCertificateManager("", "")
+ manager, err := NewCertificateManager(context.Background(), "", "")
Expect(err).IsNil()
invalidServerNames := []string{"ideas.app.com", "FEEDBACK.mysite.COM"}
diff --git a/app/pkg/web/engine.go b/app/pkg/web/engine.go
index d556e2564..e9bc38bba 100644
--- a/app/pkg/web/engine.go
+++ b/app/pkg/web/engine.go
@@ -105,9 +105,9 @@ func (e *Engine) Start(address string) {
keyFilePath = ""
)
- if env.Config.SSLCert != "" {
- certFilePath = env.Etc(env.Config.SSLCert)
- keyFilePath = env.Etc(env.Config.SSLCertKey)
+ if env.Config.TLS.Certificate != "" {
+ certFilePath = env.Etc(env.Config.TLS.Certificate)
+ keyFilePath = env.Etc(env.Config.TLS.CertificateKey)
}
stdLog.SetOutput(ioutil.Discard)
@@ -117,7 +117,7 @@ func (e *Engine) Start(address string) {
IdleTimeout: 120 * time.Second,
Addr: address,
Handler: e.mux,
- TLSConfig: getDefaultTLSConfig(),
+ TLSConfig: getDefaultTLSConfig(env.Config.TLS.Automatic),
}
for i := 0; i < runtime.NumCPU()*2; i++ {
@@ -128,14 +128,15 @@ func (e *Engine) Start(address string) {
err error
certManager *CertificateManager
)
- if env.Config.AutoSSL {
- certManager, err = NewCertificateManager(certFilePath, keyFilePath)
+
+ if env.Config.TLS.Automatic {
+ certManager, err = NewCertificateManager(e, certFilePath, keyFilePath)
if err != nil {
panic(errors.Wrap(err, "failed to initialize CertificateManager"))
}
e.server.TLSConfig.GetCertificate = certManager.GetCertificate
- log.Infof(e, "https (auto ssl) server started on @{Address}", dto.Props{"Address": address})
+ log.Infof(e, "https (auto tls) server started on @{Address}", dto.Props{"Address": address})
go certManager.StartHTTPServer()
err = e.server.ListenAndServeTLS("", "")
} else if certFilePath == "" && keyFilePath == "" {
diff --git a/app/pkg/web/ssl.go b/app/pkg/web/ssl.go
index 18de15825..e67be7ec7 100644
--- a/app/pkg/web/ssl.go
+++ b/app/pkg/web/ssl.go
@@ -16,11 +16,18 @@ import (
"github.com/getfider/fider/app/pkg/dbx"
"github.com/getfider/fider/app/pkg/env"
"github.com/getfider/fider/app/pkg/errors"
+ "github.com/getfider/fider/app/pkg/log"
"golang.org/x/crypto/acme/autocert"
)
-func getDefaultTLSConfig() *tls.Config {
+func getDefaultTLSConfig(autoSSL bool) *tls.Config {
+ nextProtos := []string{"h2", "http/1.1"}
+ if autoSSL {
+ nextProtos = append(nextProtos, acme.ALPNProto)
+ }
+
return &tls.Config{
+ NextProtos: nextProtos,
MinVersion: tls.VersionTLS12,
CipherSuites: []uint16{
tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
@@ -33,16 +40,18 @@ func getDefaultTLSConfig() *tls.Config {
}
}
+var errInvalidHostName = errors.New("autotls: invalid hostname")
+
func isValidHostName(ctx context.Context, host string) error {
if host == "" {
- return errors.New("host cannot be empty.")
+ return errors.Wrap(errInvalidHostName, "host cannot be empty.")
}
if env.IsSingleHostMode() {
if env.Config.HostDomain == host {
return nil
}
- return errors.New("server name mismatch")
+ return errors.Wrap(errInvalidHostName, "server name mismatch")
}
trx, err := dbx.BeginTx(ctx)
@@ -58,22 +67,24 @@ func isValidHostName(ctx context.Context, host string) error {
}
if isAvailable.Result {
- return errors.New("no tenants found with cname %s", host)
+ return errors.Wrap(errInvalidHostName, "no tenants found with cname %s", host)
}
return nil
}
//CertificateManager is used to manage SSL certificates
type CertificateManager struct {
+ ctx context.Context
cert tls.Certificate
leaf *x509.Certificate
- autossl autocert.Manager
+ autotls autocert.Manager
}
//NewCertificateManager creates a new CertificateManager
-func NewCertificateManager(certFile, keyFile string) (*CertificateManager, error) {
+func NewCertificateManager(ctx context.Context, certFile, keyFile string) (*CertificateManager, error) {
manager := &CertificateManager{
- autossl: autocert.Manager{
+ ctx: ctx,
+ autotls: autocert.Manager{
Prompt: autocert.AcceptTOS,
Cache: NewAutoCertCache(),
Client: acmeClient(),
@@ -125,12 +136,17 @@ func (m *CertificateManager) GetCertificate(hello *tls.ClientHelloInfo) (*tls.Ce
}
}
- return m.autossl.GetCertificate(hello)
+ cert, err := m.autotls.GetCertificate(hello)
+ if err != nil && errors.Cause(err) != errInvalidHostName {
+ log.Error(m.ctx, err)
+ }
+
+ return cert, err
}
//StartHTTPServer creates a new HTTP server on port 80 that is used for the ACME HTTP Challenge
func (m *CertificateManager) StartHTTPServer() {
- err := http.ListenAndServe(":80", m.autossl.HTTPHandler(nil))
+ err := http.ListenAndServe(":80", m.autotls.HTTPHandler(nil))
if err != nil {
panic(err)
}
diff --git a/app/pkg/web/ssl_test.go b/app/pkg/web/ssl_test.go
index ccabd973e..3eaae5bc2 100644
--- a/app/pkg/web/ssl_test.go
+++ b/app/pkg/web/ssl_test.go
@@ -1,9 +1,9 @@
package web
import (
+ "context"
"crypto/tls"
"testing"
- "time"
"github.com/getfider/fider/app/pkg/bus"
"github.com/getfider/fider/app/pkg/env"
@@ -34,7 +34,7 @@ func TestGetCertificate(t *testing.T) {
keyFile := env.Path("/app/pkg/web/testdata/" + testCase.cert + ".key")
wildcardCert, _ := tls.LoadX509KeyPair(certFile, keyFile)
- manager, err := NewCertificateManager(certFile, keyFile)
+ manager, err := NewCertificateManager(context.Background(), certFile, keyFile)
Expect(err).IsNil()
cert, err := manager.GetCertificate(&tls.ClientHelloInfo{
ServerName: testCase.serverName,
@@ -50,10 +50,10 @@ func TestGetCertificate_WhenCNAMEAreInvalid(t *testing.T) {
bus.Init(fs.Service{})
bus.AddHandler(mockIsCNAMEAvailable)
- manager, err := NewCertificateManager("", "")
+ manager, err := NewCertificateManager(context.Background(), "", "")
Expect(err).IsNil()
- invalidServerNames := []string{"feedback.heyworld.com"}
+ invalidServerNames := []string{"feedback.heyworld.com", "2.2.2.2"}
for _, serverName := range invalidServerNames {
cert, err := manager.GetCertificate(&tls.ClientHelloInfo{
@@ -62,9 +62,6 @@ func TestGetCertificate_WhenCNAMEAreInvalid(t *testing.T) {
Expect(err.Error()).ContainsSubstring(`no tenants found with cname ` + serverName)
Expect(cert).IsNil()
}
-
- // GetCertificate starts a fire and forget go routine to delete items from cache, give it 2sec to complete it
- time.Sleep(2 * time.Second)
}
func TestGetCertificate_ServerNameMatchesCertificate_ShouldReturnIt(t *testing.T) {
@@ -74,7 +71,7 @@ func TestGetCertificate_ServerNameMatchesCertificate_ShouldReturnIt(t *testing.T
certFile := env.Etc("dev-fider-io.crt")
certKey := env.Etc("dev-fider-io.key")
- manager, err := NewCertificateManager(certFile, certKey)
+ manager, err := NewCertificateManager(context.Background(), certFile, certKey)
Expect(err).IsNil()
serverNames := []string{"dev.fider.io", "feedback.dev.fider.io", "anything.dev.fider.io", "IDEAS.DEV.fider.io", ".feedback.DEV.fider.io"}
@@ -96,7 +93,7 @@ func TestGetCertificate_ServerNameDoesntMatchCertificate_ButEndsWithHostName_Sho
env.Config.HostDomain = "dev.fider.io"
certFile := env.Etc("dev-fider-io.crt")
certKey := env.Etc("dev-fider-io.key")
- manager, err := NewCertificateManager(certFile, certKey)
+ manager, err := NewCertificateManager(context.Background(), certFile, certKey)
Expect(err).IsNil()
serverNames := []string{"sub.feedback.dev.fider.io"}