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

fix client assertion not send through POST body #253

Merged
merged 2 commits into from
Dec 17, 2024
Merged

fix client assertion not send through POST body #253

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
ff4da5d
fix client assertion not send through POST body
duytiennguyen-okta Dec 16, 2024
52ccddf
update test
duytiennguyen-okta Dec 16, 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
5 changes: 1 addition & 4 deletions internal/m2mauth/m2mauth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"encoding/pem"
"errors"
"fmt"
"io"
"net/http"
"net/url"
"os"
Expand Down Expand Up @@ -224,16 +223,14 @@ func (m *M2MAuthentication) accessToken() (*okta.AccessToken, error) {
return nil, err
}

var tokenRequestBuff io.ReadWriter
query := url.Values{}
tokenRequestURL := fmt.Sprintf(okta.CustomAuthzV1TokenEndpointFormat, m.config.OrgDomain(), m.config.AuthzID())

query.Add("grant_type", "client_credentials")
query.Add("scope", m.config.CustomScope())
query.Add("client_assertion_type", "urn:ietf:params:oauth:client-assertion-type:jwt-bearer")
query.Add("client_assertion", clientAssertion)
tokenRequestURL += "?" + query.Encode()
req, err := http.NewRequest("POST", tokenRequestURL, tokenRequestBuff)
req, err := http.NewRequest("POST", tokenRequestURL, strings.NewReader(query.Encode()))
duytiennguyen-okta marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
return nil, err
}
Expand Down
18 changes: 14 additions & 4 deletions test/fixtures/vcr/TestM2MAuthAccessToken.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,30 @@ interactions:
proto: HTTP/1.1
proto_major: 1
proto_minor: 1
content_length: 0
content_length: 533
transfer_encoding: []
trailer: {}
host: test.dne-okta.com
remote_addr: ""
request_uri: ""
body: ""
form: {}
body: client_assertion=eyJhbGciOiJSUzI1NiIsImtpZCI6ImtpZC1yb2NrIn0.eyJhdWQiOiJodHRwczovL21tb25kcmFnb24tYXdzLWNsaS0wMC5va3RhcHJldmlldy5jb20vb2F1dGgyL2F1czh3MjNyMTNOdnlVd2xuMWQ3L3YxL3Rva2VuIiwiZXhwIjoxNzM0Mzg2ODc4LCJpYXQiOjE3MzQzODMyNzgsImlzcyI6IjBvYTZmdndhYTVVSExUckppMWQ3Iiwic3ViIjoiMG9hNmZ2d2FhNVVITFRySmkxZDcifQ.BBhbrh0J0s9Az0Pf49YND1zuKYOhGzgLNzlAssZjaF74yFlowFdkceBg2uGxUkzQ1nn4F1Z1VmrrUiIQs8Ogsg&client_assertion_type=urn%3Aietf%3Aparams%3Aoauth%3Aclient-assertion-type%3Ajwt-bearer&grant_type=client_credentials&scope=okta-m2m-access
form:
client_assertion:
- eyJhbGciOiJSUzI1NiIsImtpZCI6ImtpZC1yb2NrIn0.eyJhdWQiOiJodHRwczovL21tb25kcmFnb24tYXdzLWNsaS0wMC5va3RhcHJldmlldy5jb20vb2F1dGgyL2F1czh3MjNyMTNOdnlVd2xuMWQ3L3YxL3Rva2VuIiwiZXhwIjoxNzM0Mzg2ODc4LCJpYXQiOjE3MzQzODMyNzgsImlzcyI6IjBvYTZmdndhYTVVSExUckppMWQ3Iiwic3ViIjoiMG9hNmZ2d2FhNVVITFRySmkxZDcifQ.BBhbrh0J0s9Az0Pf49YND1zuKYOhGzgLNzlAssZjaF74yFlowFdkceBg2uGxUkzQ1nn4F1Z1VmrrUiIQs8Ogsg
client_assertion_type:
- urn:ietf:params:oauth:client-assertion-type:jwt-bearer
grant_type:
- client_credentials
scope:
- okta-m2m-access
headers:
Accept:
- application/json
Content-Type:
- application/x-www-form-urlencoded
url: https://test.dne-okta.com/oauth2/aus8w23r13NvyUwln1d7/v1/token?client_assertion=abc123&client_assertion_type=urn%3Aietf%3Aparams%3Aoauth%3Aclient-assertion-type%3Ajwt-bearer&grant_type=client_credentials&scope=okta-m2m-access
X-Okta-Aws-Cli-Operation:
- m2m
url: https://test.dne-okta.com/oauth2/aus8w23r13NvyUwln1d7/v1/token
method: POST
response:
proto: HTTP/2.0
Expand Down
Loading