feat: pass access_token to coder_git_auth resource (#6713)

This allows template authors to leverage git auth to perform custom actions, like clone repositories.
2026-09-24 15:04:27 +08:00 · 2023-03-22 19:37:08 +00:00
parent 79ae7cd639
commit df31636e72
20 changed files with 647 additions and 479 deletions
@@ -6,10 +6,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"net/url"
 	"strings"
 	"testing"
-	"time"

 	"github.com/coreos/go-oidc/v3/oidc"
 	"github.com/golang-jwt/jwt"
@@ -27,46 +25,6 @@ import (
 	"github.com/coder/coder/testutil"
 )

-type oauth2Config struct {
-	token *oauth2.Token
-}
-
-func (*oauth2Config) AuthCodeURL(state string, _ ...oauth2.AuthCodeOption) string {
-	return "/?state=" + url.QueryEscape(state)
-}
-
-func (o *oauth2Config) Exchange(context.Context, string, ...oauth2.AuthCodeOption) (*oauth2.Token, error) {
-	if o.token != nil {
-		return o.token, nil
-	}
-	return &oauth2.Token{
-		AccessToken:  "token",
-		RefreshToken: "refresh",
-		Expiry:       database.Now().Add(time.Hour),
-	}, nil
-}
-
-func (o *oauth2Config) TokenSource(context.Context, *oauth2.Token) oauth2.TokenSource {
-	return &oauth2TokenSource{
-		token: o.token,
-	}
-}
-
-type oauth2TokenSource struct {
-	token *oauth2.Token
-}
-
-func (o *oauth2TokenSource) Token() (*oauth2.Token, error) {
-	if o.token != nil {
-		return o.token, nil
-	}
-	return &oauth2.Token{
-		AccessToken:  "token",
-		RefreshToken: "refresh",
-		Expiry:       database.Now().Add(time.Hour),
-	}, nil
-}
-
 func TestUserAuthMethods(t *testing.T) {
 	t.Parallel()
 	t.Run("Password", func(t *testing.T) {
@@ -110,7 +68,7 @@ func TestUserOAuth2Github(t *testing.T) {
 		client := coderdtest.New(t, &coderdtest.Options{
 			Auditor: auditor,
 			GithubOAuth2Config: &coderd.GithubOAuth2Config{
-				OAuth2Config: &oauth2Config{},
+				OAuth2Config: &testutil.OAuth2Config{},
 				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
 					return []*github.Membership{{
 						State: &stateActive,
@@ -137,7 +95,7 @@ func TestUserOAuth2Github(t *testing.T) {
 			GithubOAuth2Config: &coderd.GithubOAuth2Config{
 				AllowOrganizations: []string{"coder"},
 				AllowTeams:         []coderd.GithubOAuth2Team{{"another", "something"}, {"coder", "frontend"}},
-				OAuth2Config:       &oauth2Config{},
+				OAuth2Config:       &testutil.OAuth2Config{},
 				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
 					return []*github.Membership{{
 						State: &stateActive,
@@ -171,7 +129,7 @@ func TestUserOAuth2Github(t *testing.T) {
 		client := coderdtest.New(t, &coderdtest.Options{
 			Auditor: auditor,
 			GithubOAuth2Config: &coderd.GithubOAuth2Config{
-				OAuth2Config:       &oauth2Config{},
+				OAuth2Config:       &testutil.OAuth2Config{},
 				AllowOrganizations: []string{"coder"},
 				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
 					return []*github.Membership{{
@@ -210,7 +168,7 @@ func TestUserOAuth2Github(t *testing.T) {
 		client := coderdtest.New(t, &coderdtest.Options{
 			Auditor: auditor,
 			GithubOAuth2Config: &coderd.GithubOAuth2Config{
-				OAuth2Config:       &oauth2Config{},
+				OAuth2Config:       &testutil.OAuth2Config{},
 				AllowOrganizations: []string{"coder"},
 				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
 					return []*github.Membership{{
@@ -247,7 +205,7 @@ func TestUserOAuth2Github(t *testing.T) {
 		client := coderdtest.New(t, &coderdtest.Options{
 			Auditor: auditor,
 			GithubOAuth2Config: &coderd.GithubOAuth2Config{
-				OAuth2Config:       &oauth2Config{},
+				OAuth2Config:       &testutil.OAuth2Config{},
 				AllowOrganizations: []string{"coder"},
 				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
 					return []*github.Membership{{
@@ -290,7 +248,7 @@ func TestUserOAuth2Github(t *testing.T) {
 		client := coderdtest.New(t, &coderdtest.Options{
 			Auditor: auditor,
 			GithubOAuth2Config: &coderd.GithubOAuth2Config{
-				OAuth2Config:       &oauth2Config{},
+				OAuth2Config:       &testutil.OAuth2Config{},
 				AllowOrganizations: []string{"coder"},
 				AllowSignups:       true,
 				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
@@ -343,7 +301,7 @@ func TestUserOAuth2Github(t *testing.T) {
 				AllowSignups:       true,
 				AllowOrganizations: []string{"coder"},
 				AllowTeams:         []coderd.GithubOAuth2Team{{"coder", "frontend"}},
-				OAuth2Config:       &oauth2Config{},
+				OAuth2Config:       &testutil.OAuth2Config{},
 				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
 					return []*github.Membership{{
 						State: &stateActive,
@@ -387,7 +345,7 @@ func TestUserOAuth2Github(t *testing.T) {
 				AllowSignups:       true,
 				AllowOrganizations: []string{"coder", "nil"},
 				AllowTeams:         []coderd.GithubOAuth2Team{{"coder", "backend"}},
-				OAuth2Config:       &oauth2Config{},
+				OAuth2Config:       &testutil.OAuth2Config{},
 				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
 					return []*github.Membership{
 						{
@@ -439,7 +397,7 @@ func TestUserOAuth2Github(t *testing.T) {
 				AllowSignups:       true,
 				AllowOrganizations: []string{"coder", "nil"},
 				AllowTeams:         []coderd.GithubOAuth2Team{{"nil", "null"}},
-				OAuth2Config:       &oauth2Config{},
+				OAuth2Config:       &testutil.OAuth2Config{},
 				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
 					return []*github.Membership{
 						{
@@ -490,7 +448,7 @@ func TestUserOAuth2Github(t *testing.T) {
 			GithubOAuth2Config: &coderd.GithubOAuth2Config{
 				AllowSignups:  true,
 				AllowEveryone: true,
-				OAuth2Config:  &oauth2Config{},
+				OAuth2Config:  &testutil.OAuth2Config{},
 				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
 					return []*github.Membership{}, nil
 				},
@@ -529,7 +487,7 @@ func TestUserOAuth2Github(t *testing.T) {
 				AllowSignups:       true,
 				AllowOrganizations: []string{"coder"},
 				AllowTeams:         []coderd.GithubOAuth2Team{{"coder", "frontend"}},
-				OAuth2Config:       &oauth2Config{},
+				OAuth2Config:       &testutil.OAuth2Config{},
 				ListOrganizationMemberships: func(ctx context.Context, client *http.Client) ([]*github.Membership, error) {
 					return []*github.Membership{{
 						State: &statePending,
@@ -830,7 +788,7 @@ func TestUserOIDC(t *testing.T) {
 		client := coderdtest.New(t, &coderdtest.Options{
 			Auditor: auditor,
 			OIDCConfig: &coderd.OIDCConfig{
-				OAuth2Config: &oauth2Config{},
+				OAuth2Config: &testutil.OAuth2Config{},
 			},
 		})
 		numLogs := len(auditor.AuditLogs)
@@ -854,8 +812,8 @@ func TestUserOIDC(t *testing.T) {
 		client := coderdtest.New(t, &coderdtest.Options{
 			Auditor: auditor,
 			OIDCConfig: &coderd.OIDCConfig{
-				OAuth2Config: &oauth2Config{
-					token: (&oauth2.Token{
+				OAuth2Config: &testutil.OAuth2Config{
+					Token: (&oauth2.Token{
 						AccessToken: "token",
 					}).WithExtra(map[string]interface{}{
 						"id_token": "invalid",