Comments and import cleanup

Emyrk · Emyrk · commit 23d0a4c4da16 · 2023-04-06T10:33:37.000-05:00
diff --git a/enterprise/coderd/workspaceproxy.go b/enterprise/coderd/workspaceproxy.go
@@ -6,7 +6,6 @@ import (
 	"database/sql"
 	"fmt"
 	"net/http"
-	"net/http/httptest"
 	"net/url"
 	"strings"
 
@@ -257,16 +256,23 @@ func (api *API) issueSignedAppToken(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// HACK: the CreateToken code reads the session token from the request, but
-	// since the session token is in a header, we need to make a fake request.
+	// userReq is a http request from the user on the other side of the proxy.
+	// Although the workspace proxy is making this call, we want to use the user's
+	// authorization context to create the token.
 	//
-	// TODO(@dean): fix this hack. This could be fixed by providing the token as
-	// a param to CreateToken instead of the whole request.
-	fakeReq := httptest.NewRequest("GET", req.AppRequest.BasePath, nil)
-	fakeReq.Header.Set(codersdk.SessionTokenHeader, req.SessionToken)
+	// We can use the existing request context for all tracing/logging purposes.
+	// Any workspace proxy auth uses different context keys so we don't need to
+	// worry about that.
+	userReq, err := http.NewRequestWithContext(ctx, "GET", req.AppRequest.BasePath, nil)
+	if err != nil {
+		// This should never happen
+		httpapi.InternalServerError(rw, xerrors.Errorf("[DEV ERROR] new request: %w", err))
+		return
+	}
+	userReq.Header.Set(codersdk.SessionTokenHeader, req.SessionToken)
 
 	// Exchange the token.
-	token, tokenStr, ok := api.AGPL.WorkspaceAppsProvider.CreateToken(ctx, rw, fakeReq, req.AppRequest)
+	token, tokenStr, ok := api.AGPL.WorkspaceAppsProvider.CreateToken(ctx, rw, userReq, req.AppRequest)
 	if !ok {
 		return
 	}
diff --git a/enterprise/externalproxy/proxy.go b/enterprise/externalproxy/proxy.go
@@ -7,26 +7,18 @@ import (
 	"regexp"
 	"time"
 
+	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
-
-	"github.com/coder/coder/codersdk"
-
-	"github.com/coder/coder/buildinfo"
-
 	"github.com/prometheus/client_golang/prometheus"
-
 	"go.opentelemetry.io/otel/trace"
 
-	"github.com/coder/coder/coderd/tracing"
-
-	"github.com/go-chi/chi/v5"
-
-	"github.com/coder/coder/coderd/wsconncache"
-
-	"github.com/coder/coder/coderd/httpmw"
-
 	"cdr.dev/slog"
+	"github.com/coder/coder/buildinfo"
+	"github.com/coder/coder/coderd/httpmw"
+	"github.com/coder/coder/coderd/tracing"
 	"github.com/coder/coder/coderd/workspaceapps"
+	"github.com/coder/coder/coderd/wsconncache"
+	"github.com/coder/coder/codersdk"
 )
 
 type Options struct {
