public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix enterprise runners misusing cached token (#314) 

Follow-up for #290
This commit is contained in:
Yusuke Kuoka 2021-02-16 12:56:52 +09:00 committed by GitHub
parent f1db6af1c5
commit 35d047db01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
github/fake/fake.go
View File

@ -102,6 +102,18 @@ func NewServer(opts ...Option) *httptest.Server {
Status: http.StatusBadRequest, Status: http.StatusBadRequest,
Body: "", Body: "",
}, },
"/enterprises/test/actions/runners/registration-token": &Handler{
Status: http.StatusCreated,
Body: fmt.Sprintf("{\"token\": \"%s\", \"expires_at\": \"%s\"}", RegistrationToken, time.Now().Add(time.Hour*1).Format(time.RFC3339)),
},
"/enterprises/invalid/actions/runners/registration-token": &Handler{
Status: http.StatusOK,
Body: fmt.Sprintf("{\"token\": \"%s\", \"expires_at\": \"%s\"}", RegistrationToken, time.Now().Add(time.Hour*1).Format(time.RFC3339)),
},
"/enterprises/error/actions/runners/registration-token": &Handler{
Status: http.StatusBadRequest,
Body: "",
},
// For ListRunners // For ListRunners
"/repos/test/valid/actions/runners": config.FixedResponses.ListRunners, "/repos/test/valid/actions/runners": config.FixedResponses.ListRunners,
@ -125,6 +137,18 @@ func NewServer(opts ...Option) *httptest.Server {
Status: http.StatusBadRequest, Status: http.StatusBadRequest,
Body: "", Body: "",
}, },
"/enterprises/test/actions/runners": &Handler{
Status: http.StatusOK,
Body: RunnersListBody,
},
"/enterprises/invalid/actions/runners": &Handler{
Status: http.StatusNoContent,
Body: "",
},
"/enterprises/error/actions/runners": &Handler{
Status: http.StatusBadRequest,
Body: "",
},
// For RemoveRunner // For RemoveRunner
"/repos/test/valid/actions/runners/1": &Handler{ "/repos/test/valid/actions/runners/1": &Handler{
@ -151,6 +175,18 @@ func NewServer(opts ...Option) *httptest.Server {
Status: http.StatusBadRequest, Status: http.StatusBadRequest,
Body: "", Body: "",
}, },
"/enterprises/test/actions/runners/1": &Handler{
Status: http.StatusNoContent,
Body: "",
},
"/enterprises/invalid/actions/runners/1": &Handler{
Status: http.StatusOK,
Body: "",
},
"/enterprises/error/actions/runners/1": &Handler{
Status: http.StatusBadRequest,
Body: "",
},
// For auto-scaling based on the number of queued(pending) workflow runs // For auto-scaling based on the number of queued(pending) workflow runs
"/repos/test/valid/actions/runs": config.FixedResponses.ListRepositoryWorkflowRuns, "/repos/test/valid/actions/runs": config.FixedResponses.ListRepositoryWorkflowRuns,

9
github/github.go
View File

@ -82,7 +82,7 @@ func (c *Client) GetRegistrationToken(ctx context.Context, enterprise, org, repo
c.mu.Lock() c.mu.Lock()
defer c.mu.Unlock() defer c.mu.Unlock()
key := getRegistrationKey(org, repo) key := getRegistrationKey(org, repo, enterprise)
rt, ok := c.regTokens[key] rt, ok := c.regTokens[key]
if ok && rt.GetExpiresAt().After(time.Now()) { if ok && rt.GetExpiresAt().After(time.Now()) {
@ -250,11 +250,8 @@ func getEnterpriseOrganisationAndRepo(enterprise, org, repo string) (string, str
return "", "", "", fmt.Errorf("enterprise, organization and repository are all empty") return "", "", "", fmt.Errorf("enterprise, organization and repository are all empty")
} }
func getRegistrationKey(org, repo string) string { func getRegistrationKey(org, repo, enterprise string) string {
if len(org) > 0 { return fmt.Sprintf("org=%s,repo=%s,enterprise=%s", org, repo, enterprise)
return org
}
return repo
} }
func splitOwnerAndRepo(repo string) (string, string, error) { func splitOwnerAndRepo(repo string) (string, string, error) {