fixup! feat: add endpoint to get listening ports in agent

deansheather · deansheather · commit d4663fad33fb · 2022-09-29T12:01:45.000Z
diff --git a/agent/statsendpoint.go b/agent/statsendpoint.go
@@ -61,6 +61,10 @@ func (lp *listeningPortsHandler) getListeningPorts() ([]codersdk.ListeningPort,
 
 	ports := []codersdk.ListeningPort{}
 	for _, tab := range tabs {
+		if tab.LocalAddr.Port < uint16(codersdk.MinimumListeningPort) {
+			continue
+		}
+
 		ports = append(ports, codersdk.ListeningPort{
 			ProcessName: tab.Process.Name,
 			Network:     codersdk.ListeningPortNetworkTCP,
diff --git a/coderd/workspaceapps.go b/coderd/workspaceapps.go
@@ -466,14 +466,14 @@ func (api *API) proxyWorkspaceApplication(proxyApp proxyApplication, rw http.Res
 		return
 	}
 
-	// Verify that the port is allowed. See `codersdk.MinimumListeningPort` for
-	// more details.
+	// Verify that the port is allowed. See the docs above
+	// `codersdk.MinimumListeningPort` for more details.
 	port := appURL.Port()
 	if port != "" {
 		portInt, err := strconv.Atoi(port)
 		if err != nil {
-			httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-				Message: fmt.Sprintf("App URL %q has an invalid port %q. Named ports are currently not supported.", internalURL, port),
+			httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
+				Message: fmt.Sprintf("App URL %q has an invalid port %q.", internalURL, port),
 				Detail:  err.Error(),
 			})
 			return
diff --git a/coderd/workspaceapps_test.go b/coderd/workspaceapps_test.go
@@ -695,4 +695,23 @@ func TestWorkspaceAppsProxySubdomain(t *testing.T) {
 		defer resp.Body.Close()
 		require.Equal(t, http.StatusBadGateway, resp.StatusCode)
 	})
+
+	t.Run("ProxyPortMinimumError", func(t *testing.T) {
+		t.Parallel()
+
+		ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
+		defer cancel()
+
+		port := uint16(codersdk.MinimumListeningPort - 1)
+		resp, err := client.Request(ctx, http.MethodGet, proxyURL(t, port, "/", proxyTestAppQuery), nil)
+		require.NoError(t, err)
+		defer resp.Body.Close()
+
+		// Should have an error response.
+		require.Equal(t, http.StatusBadRequest, resp.StatusCode)
+		var resBody codersdk.Response
+		err = json.NewDecoder(resp.Body).Decode(&resBody)
+		require.NoError(t, err)
+		require.Contains(t, resBody.Message, "Coder reserves ports less than")
+	})
 }
diff --git a/codersdk/agentconn.go b/codersdk/agentconn.go
@@ -36,6 +36,10 @@ var (
 	// by the proxy applications endpoint. Coder consumes ports 1-4 at the
 	// moment, and we reserve some extra ports for future use. Port 9 and up are
 	// available for the user.
+	//
+	// This is not enforced in the CLI intentionally as we don't really care
+	// *that* much. The user could bypass this in the CLI by using SSH instead
+	// anyways.
 	MinimumListeningPort = 9
 )
 
