Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Uh oh!
There was an error while loading. Please reload this page.
Changes from all commits
File filter
Filter by extension
Conversations
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
| 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); | ||
MemberAuthor 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); | ||
MemberAuthor 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.
Uh oh!There was an error while loading. Please reload this page. | ||
| } | ||
TingluoHuang marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| 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)) | ||
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.