mirror of
https://code.forgejo.org/forgejo/runner.git
synced 2025-09-15 18:57:01 +00:00
fix: use a token to clone a URL when relevant
Refs https://codeberg.org/forgejo/forgejo/pulls/8808
This commit is contained in:
parent
96891ab314
commit
9bbfab5d47
2 changed files with 11 additions and 10 deletions
|
@ -213,3 +213,10 @@ func (ghc *GithubContext) SetBaseAndHeadRef() {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (ghc *GithubContext) GetToken(url string) string {
|
||||
if url != ghc.ServerURL {
|
||||
return ""
|
||||
}
|
||||
return ghc.Token
|
||||
}
|
||||
|
|
|
@ -109,16 +109,10 @@ func (sar *stepActionRemote) prepareActionExecutor() common.Executor {
|
|||
|
||||
actionDir := filepath.Join(sar.RunContext.ActionCacheDir(), sar.Step.UsesHash())
|
||||
gitClone := stepActionRemoteNewCloneExecutor(git.NewGitCloneExecutorInput{
|
||||
URL: sar.remoteAction.CloneURL(sar.RunContext.Config.DefaultActionInstance),
|
||||
Ref: sar.remoteAction.Ref,
|
||||
Dir: actionDir,
|
||||
Token: "", /*
|
||||
Shouldn't provide token when cloning actions,
|
||||
the token comes from the instance which triggered the task,
|
||||
however, it might be not the same instance which provides actions.
|
||||
For GitHub, they are the same, always github.com.
|
||||
But for Gitea, tasks triggered by a.com can clone actions from b.com.
|
||||
*/
|
||||
URL: sar.remoteAction.CloneURL(sar.RunContext.Config.DefaultActionInstance),
|
||||
Ref: sar.remoteAction.Ref,
|
||||
Dir: actionDir,
|
||||
Token: github.GetToken(sar.remoteAction.URL),
|
||||
OfflineMode: sar.RunContext.Config.ActionOfflineMode,
|
||||
|
||||
InsecureSkipTLS: sar.cloneSkipTLS(), // For Gitea
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue