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

feat: Support Oauth2.0 via credential script - phase1 #3066

Merged
merged 2 commits into from
Jul 26, 2024
Merged

feat: Support Oauth2.0 via credential script - phase1 #3066

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
583a8fd
feat: Support Oauth2.0 via credential script - phase1
Hardikl Jul 25, 2024
32ede9b
feat: handled review comments
Hardikl Jul 26, 2024
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
14 changes: 13 additions & 1 deletion cmd/tools/rest/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ type Client struct {
Logger *logging.Logger
baseURL string
cluster Cluster
token string
Timeout time.Duration
logRest bool // used to log Rest request/response
auth *auth.Credentials
Expand Down Expand Up @@ -133,9 +134,13 @@ func (c *Client) GetRest(request string) ([]byte, error) {
if err != nil {
return nil, err
}
if pollerAuth.Username != "" {
if pollerAuth.AuthToken != "" {
c.request.Header.Set("Authorization", "Bearer "+pollerAuth.AuthToken)
c.Logger.Debug().Msg("Using authToken from credential script")
} else if pollerAuth.Username != "" {
c.request.SetBasicAuth(pollerAuth.Username, pollerAuth.Password)
}

// ensure that we can change body dynamically
c.request.GetBody = func() (io.ReadCloser, error) {
r := bytes.NewReader(c.buffer.Bytes())
Expand Down Expand Up @@ -253,6 +258,13 @@ func (c *Client) invokeWithAuthRetry() ([]byte, error) {
if err2 != nil {
return nil, err2
}
// If the credential script returns an authToken, use it without re-fetching
if pollerAuth.AuthToken != "" {
c.token = pollerAuth.AuthToken
c.request.Header.Set("Authorization", "Bearer "+c.token)
c.Logger.Debug().Msg("Using authToken from credential script")
return doInvoke()
}
c.request.SetBasicAuth(pollerAuth2.Username, pollerAuth2.Password)
return doInvoke()
}
Expand Down
13 changes: 7 additions & 6 deletions pkg/auth/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -451,15 +451,16 @@ func (c *Credentials) Transport(request *http.Request) (*http.Transport, error)
},
}
} else {
password := pollerAuth.Password
if pollerAuth.Username == "" {
return nil, errs.New(errs.ErrMissingParam, "username")
} else if password == "" {
return nil, errs.New(errs.ErrMissingParam, "password")
if !pollerAuth.HasCredentialScript {
if pollerAuth.Username == "" {
return nil, errs.New(errs.ErrMissingParam, "username")
} else if pollerAuth.Password == "" {
return nil, errs.New(errs.ErrMissingParam, "password")
}
}

if request != nil {
request.SetBasicAuth(pollerAuth.Username, password)
request.SetBasicAuth(pollerAuth.Username, pollerAuth.Password)
}
transport = &http.Transport{
Proxy: http.ProxyFromEnvironment,
Expand Down