Skip to content
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.

Sign up for GitHub

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

add token source for local run #36

Open
wants to merge 1 commit into
base: v2.0
Choose a base branch
from
Open

add token source for local run #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 34 additions & 5 deletions v2/internal/omclient/omclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,33 @@ import (
log "github.com/sirupsen/logrus"
"github.com/spf13/viper"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
"google.golang.org/api/idtoken"
"google.golang.org/protobuf/encoding/protojson"
)

type idTokenSource struct {
TokenSource oauth2.TokenSource
}

func (s *idTokenSource) Token() (*oauth2.Token, error) {
token, err := s.TokenSource.Token()
if err != nil {
return nil, err
}

idToken, ok := token.Extra("id_token").(string)
if !ok {
return nil, fmt.Errorf("token did not contain an id_token")
}

return &oauth2.Token{
AccessToken: idToken,
TokenType: "Bearer",
Expiry: token.Expiry,
}, nil
}

type RestfulOMGrpcClient struct {
Client *http.Client
Log *logrus.Logger
Expand Down Expand Up @@ -381,17 +404,23 @@ func (rc *RestfulOMGrpcClient) Post(ctx context.Context, url string, path string
// Create a TokenSource if none exists.
rc.tokenSource, err = idtoken.NewTokenSource(ctx, url)
if err != nil {
err = fmt.Errorf("Cloud Run service account authentication requires token source, but couldn't get one. Trying to continue without SA auth. idtoken.NewTokenSource: %w", err)
logger.Errorf("Cloud Run service account authentication requires token source, but couldn't get one. Trying to continue without SA auth. idtoken.NewTokenSource: %v", err)
}
}

// Retrieve an identity token. Will reuse tokens until refresh needed.
token, err := rc.tokenSource.Token()
} else {
gts, err := google.DefaultTokenSource(ctx)
if err != nil {
err = fmt.Errorf("Cloud Run service account authentication requires a token, but couldn't get one. Trying to continue without SA auth. TokenSource.Token: %w", err)
logger.Errorf("google.DefaultTokenSource failed %v", err)
}
token.SetAuthHeader(req)
rc.tokenSource = oauth2.ReuseTokenSource(nil, &idTokenSource{TokenSource: gts})
}
// Retrieve an identity token. Will reuse tokens until refresh needed.
token, err := rc.tokenSource.Token()
if err != nil {
logger.Errorf("Cloud Run service account authentication requires a token, but couldn't get one. Trying to continue without SA auth. TokenSource.Token: %v", err)
}
token.SetAuthHeader(req)

// Log all request headers if debug logging (slow)
if logrus.IsLevelEnabled(logrus.DebugLevel) {
Expand Down