Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions tool/tsh/common/tsh.go
Original file line number Diff line number Diff line change
Expand Up @@ -1120,6 +1120,10 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error {
}
}

// Remove HTTPS:// in proxy parameter as https is automatically added
cf.Proxy = strings.TrimPrefix(cf.Proxy, "https://")
cf.Proxy = strings.TrimPrefix(cf.Proxy, "HTTPS://")

// Identity files do not currently contain a proxy address. When loading an
// Identity file, a proxy must be passed on the command line as well.
if cf.IdentityFileIn != "" && cf.Proxy == "" {
Expand Down
39 changes: 39 additions & 0 deletions tool/tsh/common/tsh_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -691,6 +691,45 @@ func TestRelogin(t *testing.T) {
require.NoError(t, err)
}

// Test when https:// is included in --proxy address
func TestIgnoreHTTPSPrefix(t *testing.T) {
t.Parallel()

tmpHomePath := t.TempDir()

connector := mockConnector(t)

alice, err := types.NewUser("alice@example.com")
require.NoError(t, err)
alice.SetRoles([]string{"access"})

authProcess, proxyProcess := makeTestServers(t,
withBootstrap(connector, alice),
)

authServer := authProcess.GetAuthServer()
require.NotNil(t, authServer)

proxyAddr, err := proxyProcess.ProxyWebAddr()
require.NoError(t, err)

var buf bytes.Buffer

proxyAddress := "https://" + proxyAddr.String()
err = Run(context.Background(), []string{
"login",
"--insecure",
"--debug",
"--auth", connector.GetName(),
"--proxy", proxyAddress,
}, setHomePath(tmpHomePath), func(cf *CLIConf) error {
cf.MockSSOLogin = mockSSOLogin(t, authServer, alice)
cf.overrideStderr = &buf
return nil
})
require.NoError(t, err)
}

func TestSwitchingProxies(t *testing.T) {
t.Parallel()

Expand Down