Remove Actor function

Emyrk · Emyrk · commit 82d10d9a13ed · 2023-04-17T10:54:23.000-05:00
diff --git a/coderd/authorize.go b/coderd/authorize.go
@@ -64,13 +64,8 @@ func (api *API) Authorize(r *http.Request, action rbac.Action, object rbac.Objec
 //		return
 //	}
 func (h *HTTPAuthorizer) Authorize(r *http.Request, action rbac.Action, object rbac.Objecter) bool {
-	authz, ok := httpmw.Actor(r)
-	if !ok {
-		// No authorization object.
-		return false
-	}
-
-	err := h.Authorizer.Authorize(r.Context(), authz.Actor, action, object.RBACObject())
+	roles := httpmw.UserAuthorization(r)
+	err := h.Authorizer.Authorize(r.Context(), roles.Actor, action, object.RBACObject())
 	if err != nil {
 		// Log the errors for debugging
 		internalError := new(rbac.UnauthorizedError)
@@ -81,10 +76,10 @@ func (h *HTTPAuthorizer) Authorize(r *http.Request, action rbac.Action, object r
 		// Log information for debugging. This will be very helpful
 		// in the early days
 		logger.Warn(r.Context(), "unauthorized",
-			slog.F("roles", authz.Actor.SafeRoleNames()),
-			slog.F("actor_id", authz.Actor.ID),
-			slog.F("actor_name", authz.ActorName),
-			slog.F("scope", authz.Actor.SafeScopeName()),
+			slog.F("roles", roles.Actor.SafeRoleNames()),
+			slog.F("actor_id", roles.Actor.ID),
+			slog.F("actor_name", roles.ActorName),
+			slog.F("scope", roles.Actor.SafeScopeName()),
 			slog.F("route", r.URL.Path),
 			slog.F("action", action),
 			slog.F("object", object),
diff --git a/coderd/httpmw/actor.go b/coderd/httpmw/actor.go
@@ -36,13 +36,3 @@ func RequireAPIKeyOrWorkspaceProxyAuth() func(http.Handler) http.Handler {
 	}
 }
 
-// Actor is a function that returns the request authorization. If the request is
-// unauthenticated, the second return value is false.
-func Actor(r *http.Request) (Authorization, bool) {
-	userAuthz, ok := UserAuthorizationOptional(r)
-	if ok {
-		return userAuthz, true
-	}
-
-	return Authorization{}, false
-}

Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,3 @@ func RequireAPIKeyOrWorkspaceProxyAuth() func(http.Handler) http.Handler {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`-// Actor is a function that returns the request authorization. If the request is`
`40`		`-// unauthenticated, the second return value is false.`
`41`		`-func Actor(r *http.Request) (Authorization, bool) {`
`42`		`- userAuthz, ok := UserAuthorizationOptional(r)`
`43`		`- if ok {`
`44`		`- return userAuthz, true`
`45`		`- }`
`46`		`-`
`47`		`- return Authorization{}, false`
`48`		`-}`