Skip to content

Commit 56b9973

Browse files
committed
fix ztls context deadline err
1 parent 85ad210 commit 56b9973

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

common/httpx/tls.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package httpx
22

33
import (
4+
"context"
45
"crypto/tls"
56
"crypto/x509"
67
"fmt"
@@ -62,7 +63,9 @@ func (h *HTTPX) ZTLSGrab(r *http.Response) *clients.Response {
6263
}
6364
// canonical net concatenation
6465
host = net.JoinHostPort(hostname, fmt.Sprint(port))
65-
tlsConn, err := h.Dialer.DialTLS(r.Request.Context(), "tcp", host)
66+
ctx, cancel := context.WithTimeout(context.Background(), h.client2.Timeout)
67+
defer cancel()
68+
tlsConn, err := h.Dialer.DialTLS(ctx, "tcp", host)
6669
if err != nil {
6770
return nil
6871
}
@@ -106,6 +109,7 @@ func convertCertificateToResponse(hostname string, cert *x509.Certificate) *clie
106109
SHA1: clients.SHA1Fingerprint(cert.Raw),
107110
SHA256: clients.SHA256Fingerprint(cert.Raw),
108111
},
112+
Serial: clients.FormatToSerialNumber(cert.SerialNumber),
109113
}
110114
response.IssuerDN = clients.ParseASN1DNSequenceWithZpkixOrDefault(cert.RawIssuer, cert.Issuer.String())
111115
response.SubjectDN = clients.ParseASN1DNSequenceWithZpkixOrDefault(cert.RawSubject, cert.Subject.String())

0 commit comments

Comments
 (0)