chore: remove legacy wsconncache (#11816)

Fixes #8218 Removes `wsconncache` and related "is legacy?" functions and API calls that were used by it. The only leftover is that Agents still use the legacy IP, so that back level clients or workspace proxies can dial them correctly. We should eventually remove this: #11819
2026-09-24 15:04:27 +08:00 · 2024-01-30 07:56:36 +04:00
parent 13e24f21e4
commit 1e8a9c09fe
24 changed files with 36 additions and 1238 deletions
@@ -187,15 +187,6 @@ func New(ctx context.Context, options *Options) (_ *API, err error) {
 			r.Use(apiKeyMiddleware)
 			r.Post("/", api.reconnectingPTYSignedToken)
 		})
-
-		r.With(
-			apiKeyMiddlewareOptional,
-			httpmw.ExtractWorkspaceProxy(httpmw.ExtractWorkspaceProxyConfig{
-				DB:       options.Database,
-				Optional: true,
-			}),
-			httpmw.RequireAPIKeyOrWorkspaceProxyAuth(),
-		).Get("/workspaceagents/{workspaceagent}/legacy", api.agentIsLegacy)
 		r.Route("/workspaceproxies", func(r chi.Router) {
 			r.Use(
 				api.moonsEnabledMW,
@@ -7,42 +7,11 @@ import (
 	"nhooyr.io/websocket"

 	"github.com/coder/coder/v2/coderd/httpapi"
-	"github.com/coder/coder/v2/coderd/httpmw"
 	"github.com/coder/coder/v2/coderd/util/apiversion"
 	"github.com/coder/coder/v2/codersdk"
-	"github.com/coder/coder/v2/enterprise/wsproxy/wsproxysdk"
 	"github.com/coder/coder/v2/tailnet/proto"
 )

-// @Summary Agent is legacy
-// @ID agent-is-legacy
-// @Security CoderSessionToken
-// @Produce json
-// @Tags Enterprise
-// @Param workspaceagent path string true "Workspace Agent ID" format(uuid)
-// @Success 200 {object} wsproxysdk.AgentIsLegacyResponse
-// @Router /workspaceagents/{workspaceagent}/legacy [get]
-// @x-apidocgen {"skip": true}
-func (api *API) agentIsLegacy(rw http.ResponseWriter, r *http.Request) {
-	ctx := r.Context()
-
-	agentID, ok := httpmw.ParseUUIDParam(rw, r, "workspaceagent")
-	if !ok {
-		httpapi.Write(r.Context(), rw, http.StatusBadRequest, codersdk.Response{
-			Message: "Missing UUID in URL.",
-		})
-		return
-	}
-
-	node := (*api.AGPL.TailnetCoordinator.Load()).Node(agentID)
-	httpapi.Write(ctx, rw, http.StatusOK, wsproxysdk.AgentIsLegacyResponse{
-		Found: node != nil,
-		Legacy: node != nil &&
-			len(node.Addresses) > 0 &&
-			node.Addresses[0].Addr() == codersdk.WorkspaceAgentIP,
-	})
-}
-
 // @Summary Workspace Proxy Coordinate
 // @ID workspace-proxy-coordinate
 // @Security CoderSessionToken
@@ -1,158 +0,0 @@
-package coderd_test
-
-import (
-	"context"
-	"net/netip"
-	"testing"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/moby/moby/pkg/namesgenerator"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/types/known/timestamppb"
-	"tailscale.com/types/key"
-
-	"cdr.dev/slog/sloggers/slogtest"
-	"github.com/coder/coder/v2/coderd/coderdtest"
-	"github.com/coder/coder/v2/coderd/database/dbtestutil"
-	"github.com/coder/coder/v2/codersdk"
-	"github.com/coder/coder/v2/enterprise/coderd/coderdenttest"
-	"github.com/coder/coder/v2/enterprise/coderd/license"
-	"github.com/coder/coder/v2/enterprise/wsproxy/wsproxysdk"
-	agpl "github.com/coder/coder/v2/tailnet"
-	"github.com/coder/coder/v2/tailnet/proto"
-	"github.com/coder/coder/v2/testutil"
-)
-
-// workspaceProxyCoordinate and agentIsLegacy are both tested by wsproxy tests.
-
-func Test_agentIsLegacy(t *testing.T) {
-	t.Parallel()
-	nodeKey := key.NewNode().Public()
-	discoKey := key.NewDisco().Public()
-	nkBin, err := nodeKey.MarshalBinary()
-	require.NoError(t, err)
-	dkBin, err := discoKey.MarshalText()
-	require.NoError(t, err)
-
-	t.Run("Legacy", func(t *testing.T) {
-		t.Parallel()
-
-		var (
-			ctx, cancel = context.WithTimeout(context.Background(), testutil.WaitShort)
-			db, pubsub  = dbtestutil.NewDB(t)
-			logger      = slogtest.Make(t, nil)
-			coordinator = agpl.NewCoordinator(logger)
-			client, _   = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					Database:    db,
-					Pubsub:      pubsub,
-					Coordinator: coordinator,
-				},
-				LicenseOptions: &coderdenttest.LicenseOptions{
-					Features: license.Features{
-						codersdk.FeatureWorkspaceProxy: 1,
-					},
-				},
-			})
-		)
-		defer cancel()
-
-		nodeID := uuid.New()
-		ma := coordinator.ServeMultiAgent(nodeID)
-		defer ma.Close()
-		require.NoError(t, ma.UpdateSelf(&proto.Node{
-			Id:            55,
-			AsOf:          timestamppb.New(time.Unix(1689653252, 0)),
-			Key:           nkBin,
-			Disco:         string(dkBin),
-			PreferredDerp: 0,
-			DerpLatency: map[string]float64{
-				"0": 1.0,
-			},
-			DerpForcedWebsocket: map[int32]string{},
-			Addresses:           []string{codersdk.WorkspaceAgentIP.String() + "/128"},
-			AllowedIps:          []string{codersdk.WorkspaceAgentIP.String() + "/128"},
-			Endpoints:           []string{"192.168.1.1:18842"},
-		}))
-		require.Eventually(t, func() bool {
-			return coordinator.Node(nodeID) != nil
-		}, testutil.WaitShort, testutil.IntervalFast)
-
-		proxyRes, err := client.CreateWorkspaceProxy(ctx, codersdk.CreateWorkspaceProxyRequest{
-			Name: namesgenerator.GetRandomName(1),
-			Icon: "/emojis/flag.png",
-		})
-		require.NoError(t, err)
-
-		proxyClient := wsproxysdk.New(client.URL)
-		proxyClient.SetSessionToken(proxyRes.ProxyToken)
-
-		legacyRes, err := proxyClient.AgentIsLegacy(ctx, nodeID)
-		require.NoError(t, err)
-
-		assert.True(t, legacyRes.Found)
-		assert.True(t, legacyRes.Legacy)
-	})
-
-	t.Run("NotLegacy", func(t *testing.T) {
-		t.Parallel()
-
-		var (
-			ctx, cancel = context.WithTimeout(context.Background(), testutil.WaitShort)
-			db, pubsub  = dbtestutil.NewDB(t)
-			logger      = slogtest.Make(t, nil)
-			coordinator = agpl.NewCoordinator(logger)
-			client, _   = coderdenttest.New(t, &coderdenttest.Options{
-				Options: &coderdtest.Options{
-					Database:    db,
-					Pubsub:      pubsub,
-					Coordinator: coordinator,
-				},
-				LicenseOptions: &coderdenttest.LicenseOptions{
-					Features: license.Features{
-						codersdk.FeatureWorkspaceProxy: 1,
-					},
-				},
-			})
-		)
-		defer cancel()
-
-		nodeID := uuid.New()
-		ma := coordinator.ServeMultiAgent(nodeID)
-		defer ma.Close()
-		require.NoError(t, ma.UpdateSelf(&proto.Node{
-			Id:            55,
-			AsOf:          timestamppb.New(time.Unix(1689653252, 0)),
-			Key:           nkBin,
-			Disco:         string(dkBin),
-			PreferredDerp: 0,
-			DerpLatency: map[string]float64{
-				"0": 1.0,
-			},
-			DerpForcedWebsocket: map[int32]string{},
-			Addresses:           []string{netip.PrefixFrom(agpl.IPFromUUID(nodeID), 128).String()},
-			AllowedIps:          []string{netip.PrefixFrom(agpl.IPFromUUID(nodeID), 128).String()},
-			Endpoints:           []string{"192.168.1.1:18842"},
-		}))
-		require.Eventually(t, func() bool {
-			return coordinator.Node(nodeID) != nil
-		}, testutil.WaitShort, testutil.IntervalFast)
-
-		proxyRes, err := client.CreateWorkspaceProxy(ctx, codersdk.CreateWorkspaceProxyRequest{
-			Name: namesgenerator.GetRandomName(1),
-			Icon: "/emojis/flag.png",
-		})
-		require.NoError(t, err)
-
-		proxyClient := wsproxysdk.New(client.URL)
-		proxyClient.SetSessionToken(proxyRes.ProxyToken)
-
-		legacyRes, err := proxyClient.AgentIsLegacy(ctx, nodeID)
-		require.NoError(t, err)
-
-		assert.True(t, legacyRes.Found)
-		assert.False(t, legacyRes.Legacy)
-	})
-}