public_git/actions-runner-controller
1
0
Fork 0
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git synced 2026-10-09 14:46:24 +02:00
Code Issues Projects Releases Wiki Activity

Fix URL for authenticating using a GitHub app (#2206)

Browse Source 
Co-authored-by: Nikola Jokic <jokicnikola07@gmail.com>
This commit is contained in:
Francesco Renzi
2023-01-24 18:02:23 +01:00
committed by GitHub
co-authored by Nikola Jokic
parent d57d17f161
commit c8918f5a7b
2 changed files with 80 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
github/actions/client.go
+32 -9
View File
@@ -842,23 +842,17 @@ type accessToken struct {
}
func (c *Client) fetchAccessToken(ctx context.Context, gitHubConfigURL string, creds *GitHubAppAuth) (*accessToken, error) {
parsedGitHubConfigURL, err := url.Parse(gitHubConfigURL)
if err != nil {
return nil, err
}
accessTokenJWT, err := createJWTForGitHubApp(creds)
if err != nil {
return nil, err
}
ru := fmt.Sprintf("%v://%v/app/installations/%v/access_tokens", parsedGitHubConfigURL.Scheme, parsedGitHubConfigURL.Host, creds.AppInstallationID)
accessTokenURL, err := url.Parse(ru)
u, err := githubAPIURL(gitHubConfigURL, fmt.Sprintf("/app/installations/%v/access_tokens", creds.AppInstallationID))
if err != nil {
return nil, err
}
req, err := http.NewRequestWithContext(ctx, http.MethodPost, accessTokenURL.String(), nil)
req, err := http.NewRequestWithContext(ctx, http.MethodPost, u, nil)
if err != nil {
return nil, err
}
@@ -867,7 +861,7 @@ func (c *Client) fetchAccessToken(ctx context.Context, gitHubConfigURL string, c
req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", accessTokenJWT))
req.Header.Add("User-Agent", c.userAgent)
c.logger.Info("getting access token for GitHub App auth", "accessTokenURL", accessTokenURL.String())
c.logger.Info("getting access token for GitHub App auth", "accessTokenURL", u)
resp, err := c.Do(req)
if err != nil {
@@ -1090,3 +1084,32 @@ func (c *Client) refreshTokenIfNeeded(ctx context.Context) error {
return nil
}
func githubAPIURL(configURL, path string) (string, error) {
u, err := url.Parse(configURL)
if err != nil {
return "", err
}
result := &url.URL{
Scheme: u.Scheme,
}
switch u.Host {
// Hosted
case "github.com", "github.localhost":
result.Host = fmt.Sprintf("api.%s", u.Host)
// re-routing www.github.com to api.github.com
case "www.github.com":
result.Host = "api.github.com"
// Enterprise
default:
result.Host = u.Host
result.Path = "/api/v3"
}
result.Path += path
return result.String(), nil
}