pass taskID as parameter

Author: ChristopherHX

models/git/lfs_lock.go

@@ -69,9 +69,9 @@ func (l *LFSLock) LoadOwner(ctx context.Context) error {
 }
 
 // CreateLFSLock creates a new lock.
-func CreateLFSLock(ctx context.Context, repo *repo_model.Repository, lock *LFSLock) (*LFSLock, error) {
+func CreateLFSLock(ctx context.Context, repo *repo_model.Repository, lock *LFSLock, taskID int64) (*LFSLock, error) {
 	return db.WithTx2(ctx, func(ctx context.Context) (*LFSLock, error) {
-		if err := CheckLFSAccessForRepo(ctx, lock.OwnerID, repo, perm.AccessModeWrite); err != nil {
+		if err := CheckLFSAccessForRepo(ctx, lock.OwnerID, repo, perm.AccessModeWrite, taskID); err != nil {
 			return nil, err
 		}
 
@@ -158,14 +158,14 @@ func CountLFSLockByRepoID(ctx context.Context, repoID int64) (int64, error) {
 }
 
 // DeleteLFSLockByID deletes a lock by given ID.
-func DeleteLFSLockByID(ctx context.Context, id int64, repo *repo_model.Repository, u *user_model.User, force bool) (*LFSLock, error) {
+func DeleteLFSLockByID(ctx context.Context, id int64, repo *repo_model.Repository, u *user_model.User, force bool, taskID int64) (*LFSLock, error) {
 	return db.WithTx2(ctx, func(ctx context.Context) (*LFSLock, error) {
 		lock, err := GetLFSLockByID(ctx, id)
 		if err != nil {
 			return nil, err
 		}
 
-		if err := CheckLFSAccessForRepo(ctx, u.ID, repo, perm.AccessModeWrite); err != nil {
+		if err := CheckLFSAccessForRepo(ctx, u.ID, repo, perm.AccessModeWrite, taskID); err != nil {
 			return nil, err
 		}
 
@@ -182,13 +182,12 @@ func DeleteLFSLockByID(ctx context.Context, id int64, repo *repo_model.Repositor
 }
 
 // CheckLFSAccessForRepo check needed access mode base on action
-func CheckLFSAccessForRepo(ctx context.Context, ownerID int64, repo *repo_model.Repository, mode perm.AccessMode) error {
+func CheckLFSAccessForRepo(ctx context.Context, ownerID int64, repo *repo_model.Repository, mode perm.AccessMode, taskID int64) error {
 	if ownerID == 0 {
 		return ErrLFSUnauthorizedAction{repo.ID, "undefined", mode}
 	}
 	if ownerID == user_model.ActionsUserID {
-		taskID, ok := ctx.Value(access_model.ActionsTaskIDKey).(int64)
-		if !ok || taskID == 0 {
+		if taskID == 0 {
 			return ErrLFSUnauthorizedAction{repo.ID, user_model.ActionsUserName, mode}
 		}
 		perm, err := access_model.GetActionsUserRepoPermission(ctx, repo, user_model.NewActionsUser(), taskID)

models/perm/access/repo_permission.go

@@ -255,11 +255,6 @@ func finalProcessRepoUnitPermission(user *user_model.User, perm *Permission) {
 	}
 }
 
-type ActionsTaskIDKeyType struct{}
-
-// ActionsTaskIDKey is the context key for actions task ID in modules without context service like lfs locks
-var ActionsTaskIDKey ActionsTaskIDKeyType
-
 // GetActionsUserRepoPermission returns the actions user permissions to the repository
 func GetActionsUserRepoPermission(ctx context.Context, repo *repo_model.Repository, actionsUser *user_model.User, taskID int64) (perm Permission, err error) {
 	if actionsUser.ID != user_model.ActionsUserID {

routers/web/repo/setting/lfs.go

@@ -198,7 +198,7 @@ func LFSLockFile(ctx *context.Context) {
 	_, err := git_model.CreateLFSLock(ctx, ctx.Repo.Repository, &git_model.LFSLock{
 		Path:    lockPath,
 		OwnerID: ctx.Doer.ID,
-	})
+	}, 0)
 	if err != nil {
 		if git_model.IsErrLFSLockAlreadyExist(err) {
 			ctx.Flash.Error(ctx.Tr("repo.settings.lfs_lock_already_exists", originalPath))
@@ -217,7 +217,7 @@ func LFSUnlock(ctx *context.Context) {
 		ctx.NotFound(nil)
 		return
 	}
-	_, err := git_model.DeleteLFSLockByID(ctx, ctx.PathParamInt64("lid"), ctx.Repo.Repository, ctx.Doer, true)
+	_, err := git_model.DeleteLFSLockByID(ctx, ctx.PathParamInt64("lid"), ctx.Repo.Repository, ctx.Doer, true, 0)
 	if err != nil {
 		ctx.ServerError("LFSUnlock", err)
 		return

services/lfs/locks.go

@@ -4,14 +4,12 @@
 package lfs
 
 import (
-	go_context "context"
 	"net/http"
 	"strconv"
 	"strings"
 
 	auth_model "code.gitea.io/gitea/models/auth"
 	git_model "code.gitea.io/gitea/models/git"
-	access_model "code.gitea.io/gitea/models/perm/access"
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/json"
 	lfs_module "code.gitea.io/gitea/modules/lfs"
@@ -177,17 +175,16 @@ func PostLockHandler(ctx *context.Context) {
 		return
 	}
 
-	var lockCtx go_context.Context = ctx
+	var taskID int64
 	// Pass Actions Task ID in context if creating lock using Actions Job Token
 	if ctx.Data["IsActionsToken"] == true {
-		taskID := ctx.Data["ActionsTaskID"].(int64)
-		lockCtx = go_context.WithValue(lockCtx, access_model.ActionsTaskIDKey, taskID)
+		taskID = ctx.Data["ActionsTaskID"].(int64)
 	}
 
-	lock, err := git_model.CreateLFSLock(lockCtx, repository, &git_model.LFSLock{
+	lock, err := git_model.CreateLFSLock(ctx, repository, &git_model.LFSLock{
 		Path:    req.Path,
 		OwnerID: ctx.Doer.ID,
-	})
+	}, taskID)
 	if err != nil {
 		if git_model.IsErrLFSLockAlreadyExist(err) {
 			ctx.JSON(http.StatusConflict, api.LFSLockError{
@@ -324,14 +321,13 @@ func UnLockHandler(ctx *context.Context) {
 		return
 	}
 
-	var lockCtx go_context.Context = ctx
+	var taskID int64
 	// Pass Actions Task ID in context if deleting lock using Actions Job Token
 	if ctx.Data["IsActionsToken"] == true {
-		taskID := ctx.Data["ActionsTaskID"].(int64)
-		lockCtx = go_context.WithValue(lockCtx, access_model.ActionsTaskIDKey, taskID)
+		taskID = ctx.Data["ActionsTaskID"].(int64)
 	}
 
-	lock, err := git_model.DeleteLFSLockByID(lockCtx, ctx.PathParamInt64("lid"), repository, ctx.Doer, req.Force)
+	lock, err := git_model.DeleteLFSLockByID(ctx, ctx.PathParamInt64("lid"), repository, ctx.Doer, req.Force, taskID)
 	if err != nil {
 		if git_model.IsErrLFSUnauthorizedAction(err) {
 			ctx.Resp.Header().Set("WWW-Authenticate", `Basic realm="gitea-lfs"`)