tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-21 04:45:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: generate token for task

Browse Source
This commit is contained in:
Jason Song 2022-10-31 14:45:39 +08:00
parent 30df383ca0
commit b4b22e78ad
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
models/bots/task.go
View File

@ -12,13 +12,17 @@ import (
"fmt" "fmt"
"io" "io"
auth_model "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/bots" "code.gitea.io/gitea/modules/bots"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
"code.gitea.io/gitea/modules/util"
runnerv1 "gitea.com/gitea/proto-go/runner/v1" runnerv1 "gitea.com/gitea/proto-go/runner/v1"
"xorm.io/builder" "xorm.io/builder"
gouuid "github.com/google/uuid"
"github.com/nektos/act/pkg/jobparser" "github.com/nektos/act/pkg/jobparser"
) )
@ -35,6 +39,11 @@ type Task struct {
Started timeutil.TimeStamp Started timeutil.TimeStamp
Stopped timeutil.TimeStamp Stopped timeutil.TimeStamp
Token string `xorm:"-"`
TokenHash string `xorm:"UNIQUE"` // sha256 of token
TokenSalt string
TokenLastEight string `xorm:"token_last_eight"`
LogFilename string // file name of log LogFilename string // file name of log
LogInStorage bool // read log from database or from storage LogInStorage bool // read log from database or from storage
LogLength int64 // lines count LogLength int64 // lines count
@ -139,6 +148,18 @@ func (task *Task) FullSteps() []*TaskStep {
return steps return steps
} }
func (task *Task) GenerateToken() error {
salt, err := util.CryptoRandomString(10)
if err != nil {
return err
}
task.TokenSalt = salt
task.Token = base.EncodeSha1(gouuid.New().String())
task.TokenHash = auth_model.HashToken(task.Token, task.TokenSalt)
task.TokenLastEight = task.Token[len(task.Token)-8:]
return nil
}
type LogIndexes []int64 type LogIndexes []int64
func (i *LogIndexes) FromDB(b []byte) error { func (i *LogIndexes) FromDB(b []byte) error {
@ -240,14 +261,17 @@ func CreateTaskForRunner(ctx context.Context, runner *Runner) (*Task, bool, erro
Started: now, Started: now,
Status: StatusRunning, Status: StatusRunning,
} }
if err := task.GenerateToken(); err != nil {
return nil, false, err
}
var wolkflowJob *jobparser.Job var workflowJob *jobparser.Job
if gots, err := jobparser.Parse(job.WorkflowPayload); err != nil { if gots, err := jobparser.Parse(job.WorkflowPayload); err != nil {
return nil, false, fmt.Errorf("parse workflow of job %d: %w", job.ID, err) return nil, false, fmt.Errorf("parse workflow of job %d: %w", job.ID, err)
} else if len(gots) != 1 { } else if len(gots) != 1 {
return nil, false, fmt.Errorf("workflow of job %d: not signle workflow", job.ID) return nil, false, fmt.Errorf("workflow of job %d: not signle workflow", job.ID)
} else { } else {
_, wolkflowJob = gots[0].Job() _, workflowJob = gots[0].Job()
} }
if _, err := e.Insert(task); err != nil { if _, err := e.Insert(task); err != nil {
@ -259,8 +283,8 @@ func CreateTaskForRunner(ctx context.Context, runner *Runner) (*Task, bool, erro
return nil, false, err return nil, false, err
} }
steps := make([]*TaskStep, len(wolkflowJob.Steps)) steps := make([]*TaskStep, len(workflowJob.Steps))
for i, v := range wolkflowJob.Steps { for i, v := range workflowJob.Steps {
steps[i] = &TaskStep{ steps[i] = &TaskStep{
Name: v.String(), Name: v.String(),
TaskID: task.ID, TaskID: task.ID,

11
routers/api/bots/runner/runner.go
View File

@ -294,16 +294,23 @@ func pickTask(ctx context.Context, runner *bots_model.Runner) (*runnerv1.Task, b
"ref_type": "", "ref_type": "",
"head_ref": "", "head_ref": "",
"base_ref": "", "base_ref": "",
"token": "", "token": t.Token,
"repository_owner": fmt.Sprint(t.Job.Run.Repo.OwnerName), "repository_owner": fmt.Sprint(t.Job.Run.Repo.OwnerName),
"retention_days": "", "retention_days": "",
}) })
secrets := getSecretsOfTask(ctx, t)
if _, ok := secrets["GITHUB_TOKEN"]; !ok {
secrets["GITHUB_TOKEN"] = t.Token
}
if _, ok := secrets["GITEA_TOKEN"]; !ok {
secrets["GITEA_TOKEN"] = t.Token
}
task := &runnerv1.Task{ task := &runnerv1.Task{
Id: t.ID, Id: t.ID,
WorkflowPayload: t.Job.WorkflowPayload, WorkflowPayload: t.Job.WorkflowPayload,
Context: taskContext, Context: taskContext,
Secrets: getSecretsOfTask(ctx, t), Secrets: secrets,
} }
return task, true, nil return task, true, nil
} }