generate only if not present

This commit is contained in:
Willy Kloucek
2020-12-15 10:06:35 +01:00
parent b42e507ab5
commit 368d6db248
2 changed files with 8 additions and 4 deletions
-1
View File
@@ -188,7 +188,6 @@ func Server(cfg *config.Config) *cli.Command {
}
if lscfg.Enabled {
// GenCert has side effects as it writes 2 files to the binary running location
if err := crypto.GenCert(cfg.Ldaps.Cert, cfg.Ldaps.Key, logger); err != nil {
logger.Fatal().Err(err).Msgf("Could not generate test-certificate")
}
+8 -3
View File
@@ -47,6 +47,14 @@ func GenCert(certName string, keyName string, l log.Logger) error {
var priv interface{}
var err error
_, certErr := os.Stat(certName)
_, keyErr := os.Stat(keyName)
if certErr == nil && keyErr == nil {
l.Debug().Msg("LDAPS certificate and key already present, using these")
return nil
}
priv, err = rsa.GenerateKey(rand.Reader, 2048)
if err != nil {
@@ -94,9 +102,6 @@ func GenCert(certName string, keyName string, l log.Logger) error {
}
certPath := filepath.Dir(certName)
l.Error().Msg("certPath: " + certPath)
l.Error().Msg("certName: " + certName)
if _, err := os.Stat(certPath); os.IsNotExist(err) {
err = os.MkdirAll(certPath, 0700)
if err != nil {