Skip to content

Commit e6630e2

Browse files
ChristopherHXlunny
andcommitted
Use artifacts v4 jwt if available (#471)
Needs go-gitea/gitea#28885 to provide jwt if sent by server Could fix #459, but that has not been verified. Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> Reviewed-on: https://gitea.com/gitea/act_runner/pulls/471 Reviewed-by: delvh <dev.lh@web.de> Reviewed-by: Lunny Xiao <xiaolunwen@gmail.com> Co-authored-by: Christopher Homberger <christopher.homberger@web.de> Co-committed-by: Christopher Homberger <christopher.homberger@web.de>
1 parent f1f9142 commit e6630e2

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

internal/app/run/runner.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,12 @@ func (r *Runner) run(ctx context.Context, task *runnerv1.Task, reporter *report.
162162
preset.Token = t
163163
}
164164

165-
// use task token to action api token
166-
r.envs["ACTIONS_RUNTIME_TOKEN"] = preset.Token
165+
giteaRuntimeToken := taskContext["gitea_runtime_token"].GetStringValue()
166+
if giteaRuntimeToken == "" {
167+
// use task token to action api token for previous Gitea Server Versions
168+
giteaRuntimeToken = preset.Token
169+
}
170+
r.envs["ACTIONS_RUNTIME_TOKEN"] = giteaRuntimeToken
167171

168172
eventJSON, err := json.Marshal(preset.Event)
169173
if err != nil {

internal/pkg/report/reporter.go

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ func NewReporter(ctx context.Context, cancel context.CancelFunc, client client.C
4747
if v := task.Context.Fields["token"].GetStringValue(); v != "" {
4848
oldnew = append(oldnew, v, "***")
4949
}
50+
if v := task.Context.Fields["gitea_runtime_token"].GetStringValue(); v != "" {
51+
oldnew = append(oldnew, v, "***")
52+
}
5053
for _, v := range task.Secrets {
5154
oldnew = append(oldnew, v, "***")
5255
}

0 commit comments

Comments
 (0)