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

[v14] Prevent panic in web app transport #35525

Merged
merged 1 commit into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 9 additions & 1 deletion lib/web/app/transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,10 @@ func (t *transport) rewriteRequest(r *http.Request) error {
// tunnel subsystem.
func (t *transport) DialContext(ctx context.Context, _, _ string) (conn net.Conn, err error) {
t.mu.Lock()
if len(t.c.servers) == 0 {
defer t.mu.Unlock()
return nil, trace.ConnectionProblem(nil, "no application servers remaining to connect")
}
servers := make([]types.AppServer, len(t.c.servers))
copy(servers, t.c.servers)
t.mu.Unlock()
Expand All @@ -254,7 +258,11 @@ func (t *transport) DialContext(ctx context.Context, _, _ string) (conn net.Conn

// eliminate any servers from the head of the list that were unreachable
t.mu.Lock()
t.c.servers = t.c.servers[i:]
if i < len(servers) {
t.c.servers = t.c.servers[i:]
} else {
t.c.servers = nil
}
t.mu.Unlock()

if conn != nil || err != nil {
Expand Down
58 changes: 58 additions & 0 deletions lib/web/app/transport_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,22 @@
package app

import (
"context"
"crypto/x509/pkix"
"errors"
"fmt"
"net"
"net/http"
"testing"

"github.com/gravitational/trace"
"github.com/jonboulle/clockwork"
"github.com/stretchr/testify/require"

"github.com/gravitational/teleport/api/types"
apiutils "github.com/gravitational/teleport/api/utils"
"github.com/gravitational/teleport/lib/defaults"
"github.com/gravitational/teleport/lib/reversetunnelclient"
"github.com/gravitational/teleport/lib/tlsca"
"github.com/gravitational/teleport/lib/utils"
)
Expand Down Expand Up @@ -195,3 +200,56 @@ func Test_transport_rewriteRedirect(t *testing.T) {
})
}
}

type fakeTunnel struct {
reversetunnelclient.Tunnel

fakeSite *reversetunnelclient.FakeRemoteSite
err error
}

func (f fakeTunnel) GetSite(domainName string) (reversetunnelclient.RemoteSite, error) {
return f.fakeSite, f.err
}

func TestTransport_DialContextNoServersAvailable(t *testing.T) {
tp := transport{
c: &transportConfig{
proxyClient: fakeTunnel{
err: trace.ConnectionProblem(errors.New(reversetunnelclient.NoApplicationTunnel), ""),
},
identity: &tlsca.Identity{},
servers: []types.AppServer{
&types.AppServerV3{},
&types.AppServerV3{},
&types.AppServerV3{},
},
log: utils.NewLoggerForTests(),
},
}

ctx := context.Background()
type dialRes struct {
conn net.Conn
err error
}

count := len(tp.c.servers) + 1
resC := make(chan dialRes, count)

for i := 0; i < count; i++ {
go func() {
conn, err := tp.DialContext(ctx, "", "")
resC <- dialRes{
conn: conn,
err: err,
}
}()
}

for i := 0; i < count; i++ {
res := <-resC
require.Error(t, res.err)
require.Nil(t, res.conn)
}
}