Skip to content

Commit 14972fd

Browse files
committed
Don't log about OCSP when disabled (Fixes #353)
1 parent 5a448ab commit 14972fd

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

certificates.go

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -345,12 +345,14 @@ func (cfg *Config) CacheUnmanagedTLSCertificate(ctx context.Context, tlsCert tls
345345
zap.Time("not_after", cert.Leaf.NotAfter),
346346
zap.Strings("sans", cert.Names))
347347
}
348-
err = stapleOCSP(ctx, cfg.OCSP, cfg.Storage, &cert, nil)
349-
if err != nil {
350-
if errors.Is(err, ErrNoOCSPServerSpecified) {
351-
cfg.Logger.Debug("stapling OCSP", zap.Error(err))
352-
} else {
353-
cfg.Logger.Warn("stapling OCSP", zap.Error(err))
348+
if !cfg.OCSP.DisableStapling {
349+
err = stapleOCSP(ctx, cfg.OCSP, cfg.Storage, &cert, nil)
350+
if err != nil {
351+
if errors.Is(err, ErrNoOCSPServerSpecified) {
352+
cfg.Logger.Debug("stapling OCSP", zap.Error(err))
353+
} else {
354+
cfg.Logger.Warn("stapling OCSP", zap.Error(err))
355+
}
354356
}
355357
}
356358
cfg.emit(ctx, "cached_unmanaged_cert", map[string]any{"sans": cert.Names})
@@ -429,11 +431,13 @@ func (cfg Config) makeCertificateWithOCSP(ctx context.Context, certPEMBlock, key
429431
if err != nil {
430432
return cert, err
431433
}
432-
err = stapleOCSP(ctx, cfg.OCSP, cfg.Storage, &cert, certPEMBlock)
433-
if errors.Is(err, ErrNoOCSPServerSpecified) {
434-
cfg.Logger.Debug("stapling OCSP", zap.Error(err), zap.Strings("identifiers", cert.Names))
435-
} else {
436-
cfg.Logger.Warn("stapling OCSP", zap.Error(err), zap.Strings("identifiers", cert.Names))
434+
if !cfg.OCSP.DisableStapling {
435+
err = stapleOCSP(ctx, cfg.OCSP, cfg.Storage, &cert, certPEMBlock)
436+
if errors.Is(err, ErrNoOCSPServerSpecified) {
437+
cfg.Logger.Debug("stapling OCSP", zap.Error(err), zap.Strings("identifiers", cert.Names))
438+
} else {
439+
cfg.Logger.Warn("stapling OCSP", zap.Error(err), zap.Strings("identifiers", cert.Names))
440+
}
437441
}
438442
return cert, nil
439443
}

0 commit comments

Comments
 (0)