summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBrad Fitzpatrick <bradfitz@tailscale.com>2024-05-06 11:42:39 -0700
committerBrad Fitzpatrick <bradfitz@tailscale.com>2024-05-06 12:11:16 -0700
commit50b13d5989052e746e5a8efb4f3205b135f99c5f (patch)
tree08f51132132091f805f5b69d22b053c5f02b1661
parentce8969d82b5df9eff4f3ad71f6781c73e4481bf0 (diff)
downloadtailscale-bradfitz/debug_tstest.tar.xz
tailscale-bradfitz/debug_tstest.zip
Change-Id: I64d34d15a040475b558444a9b52572879eb5bc54 Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
-rw-r--r--control/controlclient/direct.go3
-rw-r--r--net/tshttpproxy/tshttpproxy.go3
2 files changed, 6 insertions, 0 deletions
diff --git a/control/controlclient/direct.go b/control/controlclient/direct.go
index edc63cfb4..472a6fd92 100644
--- a/control/controlclient/direct.go
+++ b/control/controlclient/direct.go
@@ -398,6 +398,9 @@ func (c *Direct) TryLogout(ctx context.Context) error {
}
func (c *Direct) TryLogin(ctx context.Context, t *tailcfg.Oauth2Token, flags LoginFlags) (url string, err error) {
+ if strings.Contains(c.serverURL, "controlplane") {
+ panic("XXX controlclient: TryLogin called on controlplane server")
+ }
c.logf("[v1] direct.TryLogin(token=%v, flags=%v)", t != nil, flags)
return c.doLoginOrRegen(ctx, loginOpt{Token: t, Flags: flags})
}
diff --git a/net/tshttpproxy/tshttpproxy.go b/net/tshttpproxy/tshttpproxy.go
index 2ca440b57..a4f47921b 100644
--- a/net/tshttpproxy/tshttpproxy.go
+++ b/net/tshttpproxy/tshttpproxy.go
@@ -142,6 +142,9 @@ func ProxyFromEnvironment(req *http.Request) (ret *url.URL, _ error) {
return
}
log.Printf("tshttpproxy: using proxy %q for URL: %q", ss, req.URL.String())
+ if strings.HasPrefix(req.URL.String(), "https://controlplane.tailscale.com/key") {
+ panic("XXX saw controlplane.tailscale.com/key in test")
+ }
mak.Set(&logMessagePrinted, ss, true)
}()