clarify package context

Author: wxiaoguang

modules/context/package.go

@@ -12,6 +12,7 @@ import (
 	"code.gitea.io/gitea/models/perm"
 	"code.gitea.io/gitea/models/unit"
 	user_model "code.gitea.io/gitea/models/user"
+	mc "code.gitea.io/gitea/modules/cache"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/structs"
 )
@@ -23,8 +24,30 @@ type Package struct {
 	Descriptor *packages_model.PackageDescriptor
 }
 
-// PackageAssignmentWebAPI returns a middleware to handle Context.Package assignment
-func PackageAssignmentWebAPI() func(ctx *Context) {
+type packageAssignmentCtx struct {
+	*Base
+	Doer        *user_model.User
+	ContextUser *user_model.User
+}
+
+func PackageContexter() func(next http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
+			base, baseCleanUp := NewBaseContext(resp, req)
+			ctx := &Context{
+				Base:  base,
+				Cache: mc.GetCache(),
+			}
+			defer baseCleanUp()
+
+			ctx.Base.AppendContextValue(contextKey, ctx)
+			next.ServeHTTP(ctx.Resp, ctx.Req)
+		})
+	}
+}
+
+// PackageAssignmentWeb returns a middleware to handle Context.Package assignment
+func PackageAssignmentWeb() func(ctx *Context) {
 	return func(ctx *Context) {
 		errorFn := func(status int, title string, obj interface{}) {
 			err, ok := obj.(error)
@@ -37,23 +60,25 @@ func PackageAssignmentWebAPI() func(ctx *Context) {
 				ctx.ServerError(title, err)
 			}
 		}
-
-		ctx.Package = packageAssignment(ctx.Base, ctx.Doer, errorFn)
+		paCtx := &packageAssignmentCtx{Base: ctx.Base, Doer: ctx.Doer, ContextUser: ctx.ContextUser}
+		ctx.Package = packageAssignment(paCtx, errorFn)
 	}
 }
 
 // PackageAssignmentAPI returns a middleware to handle Context.Package assignment
 func PackageAssignmentAPI() func(ctx *APIContext) {
 	return func(ctx *APIContext) {
-		ctx.Package = packageAssignment(ctx.Base, ctx.Doer, ctx.Error)
+		paCtx := &packageAssignmentCtx{Base: ctx.Base, Doer: ctx.Doer, ContextUser: ctx.ContextUser}
+		ctx.Package = packageAssignment(paCtx, ctx.Error)
 	}
 }
 
-func packageAssignment(ctx *Base, doer *user_model.User, errCb func(int, string, interface{})) *Package {
-	pkg := &Package{}
-
+func packageAssignment(ctx *packageAssignmentCtx, errCb func(int, string, interface{})) *Package {
+	pkg := &Package{
+		Owner: ctx.ContextUser,
+	}
 	var err error
-	pkg.AccessMode, err = determineAccessMode(ctx, pkg, doer)
+	pkg.AccessMode, err = determineAccessMode(ctx.Base, pkg, ctx.Doer)
 	if err != nil {
 		errCb(http.StatusInternalServerError, "determineAccessMode", err)
 		return pkg

modules/web/handler.go

@@ -10,6 +10,7 @@ import (
 	"reflect"
 
 	"code.gitea.io/gitea/modules/context"
+	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/web/routing"
 )
 
@@ -78,7 +79,13 @@ func preCheckHandler(fn reflect.Value, argsIn []reflect.Value) {
 	}
 }
 
-func prepareHandleArgsIn(resp http.ResponseWriter, req *http.Request, fn reflect.Value) []reflect.Value {
+func prepareHandleArgsIn(resp http.ResponseWriter, req *http.Request, fn reflect.Value, fnInfo *routing.FuncInfo) []reflect.Value {
+	defer func() {
+		if err := recover(); err != nil {
+			log.Error("unable to prepare handler arguments for %s: %v", fnInfo.String(), err)
+			panic(err)
+		}
+	}()
 	isPreCheck := req == nil
 
 	argsIn := make([]reflect.Value, fn.Type().NumIn())
@@ -155,7 +162,7 @@ func toHandlerProvider(handler any) func(next http.Handler) http.Handler {
 			}
 
 			// prepare the arguments for the handler and do pre-check
-			argsIn := prepareHandleArgsIn(resp, req, fn)
+			argsIn := prepareHandleArgsIn(resp, req, fn, funcInfo)
 			if req == nil {
 				preCheckHandler(fn, argsIn)
 				return // it's doing pre-check, just return

routers/api/packages/api.go

@@ -98,6 +98,8 @@ func verifyAuth(r *web.Route, authMethods []auth.Method) {
 func CommonRoutes(ctx gocontext.Context) *web.Route {
 	r := web.NewRoute()
 
+	r.Use(context.PackageContexter())
+
 	verifyAuth(r, []auth.Method{
 		&auth.OAuth2{},
 		&auth.Basic{},
@@ -561,7 +563,7 @@ func CommonRoutes(ctx gocontext.Context) *web.Route {
 				})
 			})
 		}, reqPackageAccess(perm.AccessModeRead))
-	}, context_service.UserAssignmentWeb(), context.PackageAssignmentWebAPI())
+	}, context_service.UserAssignmentWeb(), context.PackageAssignmentWeb())
 
 	return r
 }
@@ -572,6 +574,8 @@ func CommonRoutes(ctx gocontext.Context) *web.Route {
 func ContainerRoutes(ctx gocontext.Context) *web.Route {
 	r := web.NewRoute()
 
+	r.Use(context.PackageContexter())
+
 	verifyAuth(r, []auth.Method{
 		&auth.Basic{},
 		&container.Auth{},
@@ -726,7 +730,7 @@ func ContainerRoutes(ctx gocontext.Context) *web.Route {
 
 			ctx.Status(http.StatusNotFound)
 		})
-	}, container.ReqContainerAccess, context_service.UserAssignmentWeb(), context.PackageAssignmentWebAPI(), reqPackageAccess(perm.AccessModeRead))
+	}, container.ReqContainerAccess, context_service.UserAssignmentWeb(), context.PackageAssignmentWeb(), reqPackageAccess(perm.AccessModeRead))
 
 	return r
 }

routers/web/web.go

@@ -814,7 +814,7 @@ func registerRoutes(m *web.Route) {
 						}, reqPackageAccess(perm.AccessModeWrite))
 					})
 				})
-			}, context.PackageAssignmentWebAPI(), reqPackageAccess(perm.AccessModeRead))
+			}, context.PackageAssignmentWeb(), reqPackageAccess(perm.AccessModeRead))
 		}
 
 		m.Group("/projects", func() {