Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow setting timeout during TLS Handshake #80

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions server.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ type Server struct {
handler Handler
lastError error
readTimeoutMilliseconds int64
tlsHandshakeTimeout time.Duration
tlsPeerNameFunc TlsPeerNameFunc
datagramPool sync.Pool
}
Expand Down Expand Up @@ -66,6 +67,10 @@ func (s *Server) SetTimeout(millseconds int64) {
s.readTimeoutMilliseconds = millseconds
}

func (s *Server) SetTlsHandshakeTimeout(d time.Duration) {
s.tlsHandshakeTimeout = d
}

// Set the function that extracts a TLS peer name from the TLS connection
func (s *Server) SetTlsPeerNameFunc(tlsPeerNameFunc TlsPeerNameFunc) {
s.tlsPeerNameFunc = tlsPeerNameFunc
Expand Down Expand Up @@ -206,6 +211,9 @@ func (s *Server) goScanConnection(connection net.Conn) {
tlsPeer := ""
if tlsConn, ok := connection.(*tls.Conn); ok {
// Handshake now so we get the TLS peer information
if s.tlsHandshakeTimeout > 0 {
tlsConn.SetDeadline(time.Now().Add(s.tlsHandshakeTimeout))
}
if err := tlsConn.Handshake(); err != nil {
connection.Close()
return
Expand Down