-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Add support for Bearer token in action archive downloads #4321
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+19
−5
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1367,16 +1367,29 @@ private static string GetDownloadInfoLookupKey(Pipelines.ActionStep action) | |
| return $"{repositoryReference.Name}@{repositoryReference.Ref}"; | ||
| } | ||
|
|
||
| private AuthenticationHeaderValue CreateAuthHeader(string token) | ||
| private AuthenticationHeaderValue CreateAuthHeader(IExecutionContext executionContext, string downloadUrl, string token) | ||
| { | ||
| if (string.IsNullOrEmpty(token)) | ||
| { | ||
| return null; | ||
| } | ||
|
|
||
| var base64EncodingToken = Convert.ToBase64String(Encoding.UTF8.GetBytes($"x-access-token:{token}")); | ||
| HostContext.SecretMasker.AddValue(base64EncodingToken); | ||
| return new AuthenticationHeaderValue("Basic", base64EncodingToken); | ||
| if (executionContext.Global.Variables.GetBoolean(Constants.Runner.Features.UseBearerTokenForCodeload) == true && | ||
| Uri.TryCreate(downloadUrl, UriKind.Absolute, out var parsedUrl) && | ||
| !string.IsNullOrEmpty(parsedUrl?.Host) && | ||
| !string.IsNullOrEmpty(parsedUrl?.PathAndQuery) && | ||
| (parsedUrl.Host.StartsWith("codeload.", StringComparison.OrdinalIgnoreCase) || parsedUrl.PathAndQuery.StartsWith("/_codeload/", StringComparison.OrdinalIgnoreCase))) | ||
| { | ||
| Trace.Info("Using Bearer token for action archive download directly to codeload."); | ||
| return new AuthenticationHeaderValue("Bearer", token); | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. in case we are talking to codeload directly, pass |
||
| } | ||
| else | ||
| { | ||
| Trace.Info("Using Basic token for action archive download."); | ||
| var base64EncodingToken = Convert.ToBase64String(Encoding.UTF8.GetBytes($"x-access-token:{token}")); | ||
| HostContext.SecretMasker.AddValue(base64EncodingToken); | ||
| return new AuthenticationHeaderValue("Basic", base64EncodingToken); | ||
|
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the basic header works fine with codeload URL and api.github.com URL. |
||
| } | ||
|
TingluoHuang marked this conversation as resolved.
|
||
| } | ||
|
TingluoHuang marked this conversation as resolved.
|
||
|
|
||
| private async Task DownloadRepositoryArchive(IExecutionContext executionContext, string downloadUrl, string downloadAuthToken, string archiveFile) | ||
|
|
@@ -1401,7 +1414,7 @@ private async Task DownloadRepositoryArchive(IExecutionContext executionContext, | |
| using (var httpClientHandler = HostContext.CreateHttpClientHandler()) | ||
| using (var httpClient = new HttpClient(httpClientHandler)) | ||
| { | ||
| httpClient.DefaultRequestHeaders.Authorization = CreateAuthHeader(downloadAuthToken); | ||
| httpClient.DefaultRequestHeaders.Authorization = CreateAuthHeader(executionContext, downloadUrl, downloadAuthToken); | ||
|
|
||
| httpClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents); | ||
| using (var response = await httpClient.GetAsync(downloadUrl)) | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.