mirror of
https://github.com/gravitational/teleport.git
synced 2026-10-31 20:39:37 +08:00
rosstimothy
e4e7f538ce
* create package to contain proxy peering code * Refactor proxy routing logic into a reusable object Routing logic existed within an unexported handler of ssh subsystem requests, which prevented it from being reused by other components within the proxy, like the webapi server. This causes significant latency issues for web sessions because the web apiserver is required to dial the proxy ssh server to determine how to route to the host. Since the web apiserver and the proxy ssh server exist in the same process this is an entirely unnecesarry step that could be avoided if the routing and ability to established connections were shared throughout the proxy. A new `proxy.Router` object is introduced which contains all the logic that used to exist in `regular.proxySubsys` for determining how to connect to servers and clusters. All routing within the `regular.proxySubsys` now leverages the `proxy.Router` to dial the target. This is step 1 in addressing #15167. Now that the `proxy.Router` exists `web.APIServer` will be able to make use of it to avoid dialing the same process to establish connections.
129 lines
3.2 KiB
Go
129 lines
3.2 KiB
Go
/*
|
|
Copyright 2016 Gravitational, Inc.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package regular
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
apidefaults "github.com/gravitational/teleport/api/defaults"
|
|
"github.com/gravitational/teleport/lib/srv"
|
|
)
|
|
|
|
func TestParseProxyRequest(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
testCases := []struct {
|
|
desc, req string
|
|
expected proxySubsysRequest
|
|
}{
|
|
{
|
|
desc: "proxy request for a host:port",
|
|
req: "proxy:host:22",
|
|
expected: proxySubsysRequest{
|
|
namespace: "",
|
|
host: "host",
|
|
port: "22",
|
|
clusterName: "",
|
|
},
|
|
},
|
|
{
|
|
desc: "similar request, just with '@' at the end (missing site)",
|
|
req: "proxy:host:22@",
|
|
expected: proxySubsysRequest{
|
|
namespace: "",
|
|
host: "host",
|
|
port: "22",
|
|
clusterName: "",
|
|
},
|
|
},
|
|
{
|
|
desc: "proxy request for just the sitename",
|
|
req: "proxy:@moon",
|
|
expected: proxySubsysRequest{
|
|
namespace: "",
|
|
host: "",
|
|
port: "",
|
|
clusterName: "moon",
|
|
},
|
|
},
|
|
{
|
|
desc: "proxy request for the host:port@sitename",
|
|
req: "proxy:station:100@moon",
|
|
expected: proxySubsysRequest{
|
|
namespace: "",
|
|
host: "station",
|
|
port: "100",
|
|
clusterName: "moon",
|
|
},
|
|
},
|
|
{
|
|
desc: "proxy request for the host:port@namespace@cluster",
|
|
req: "proxy:station:100@system@moon",
|
|
expected: proxySubsysRequest{
|
|
namespace: "system",
|
|
host: "station",
|
|
port: "100",
|
|
clusterName: "moon",
|
|
},
|
|
},
|
|
}
|
|
|
|
for i, tt := range testCases {
|
|
t.Run(tt.desc, func(t *testing.T) {
|
|
if tt.expected.namespace == "" {
|
|
// test cases without a defined namespace are testing for
|
|
// the presence of the default namespace; namespace should
|
|
// never actually be empty.
|
|
tt.expected.namespace = apidefaults.Namespace
|
|
}
|
|
req, err := parseProxySubsysRequest(tt.req)
|
|
require.NoError(t, err, "Test case %d: req=%s, expected=%+v", i, tt.req, tt.expected)
|
|
require.Equal(t, tt.expected, req, "Test case %d: req=%s, expected=%+v", i, tt.req, tt.expected)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestParseBadRequests(t *testing.T) {
|
|
t.Parallel()
|
|
|
|
server := &Server{
|
|
hostname: "redhorse",
|
|
proxyMode: true,
|
|
}
|
|
|
|
ctx := &srv.ServerContext{}
|
|
|
|
testCases := []struct {
|
|
desc string
|
|
input string
|
|
}{
|
|
{desc: "empty request", input: "proxy:"},
|
|
{desc: "missing hostname", input: "proxy::80"},
|
|
{desc: "missing hostname and missing cluster name", input: "proxy:@"},
|
|
{desc: "just random string", input: "this is bad string"},
|
|
}
|
|
for _, tt := range testCases {
|
|
t.Run(tt.desc, func(t *testing.T) {
|
|
subsystem, err := parseProxySubsys(tt.input, server, ctx)
|
|
require.Error(t, err, "test case: %q", tt.input)
|
|
require.Nil(t, subsystem, "test case: %q", tt.input)
|
|
})
|
|
}
|
|
}
|