Skip to content

Commit 4515a01

Browse files
authored
Fix accidental debug logging in the OCSP helper client (#28450)
* Fix accidental debug logging in the OCSP helper client * changelog
1 parent 6acfc8e commit 4515a01

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

changelog/28450.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
auth/cert: During certificate validation, OCSP requests are debug logged even if Vault's log level is above DEBUG.
3+
```

sdk/helper/ocsp/client.go

+1
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,7 @@ func (c *Client) GetRevocationStatus(ctx context.Context, subject, issuer *x509.
612612
timeout := defaultOCSPResponderTimeout
613613

614614
ocspClient := retryablehttp.NewClient()
615+
ocspClient.Logger = c.Logger()
615616
ocspClient.RetryMax = conf.OcspMaxRetries
616617
ocspClient.HTTPClient.Timeout = timeout
617618
ocspClient.HTTPClient.Transport = newInsecureOcspTransport(conf.ExtraCas)

sdk/helper/ocsp/ocsp_test.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,16 @@ func TestOCSP(t *testing.T) {
5050
for _, tgt := range targetURL {
5151
c.ocspResponseCache, _ = lru.New2Q(10)
5252
for _, tr := range transports {
53-
c := &http.Client{
54-
Transport: tr,
55-
Timeout: 30 * time.Second,
56-
}
57-
req, err := http.NewRequest("GET", tgt, bytes.NewReader(nil))
53+
ocspClient := retryablehttp.NewClient()
54+
ocspClient.Logger = c.Logger()
55+
ocspClient.RetryMax = conf.OcspMaxRetries
56+
ocspClient.HTTPClient.Timeout = 30 * time.Second
57+
ocspClient.HTTPClient.Transport = tr
58+
req, err := retryablehttp.NewRequest("GET", tgt, bytes.NewReader(nil))
5859
if err != nil {
5960
t.Fatalf("fail to create a request. err: %v", err)
6061
}
61-
res, err := c.Do(req)
62+
res, err := ocspClient.Do(req)
6263
if err != nil {
6364
t.Fatalf("failed to GET contents. err: %v", err)
6465
}

0 commit comments

Comments
 (0)