Merge branch 'sh-update-go-proxyproto' into 'main'

Update go-proxyproto to v0.6.0

See merge request gitlab-org/gitlab-shell!499

1 files changed, 5 insertions, 1 deletions

diff --git a/internal/sshd/sshd.go b/internal/sshd/sshd.go
index 7f96bef..8b49712 100644
--- a/internal/sshd/sshd.go
+++ b/internal/sshd/sshd.go
@@ -29,6 +29,7 @@ const (
 	StatusReady
 	StatusOnShutdown
 	StatusClosed
+	ProxyHeaderTimeout = 90 * time.Second
 )
 
 type Server struct {
@@ -84,7 +85,10 @@ func (s *Server) listen() error {
 	}
 
 	if s.Config.Server.ProxyProtocol {
-		sshListener = &proxyproto.Listener{Listener: sshListener}
+		sshListener = &proxyproto.Listener{
+			Listener:          sshListener,
+			ReadHeaderTimeout: ProxyHeaderTimeout,
+		}
 
 		log.Info("Proxy protocol is enabled")
 	}