From e9530e18cc9c61831c54e3cce9174364c6f468d6 Mon Sep 17 00:00:00 2001 From: Sasha Klizhentas Date: Tue, 20 Mar 2018 17:55:21 -0700 Subject: [PATCH] Turn off proxy support when no-tls is used. Fixes #1800 --- lib/service/service.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/service/service.go b/lib/service/service.go index bada955cb0f7e..58d06917abed4 100644 --- a/lib/service/service.go +++ b/lib/service/service.go @@ -1098,7 +1098,7 @@ func (process *TeleportProcess) setupProxyListeners() (*proxyListeners, error) { case cfg.Proxy.DisableWebService && cfg.Proxy.DisableReverseTunnel: log.Debugf("Setup Proxy: Reverse tunnel proxy and web proxy are disabled.") return &listeners, nil - case cfg.Proxy.ReverseTunnelListenAddr.Equals(cfg.Proxy.WebAddr): + case cfg.Proxy.ReverseTunnelListenAddr.Equals(cfg.Proxy.WebAddr) && !cfg.Proxy.DisableTLS: log.Debugf("Setup Proxy: Reverse tunnel proxy and web proxy listen on the same port, multiplexing is on.") listener, err := process.importOrCreateListener(teleport.Component(teleport.ComponentProxy, "tunnel", "web"), cfg.Proxy.WebAddr.Addr) if err != nil { @@ -1118,7 +1118,7 @@ func (process *TeleportProcess) setupProxyListeners() (*proxyListeners, error) { listeners.reverseTunnel = listeners.mux.SSH() go listeners.mux.Serve() return &listeners, nil - case cfg.Proxy.EnableProxyProtocol && !cfg.Proxy.DisableWebService: + case cfg.Proxy.EnableProxyProtocol && !cfg.Proxy.DisableWebService && !cfg.Proxy.DisableTLS: log.Debugf("Setup Proxy: Proxy protocol is enabled for web service, multiplexing is on.") listener, err := process.importOrCreateListener(teleport.Component(teleport.ComponentProxy, "web"), cfg.Proxy.WebAddr.Addr) if err != nil {