Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-18 16:17:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test: generate tls cert/key in test

Browse Source
This commit is contained in:
James Houlahan
2020-08-03 09:24:39 +02:00
parent da381130a3
commit 7e6d09a247
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/config/tls.go
View File

@ -64,7 +64,7 @@ func GetTLSConfig(cfg tlsConfiger) (tlsConfig *tls.Config, err error) {
tlsConfig, err = loadTLSConfig(certPath, keyPath) tlsConfig, err = loadTLSConfig(certPath, keyPath)
if err != nil { if err != nil {
log.WithError(err).Warn("Cannot load cert, generating a new one") log.WithError(err).Warn("Cannot load cert, generating a new one")
tlsConfig, err = generateTLSConfig(certPath, keyPath) tlsConfig, err = GenerateTLSConfig(certPath, keyPath)
if err != nil { if err != nil {
return return
} }
@ -126,8 +126,9 @@ func loadTLSConfig(certPath, keyPath string) (tlsConfig *tls.Config, err error)
return return
} }
// GenerateTLSConfig generates certs and keys at the given filepaths and returns a TLS Config which holds them.
// See https://golang.org/src/crypto/tls/generate_cert.go // See https://golang.org/src/crypto/tls/generate_cert.go
func generateTLSConfig(certPath, keyPath string) (tlsConfig *tls.Config, err error) { func GenerateTLSConfig(certPath, keyPath string) (tlsConfig *tls.Config, err error) {
priv, err := rsa.GenerateKey(rand.Reader, 2048) priv, err := rsa.GenerateKey(rand.Reader, 2048)
if err != nil { if err != nil {
err = fmt.Errorf("failed to generate private key: %s", err) err = fmt.Errorf("failed to generate private key: %s", err)

2
pkg/config/tls_test.go
View File

@ -43,7 +43,7 @@ func TestTLSKeyRenewal(t *testing.T) {
// Put old key there. // Put old key there.
tlsTemplate.NotBefore = time.Now().Add(-365 * 24 * time.Hour) tlsTemplate.NotBefore = time.Now().Add(-365 * 24 * time.Hour)
tlsTemplate.NotAfter = time.Now() tlsTemplate.NotAfter = time.Now()
cert, err := generateTLSConfig(certPath, keyPath) cert, err := GenerateTLSConfig(certPath, keyPath)
require.Equal(t, err, ErrTLSCertExpireSoon) require.Equal(t, err, ErrTLSCertExpireSoon)
require.Equal(t, len(cert.Certificates), 1) require.Equal(t, len(cert.Certificates), 1)
time.Sleep(time.Second) time.Sleep(time.Second)

11
test/context/config.go
View File

@ -23,8 +23,10 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/ProtonMail/proton-bridge/pkg/config"
"github.com/ProtonMail/proton-bridge/pkg/constants" "github.com/ProtonMail/proton-bridge/pkg/constants"
"github.com/ProtonMail/proton-bridge/pkg/pmapi" "github.com/ProtonMail/proton-bridge/pkg/pmapi"
"github.com/sirupsen/logrus"
) )
type fakeConfig struct { type fakeConfig struct {
@ -39,9 +41,16 @@ func newFakeConfig() *fakeConfig {
panic(err) panic(err)
} }
return &fakeConfig{ cfg := &fakeConfig{
dir: dir, dir: dir,
} }
// We must generate cert.pem and key.pem to prevent errors when attempting to open them.
if _, err = config.GenerateTLSConfig(cfg.GetTLSCertPath(), cfg.GetTLSKeyPath()); err != nil {
logrus.WithError(err).Fatal()
}
return cfg
} }
func (c *fakeConfig) ClearData() error { func (c *fakeConfig) ClearData() error {