Handle ports as app names

Emyrk · Emyrk · commit 3e30cddefd4c · 2022-08-29T14:23:50.000-04:00
diff --git a/coderd/coderd.go b/coderd/coderd.go
@@ -131,7 +131,13 @@ func New(options *Options) *API {
 			})
 		},
 		httpmw.Prometheus(options.PrometheusRegistry),
-		api.handleSubdomain,
+		// Handle all subdomain requests
+		api.handleSubdomain(
+			httpmw.RateLimitPerMinute(options.APIRateLimit),
+			httpmw.ExtractAPIKey(options.Database, oauthConfigs, false),
+			httpmw.ExtractUserParam(api.Database),
+			httpmw.ExtractWorkspaceAndAgentParam(api.Database),
+		),
 	)
 
 	apps := func(r chi.Router) {
diff --git a/coderd/subdomain.go b/coderd/subdomain.go
@@ -1,16 +1,14 @@
 package coderd
 
 import (
-	"database/sql"
 	"fmt"
 	"net/http"
 	"regexp"
 	"strings"
 
-	"github.com/coder/coder/coderd/httpapi"
-	"github.com/coder/coder/codersdk"
+	"github.com/coder/coder/coderd/httpmw"
 
-	"github.com/coder/coder/coderd/database"
+	"github.com/go-chi/chi/v5"
 
 	"golang.org/x/xerrors"
 )
@@ -34,56 +32,42 @@ type Application struct {
 	Domain string
 }
 
-func (api *API) handleSubdomain(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
-		ctx := r.Context()
-		app, err := ParseSubdomainAppURL(r)
-		if err != nil {
-			// Not a Dev URL, proceed as usual.
-			// TODO: @emyrk we should probably catch invalid subdomains. Meaning
-			// 	an invalid devurl should not route to the coderd.
-			next.ServeHTTP(rw, r)
-			return
-		}
-
-		user, err := api.Database.GetUserByEmailOrUsername(ctx, database.GetUserByEmailOrUsernameParams{
-			Username: app.Username,
-		})
-		if err != nil {
-			if xerrors.Is(err, sql.ErrNoRows) {
-				httpapi.ResourceNotFound(rw)
+func (api *API) handleSubdomain(middlewares ...func(http.Handler) http.Handler) func(http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+			ctx := r.Context()
+			app, err := ParseSubdomainAppURL(r)
+
+			if err != nil {
+				// Not a Dev URL, proceed as usual.
+				// TODO: @emyrk we should probably catch invalid subdomains. Meaning
+				// 	an invalid devurl should not route to the coderd.
+				next.ServeHTTP(rw, r)
 				return
 			}
-			httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
-				Message: "Internal error fetching user.",
-				Detail:  err.Error(),
-			})
-			return
-		}
-
-		workspace, err := api.Database.GetWorkspaceByOwnerIDAndName(ctx, database.GetWorkspaceByOwnerIDAndNameParams{
-			OwnerID: user.ID,
-			Name:    app.WorkspaceName,
-		})
-		if err != nil {
-			if xerrors.Is(err, sql.ErrNoRows) {
-				httpapi.ResourceNotFound(rw)
-				return
+
+			workspaceAgentKey := app.WorkspaceName
+			if app.Agent != "" {
+				workspaceAgentKey += "." + app.Agent
 			}
-			httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
-				Message: "Internal error fetching workspace.",
-				Detail:  err.Error(),
-			})
-			return
-		}
-
-		api.proxyWorkspaceApplication(proxyApplication{
-			Workspace: workspace,
-			// TODO: Fetch workspace agent
-			Agent:   database.WorkspaceAgent{},
-			AppName: app.AppName,
-		}, rw, r)
-	})
+			chiCtx := chi.RouteContext(ctx)
+			chiCtx.URLParams.Add("workspace_and_agent", workspaceAgentKey)
+			chiCtx.URLParams.Add("user", app.Username)
+
+			// Use the passed in app middlewares before passing to the proxy app.
+			mws := chi.Middlewares(middlewares)
+			mws.Handler(http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+				workspace := httpmw.WorkspaceParam(r)
+				agent := httpmw.WorkspaceAgentParam(r)
+
+				api.proxyWorkspaceApplication(proxyApplication{
+					Workspace: workspace,
+					Agent:     agent,
+					AppName:   app.AppName,
+				}, rw, r)
+			})).ServeHTTP(rw, r.WithContext(ctx))
+		})
+	}
 }
 
 var (
diff --git a/coderd/subdomain_test.go b/coderd/subdomain_test.go
@@ -44,7 +44,7 @@ func TestParseSubdomainAppURL(t *testing.T) {
 				AppName:       "app",
 				WorkspaceName: "workspace",
 				Agent:         "",
-				User:          "user",
+				Username:      "user",
 				Path:          "",
 				Domain:        "coder.com",
 			},
@@ -57,7 +57,7 @@ func TestParseSubdomainAppURL(t *testing.T) {
 				AppName:       "8080",
 				WorkspaceName: "workspace",
 				Agent:         "",
-				User:          "user",
+				Username:      "user",
 				Path:          "",
 				Domain:        "coder.com",
 			},
@@ -70,7 +70,7 @@ func TestParseSubdomainAppURL(t *testing.T) {
 				AppName:       "app",
 				WorkspaceName: "workspace",
 				Agent:         "agent",
-				User:          "user",
+				Username:      "user",
 				Path:          "",
 				Domain:        "coder.com",
 			},
@@ -83,7 +83,20 @@ func TestParseSubdomainAppURL(t *testing.T) {
 				AppName:       "8080",
 				WorkspaceName: "workspace",
 				Agent:         "agent",
-				User:          "user",
+				Username:      "user",
+				Path:          "",
+				Domain:        "coder.com",
+			},
+		},
+		{
+			Name: "HyphenatedNames",
+			URL:  "https://admin-user--workspace-thing--agent-thing--app-name.coder.com",
+			Expected: coderd.Application{
+				AppURL:        "",
+				AppName:       "app-name",
+				WorkspaceName: "workspace-thing",
+				Agent:         "agent-thing",
+				Username:      "admin-user",
 				Path:          "",
 				Domain:        "coder.com",
 			},
diff --git a/coderd/workspaceapps.go b/coderd/workspaceapps.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 	"net/http/httputil"
 	"net/url"
+	"strconv"
 	"strings"
 
 	"github.com/coder/coder/coderd/database"
@@ -51,34 +52,43 @@ func (api *API) proxyWorkspaceApplication(proxyApp proxyApplication, rw http.Res
 		return
 	}
 
-	app, err := api.Database.GetWorkspaceAppByAgentIDAndName(r.Context(), database.GetWorkspaceAppByAgentIDAndNameParams{
-		AgentID: proxyApp.Agent.ID,
-		Name:    proxyApp.AppName,
-	})
-	if errors.Is(err, sql.ErrNoRows) {
-		httpapi.Write(rw, http.StatusNotFound, codersdk.Response{
-			Message: "Application not found.",
-		})
-		return
-	}
-	if err != nil {
-		httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Internal error fetching workspace application.",
-			Detail:  err.Error(),
-		})
-		return
-	}
-	if !app.Url.Valid {
-		httpapi.Write(rw, http.StatusBadRequest, codersdk.Response{
-			Message: fmt.Sprintf("Application %s does not have a url.", app.Name),
+	var internalURL string
+
+	num, err := strconv.Atoi(proxyApp.AppName)
+	if err == nil && num <= 65535 {
+		// TODO: @emyrk we should probably allow changing the schema?
+		internalURL = "http://localhost:" + proxyApp.AppName
+	} else {
+		app, err := api.Database.GetWorkspaceAppByAgentIDAndName(r.Context(), database.GetWorkspaceAppByAgentIDAndNameParams{
+			AgentID: proxyApp.Agent.ID,
+			Name:    proxyApp.AppName,
 		})
-		return
+		if errors.Is(err, sql.ErrNoRows) {
+			httpapi.Write(rw, http.StatusNotFound, codersdk.Response{
+				Message: "Application not found.",
+			})
+			return
+		}
+		if err != nil {
+			httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
+				Message: "Internal error fetching workspace application.",
+				Detail:  err.Error(),
+			})
+			return
+		}
+		if !app.Url.Valid {
+			httpapi.Write(rw, http.StatusBadRequest, codersdk.Response{
+				Message: fmt.Sprintf("Application %s does not have a url.", app.Name),
+			})
+			return
+		}
+		internalURL = app.Url.String
 	}
 
-	appURL, err := url.Parse(app.Url.String)
+	appURL, err := url.Parse(internalURL)
 	if err != nil {
 		httpapi.Write(rw, http.StatusInternalServerError, codersdk.Response{
-			Message: fmt.Sprintf("App url %q must be a valid url.", app.Url.String),
+			Message: fmt.Sprintf("App url %q must be a valid url.", internalURL),
 			Detail:  err.Error(),
 		})
 		return
