Skip to content

Allowing tls config to be passed to sm login #596

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
tenthirtyam merged 2 commits into from
Nov 24, 2025
Merged

Allowing tls config to be passed to sm login #596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff1e28a
Allowing tls config to be passed to sm login
Nov 18, 2025
56c0ab6
Merge branch 'main' into sm-missingtlsconfig
IndulekhaPrathapan Nov 24, 2025
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
2 changes: 1 addition & 1 deletion internal/authctx/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func getUserAuthCtxHeaders(config *TanzuContext) func() (map[string]string, erro
username := config.SMUsername

return func() (map[string]string, error) {
return getSMUserAuthCtx(issuerURL, username, token)
return getSMUserAuthCtx(issuerURL, username, token, proxyConfig)
}
}

Expand Down
21 changes: 17 additions & 4 deletions internal/authctx/selfmanaged.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package authctx

import (
"context"
"crypto/tls"
"fmt"
"net/http"
"net/url"
Expand All @@ -16,6 +17,8 @@ import (
"go.pinniped.dev/pkg/oidcclient/pkce"
"go.pinniped.dev/pkg/oidcclient/state"
"golang.org/x/oauth2"

"github.com/vmware/terraform-provider-tanzu-mission-control/internal/client/proxy"
)

const (
Expand All @@ -35,18 +38,24 @@ const (

type smSession struct {
sharedOauthConfig *oauth2.Config
tlsConfig *tls.Config
issuerURL, username, password string
pkceCodePair pkce.Code
stateVal state.State
}

// todo: proxy support is not added for the self-managed flow. Add it when there is a requirement.
func getSMUserAuthCtx(pinnipedURL, uName, password string) (metadata map[string]string, err error) {
func getSMUserAuthCtx(pinnipedURL, uName, password string, config *proxy.TLSConfig) (metadata map[string]string, err error) {
if pinnipedURL == "" || uName == "" || password == "" {
return nil, errors.New("Invalid auth configuration for self_managed")
}

session, err := initSession(pinnipedURL, uName, password)
tlsConfig, err := proxy.GetConnectorTLSConfig(config)
if err != nil {
return nil, err
}

session, err := initSession(pinnipedURL, uName, password, tlsConfig)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -111,7 +120,7 @@ func getSMUserAuthCtx(pinnipedURL, uName, password string) (metadata map[string]
}

// todo: if slowness is experienced, then we can avoid re-initialising same values again.
func initSession(pinnipedURL, uName, password string) (*smSession, error) {
func initSession(pinnipedURL, uName, password string, config *tls.Config) (*smSession, error) {
// TMC Local Pinniped sample endpoint:
// https://pinniped-supervisor.*******.com/provider/pinniped
u := url.URL{
Expand All @@ -137,6 +146,7 @@ func initSession(pinnipedURL, uName, password string) (*smSession, error) {

session := &smSession{
sharedOauthConfig: sharedOauthConfig,
tlsConfig: config,
issuerURL: issuerURL,
username: uName,
password: password,
Expand Down Expand Up @@ -192,6 +202,9 @@ func (s *smSession) initiateAuthorizeRequestUnamePwd() (*url.URL, error) {

redirected := false
httpClient := &http.Client{
Transport: &http.Transport{
TLSClientConfig: s.tlsConfig,
},
CheckRedirect: func(r *http.Request, via []*http.Request) error {
redirected = true
return http.ErrUseLastResponse
Expand Down Expand Up @@ -230,7 +243,7 @@ func (s *smSession) getAuthCodeURL() string {
}

func refreshSMUserAuthCtx(config *TanzuContext) {
md, _ := getSMUserAuthCtx(config.VMWCloudEndPoint, config.SMUsername, config.Token)
md, _ := getSMUserAuthCtx(config.VMWCloudEndPoint, config.SMUsername, config.Token, config.TLSConfig)
for key, value := range md {
config.TMCConnection.Headers.Set(key, value)
}
Expand Down