feat: link with protocol on shared ports (coder#12908)

f0ssel · web-flow · commit acaa25409958 · 2024-04-10T09:29:24.000-04:00
diff --git a/coderd/workspaceapps/apptest/apptest.go b/coderd/workspaceapps/apptest/apptest.go
@@ -1165,6 +1165,7 @@ func Run(t *testing.T, appHostIsPrimary bool, factory DeploymentFactory) {
 			appDetails := setupProxyTest(t, &DeploymentOptions{
 				ServeHTTPS: true,
 			})
+			// using the fact that Apps.Port and Apps.PortHTTPS are the same port here
 			port, err := strconv.ParseInt(appDetails.Apps.Port.AppSlugOrPort, 10, 32)
 			require.NoError(t, err)
 			_, err = appDetails.SDKClient.UpsertWorkspaceAgentPortShare(ctx, appDetails.Workspace.ID, codersdk.UpsertWorkspaceAgentPortShareRequest{
@@ -1178,7 +1179,7 @@ func Run(t *testing.T, appHostIsPrimary bool, factory DeploymentFactory) {
 			publicAppClient := appDetails.AppClient(t)
 			publicAppClient.SetSessionToken("")
 
-			resp, err := requestWithRetries(ctx, t, publicAppClient, http.MethodGet, appDetails.SubdomainAppURL(appDetails.Apps.Port).String(), nil)
+			resp, err := requestWithRetries(ctx, t, publicAppClient, http.MethodGet, appDetails.SubdomainAppURL(appDetails.Apps.PortHTTPS).String(), nil)
 			require.NoError(t, err)
 			defer resp.Body.Close()
 			require.Equal(t, http.StatusOK, resp.StatusCode)
diff --git a/coderd/workspaceapps/apptest/setup.go b/coderd/workspaceapps/apptest/setup.go
@@ -116,6 +116,7 @@ type Details struct {
 		Authenticated App
 		Public        App
 		Port          App
+		PortHTTPS     App
 	}
 }
 
@@ -247,6 +248,12 @@ func setupProxyTestWithFactory(t *testing.T, factory DeploymentFactory, opts *De
 		AgentName:     agnt.Name,
 		AppSlugOrPort: strconv.Itoa(int(opts.port)),
 	}
+	details.Apps.PortHTTPS = App{
+		Username:      me.Username,
+		WorkspaceName: workspace.Name,
+		AgentName:     agnt.Name,
+		AppSlugOrPort: strconv.Itoa(int(opts.port)) + "s",
+	}
 
 	return details
 }
diff --git a/coderd/workspaceapps/appurl/appurl.go b/coderd/workspaceapps/appurl/appurl.go
@@ -90,9 +90,10 @@ func (a ApplicationURL) Path() string {
 //
 // Subdomains should be in the form:
 //
-//		({PREFIX}---)?{PORT/APP_SLUG}--{AGENT_NAME}--{WORKSPACE_NAME}--{USERNAME}
+//		({PREFIX}---)?{PORT{s?}/APP_SLUG}--{AGENT_NAME}--{WORKSPACE_NAME}--{USERNAME}
 //		e.g.
 //	     https://8080--main--dev--dean.hi.c8s.io
+//	     https://8080s--main--dev--dean.hi.c8s.io
 //	     https://app--main--dev--dean.hi.c8s.io
 //	     https://prefix---8080--main--dev--dean.hi.c8s.io
 //	     https://prefix---app--main--dev--dean.hi.c8s.io
diff --git a/coderd/workspaceapps/request.go b/coderd/workspaceapps/request.go
@@ -350,10 +350,6 @@ func (r Request) getDatabase(ctx context.Context, db database.Store) (*databaseR
 			}
 			// No port share found, so we keep default to owner.
 		} else {
-			if ps.Protocol == database.PortShareProtocolHttps {
-				// Apply HTTPS protocol if specified.
-				appURL = fmt.Sprintf("https://127.0.0.1:%d", portUint)
-			}
 			appSharingLevel = ps.ShareLevel
 		}
 	} else {
diff --git a/site/src/modules/resources/PortForwardButton.tsx b/site/src/modules/resources/PortForwardButton.tsx
@@ -393,6 +393,7 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
                   agent.name,
                   workspaceName,
                   username,
+                  share.protocol === "https",
                 );
                 const label = share.port;
                 return (
diff --git a/site/src/utils/portForward.ts b/site/src/utils/portForward.ts
@@ -4,12 +4,12 @@ export const portForwardURL = (
   agentName: string,
   workspaceName: string,
   username: string,
+  https = false,
 ): string => {
   const { location } = window;
+  const suffix = https ? "s" : "";
 
-  const subdomain = `${
-    isNaN(port) ? 3000 : port
-  }--${agentName}--${workspaceName}--${username}`;
+  const subdomain = `${port}${suffix}--${agentName}--${workspaceName}--${username}`;
   return `${location.protocol}//${host}`.replace("*", subdomain);
 };
 

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ type Details struct {`
`116`	`116`	`Authenticated App`
`117`	`117`	`Public App`
`118`	`118`	`Port App`
	`119`	`+ PortHTTPS App`
`119`	`120`	`}`
`120`	`121`	`}`
`121`	`122`
`@@ -247,6 +248,12 @@ func setupProxyTestWithFactory(t testing.T, factory DeploymentFactory, opts De`
`247`	`248`	`AgentName: agnt.Name,`
`248`	`249`	`AppSlugOrPort: strconv.Itoa(int(opts.port)),`
`249`	`250`	`}`
	`251`	`+ details.Apps.PortHTTPS = App{`
	`252`	`+ Username: me.Username,`
	`253`	`+ WorkspaceName: workspace.Name,`
	`254`	`+ AgentName: agnt.Name,`
	`255`	`+ AppSlugOrPort: strconv.Itoa(int(opts.port)) + "s",`
	`256`	`+ }`
`250`	`257`
`251`	`258`	`return details`
`252`	`259`	`}`
Original file line number	Diff line number	Diff line change
`@@ -350,10 +350,6 @@ func (r Request) getDatabase(ctx context.Context, db database.Store) (*databaseR`
`350`	`350`	`}`
`351`	`351`	`// No port share found, so we keep default to owner.`
`352`	`352`	`} else {`
`353`		`- if ps.Protocol == database.PortShareProtocolHttps {`
`354`		`- // Apply HTTPS protocol if specified.`
`355`		`- appURL = fmt.Sprintf("https://127.0.0.1:%d", portUint)`
`356`		`- }`
`357`	`353`	`appSharingLevel = ps.ShareLevel`
`358`	`354`	`}`
`359`	`355`	`} else {`