From 833cf722ab7ad71289be1f254d2954f39ce1cc21 Mon Sep 17 00:00:00 2001 From: js6pak Date: Wed, 30 Aug 2023 08:25:34 +0200 Subject: [PATCH] Include the GITHUB_TOKEN/GITEA_TOKEN secret for fork pull requests (#26759) (#26806) Backport #26759 Co-authored-by: Jason Song (cherry picked from commit 54cc459ea811568ba1d049e6dce22159ac48ffa8) --- routers/api/actions/runner/utils.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/routers/api/actions/runner/utils.go b/routers/api/actions/runner/utils.go index 7c9171329e..784f36bd13 100644 --- a/routers/api/actions/runner/utils.go +++ b/routers/api/actions/runner/utils.go @@ -53,8 +53,12 @@ func pickTask(ctx context.Context, runner *actions_model.ActionRunner) (*runnerv func getSecretsOfTask(ctx context.Context, task *actions_model.ActionTask) map[string]string { secrets := map[string]string{} + + secrets["GITHUB_TOKEN"] = task.Token + secrets["GITEA_TOKEN"] = task.Token + if task.Job.Run.IsForkPullRequest { - // ignore secrets for fork pull request + // ignore secrets for fork pull request, except GITHUB_TOKEN and GITEA_TOKEN which are automatically generated. return secrets } @@ -78,13 +82,6 @@ func getSecretsOfTask(ctx context.Context, task *actions_model.ActionTask) map[s } } - if _, ok := secrets["GITHUB_TOKEN"]; !ok { - secrets["GITHUB_TOKEN"] = task.Token - } - if _, ok := secrets["GITEA_TOKEN"]; !ok { - secrets["GITEA_TOKEN"] = task.Token - } - return secrets }