homelab/traefik
1
0
Fork 0
Code Activity

Fix panic in tls manager

Browse source
This commit is contained in:
Julien Salleyron 2019-06-21 16:32:04 +02:00 • committed by Traefiker Bot
parent 69a1817c3f
commit 69cf05df9a
2 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pkg/tls/tlsmanager.go
View file

@ -39,11 +39,12 @@ func (m *Manager) UpdateConfigs(stores map[string]Store, configs map[string]TLS,
m.stores = make(map[string]*CertificateStore)
for storeName, storeConfig := range m.storesConfig {
var err error
m.stores[storeName], err = buildCertificateStore(storeConfig)
store, err := buildCertificateStore(storeConfig)
if err != nil {
log.Errorf("Error while creating certificate store %s", storeName)
log.Errorf("Error while creating certificate store %s: %v", storeName, err)
continue
}
m.stores[storeName] = store
}
storesCertificates := make(map[string]map[string]*tls.Certificate)
@ -137,14 +138,14 @@ func buildCertificateStore(tlsStore Store) (*CertificateStore, error) {
if tlsStore.DefaultCertificate != nil {
cert, err := buildDefaultCertificate(tlsStore.DefaultCertificate)
if err != nil {
return nil, err
return certificateStore, err
}
certificateStore.DefaultCertificate = cert
} else {
log.Debug("No default certificate, generate one")
cert, err := generate.DefaultCertificate()
if err != nil {
return nil, err
return certificateStore, err
}
certificateStore.DefaultCertificate = cert
}