Skip to content

apply gateway-url config and fallback in ensureToken #11

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

Merged
merged 1 commit into from
Jul 12, 2023
Merged

apply gateway-url config and fallback in ensureToken #11

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
15 changes: 11 additions & 4 deletions cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ func Execute() {
func ensureToken(ctx context.Context, signals chan os.Signal) (context.Context, error) {
// shortcut if we already have a token set
if viper.GetString("token") != "" {
log.WithContext(ctx).Debug("using provided token for authentication")
token := viper.GetString("token")
if strings.HasPrefix(token, "ovm_api_") {
// exchange api token for JWT
Expand All @@ -66,6 +67,7 @@ func ensureToken(ctx context.Context, signals chan os.Signal) (context.Context,
if err != nil {
return ctx, fmt.Errorf("error authenticating the API token: %w", err)
}
log.WithContext(ctx).Debug("successfully authenticated")
token = resp.Msg.AccessToken
} else {
return ctx, errors.New("token does not match pattern 'ovm_api_*'")
Expand All @@ -74,13 +76,18 @@ func ensureToken(ctx context.Context, signals chan os.Signal) (context.Context,
}

// Check to see if the URL is secure
gatewayURL, err := url.Parse(viper.GetString("url"))
gatewayUrl := viper.GetString("gateway-url")
if gatewayUrl == "" {
gatewayUrl = fmt.Sprintf("%v/api/gateway", viper.GetString("url"))
viper.Set("gateway-url", gatewayUrl)
}
parsed, err := url.Parse(gatewayUrl)
if err != nil {
log.WithContext(ctx).WithError(err).Error("Failed to parse --url")
return ctx, err
return ctx, fmt.Errorf("error parsing --gateway-url: %w", err)
}

if gatewayURL.Scheme == "wss" || gatewayURL.Scheme == "https" || gatewayURL.Hostname() == "localhost" {
if parsed.Scheme == "wss" || parsed.Scheme == "https" || parsed.Hostname() == "localhost" {
// Authenticate using the oauth resource owner password flow
config := oauth2.Config{
ClientID: viper.GetString("auth0-client-id"),
Expand Down Expand Up @@ -168,7 +175,7 @@ func ensureToken(ctx context.Context, signals chan os.Signal) (context.Context,
// Set the token
return context.WithValue(ctx, sdp.UserTokenContextKey{}, token.AccessToken), nil
}
return ctx, fmt.Errorf("no token configured and target URL (%v) is insecure", gatewayURL)
return ctx, fmt.Errorf("no token configured and target URL (%v) is insecure", parsed)
}

func init() {
Expand Down