From d79fa809fbf03e3720996dc501ec5040335da559 Mon Sep 17 00:00:00 2001 From: Fernandez Ludovic Date: Thu, 5 Sep 2019 22:02:06 +0200 Subject: [PATCH] fix: don't panic when no account. --- dumper/v1/dumper.go | 13 ++++++------- dumper/v2/dumper.go | 13 ++++++------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dumper/v1/dumper.go b/dumper/v1/dumper.go index 2bc07bd..b8a1a6f 100644 --- a/dumper/v1/dumper.go +++ b/dumper/v1/dumper.go @@ -34,12 +34,6 @@ func Dump(data *StoredData, baseConfig *dumper.BaseConfig) error { return err } - privateKeyPem := extractPEMPrivateKey(data.Account) - err := ioutil.WriteFile(filepath.Join(baseConfig.DumpPath, keysSubDir, "letsencrypt"+baseConfig.KeyInfo.Ext), privateKeyPem, 0600) - if err != nil { - return err - } - for _, cert := range data.Certificates { err := writeCert(baseConfig.DumpPath, cert, baseConfig.CrtInfo, baseConfig.DomainSubDir) if err != nil { @@ -52,7 +46,12 @@ func Dump(data *StoredData, baseConfig *dumper.BaseConfig) error { } } - return nil + if data.Account == nil { + return nil + } + + privateKeyPem := extractPEMPrivateKey(data.Account) + return ioutil.WriteFile(filepath.Join(baseConfig.DumpPath, keysSubDir, "letsencrypt"+baseConfig.KeyInfo.Ext), privateKeyPem, 0600) } func writeCert(dumpPath string, cert *Certificate, info dumper.FileInfo, domainSubDir bool) error { diff --git a/dumper/v2/dumper.go b/dumper/v2/dumper.go index f9cb0b7..f8a197c 100644 --- a/dumper/v2/dumper.go +++ b/dumper/v2/dumper.go @@ -35,12 +35,6 @@ func Dump(data *acme.StoredData, baseConfig *dumper.BaseConfig) error { return err } - privateKeyPem := extractPEMPrivateKey(data.Account) - err := ioutil.WriteFile(filepath.Join(baseConfig.DumpPath, keysSubDir, "letsencrypt"+baseConfig.KeyInfo.Ext), privateKeyPem, 0600) - if err != nil { - return err - } - for _, cert := range data.Certificates { err := writeCert(baseConfig.DumpPath, cert.Certificate, baseConfig.CrtInfo, baseConfig.DomainSubDir) if err != nil { @@ -53,7 +47,12 @@ func Dump(data *acme.StoredData, baseConfig *dumper.BaseConfig) error { } } - return nil + if data.Account == nil { + return nil + } + + privateKeyPem := extractPEMPrivateKey(data.Account) + return ioutil.WriteFile(filepath.Join(baseConfig.DumpPath, keysSubDir, "letsencrypt"+baseConfig.KeyInfo.Ext), privateKeyPem, 0600) } func writeCert(dumpPath string, cert acme.Certificate, info dumper.FileInfo, domainSubDir bool) error {