From eab94a74b1e723891e9932d55eb9c66188162b73 Mon Sep 17 00:00:00 2001 From: Roman Tkachenko Date: Fri, 17 Nov 2023 13:34:20 -0800 Subject: [PATCH] Remove read/write timeouts to unbreak app access --- lib/service/service.go | 4 ++-- lib/srv/app/server.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/service/service.go b/lib/service/service.go index 278df49194a99..4d43b07482765 100644 --- a/lib/service/service.go +++ b/lib/service/service.go @@ -4064,9 +4064,9 @@ func (process *TeleportProcess) initProxyEndpoint(conn *Connector) error { limiter.MakeMiddleware(proxyLimiter), httplib.MakeTracingMiddleware(teleport.ComponentProxy), ), - ReadTimeout: apidefaults.DefaultIOTimeout, + // Note: read/write timeouts *should not* be set here because it + // will break some application access use-cases. ReadHeaderTimeout: defaults.ReadHeadersTimeout, - WriteTimeout: apidefaults.DefaultIOTimeout, IdleTimeout: apidefaults.DefaultIdleTimeout, ErrorLog: utils.NewStdlogger(log.Error, teleport.ComponentProxy), ConnState: ingress.HTTPConnStateReporter(ingress.Web, ingressReporter), diff --git a/lib/srv/app/server.go b/lib/srv/app/server.go index c5f4f9a96dde2..a47bae48dfe31 100644 --- a/lib/srv/app/server.go +++ b/lib/srv/app/server.go @@ -1051,10 +1051,10 @@ func (s *Server) newHTTPServer(clusterName string) *http.Server { s.authMiddleware.Wrap(s) return &http.Server{ + // Note: read/write timeouts *should not* be set here because it will + // break application access. Handler: httplib.MakeTracingHandler(s.authMiddleware, teleport.ComponentApp), - ReadTimeout: apidefaults.DefaultIOTimeout, ReadHeaderTimeout: defaults.ReadHeadersTimeout, - WriteTimeout: apidefaults.DefaultIOTimeout, IdleTimeout: apidefaults.DefaultIdleTimeout, ErrorLog: utils.NewStdlogger(s.log.Error, teleport.ComponentApp), ConnContext: func(ctx context.Context, c net.Conn) context.Context {