Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions .evergreen/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1715,7 +1715,7 @@ tasks:
- name: "testgcpkms-task"
commands:
- command: shell.exec
type: setup
type: test
params:
shell: "bash"
working_dir: src/go.mongodb.org/mongo-driver
Expand Down Expand Up @@ -1796,7 +1796,7 @@ tasks:
- name: "testazurekms-task"
commands:
- command: shell.exec
type: setup
type: test
params:
shell: "bash"
working_dir: src/go.mongodb.org/mongo-driver
Expand Down Expand Up @@ -1862,6 +1862,7 @@ tasks:
role_arn: ${LAMBDA_AWS_ROLE_ARN}
duration_seconds: 3600
- command: shell.exec
type: test
params:
working_dir: src/go.mongodb.org/mongo-driver
shell: bash
Expand All @@ -1884,6 +1885,7 @@ tasks:
- name: "oidc-auth-test-azure"
commands:
- command: shell.exec
type: test
params:
working_dir: src/go.mongodb.org/mongo-driver
shell: bash
Expand All @@ -1909,6 +1911,7 @@ tasks:
- name: "oidc-auth-test-gcp"
commands:
- command: shell.exec
type: test
params:
working_dir: src/go.mongodb.org/mongo-driver
shell: bash
Expand Down Expand Up @@ -2604,7 +2607,7 @@ buildvariants:
- name: testoidc-variant
display_name: "OIDC"
run_on:
- ubuntu2204-large
- ubuntu2204-small
expansions:
GO_DIST: "/opt/golang/go1.22"
tasks:
Expand Down
14 changes: 13 additions & 1 deletion mongo/options/clientoptions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1285,7 +1285,7 @@ func TestSetURIopts(t *testing.T) {
wantErrs: nil,
},
{
name: "tmp",
name: "oidc azure",
uri: "mongodb://example.com/?authMechanism=MONGODB-OIDC&authMechanismProperties=TOKEN_RESOURCE:mongodb://test-cluster,ENVIRONMENT:azureManagedIdentities",
wantopts: &ClientOptions{
Hosts: []string{"example.com"},
Expand All @@ -1296,6 +1296,18 @@ func TestSetURIopts(t *testing.T) {
},
wantErrs: nil,
},
{
name: "oidc gcp",
uri: "mongodb://test.mongodb.net/?authMechanism=MONGODB-OIDC&authMechanismProperties=ENVIRONMENT:gcp,TOKEN_RESOURCE:mongodb://test-cluster",
wantopts: &ClientOptions{
Hosts: []string{"test.mongodb.net"},
Auth: &Credential{AuthMechanism: "MONGODB-OIDC", AuthSource: "$external", AuthMechanismProperties: map[string]string{
"ENVIRONMENT": "gcp",
"TOKEN_RESOURCE": "mongodb://test-cluster"}},
HTTPClient: httputil.DefaultHTTPClient,
},
wantErrs: nil,
},
{
name: "comma in key:value pair causes error",
uri: "mongodb://example.com/?authMechanismProperties=TOKEN_RESOURCE:mongodb://host1%2Chost2",
Expand Down
4 changes: 4 additions & 0 deletions x/mongo/driver/connstring/connstring.go
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,10 @@ func (u *ConnString) setDefaultAuthParams(dbName string) error {
}
fallthrough
case "mongodb-aws", "mongodb-x509", "mongodb-oidc":
// dns.LookupTXT will get "authSource=admin" from Atlas hosts.
if u.AuthSource == "admin" {
u.AuthSource = "$external"
}
if u.AuthSource == "" {
u.AuthSource = "$external"
} else if u.AuthSource != "$external" {
Expand Down
22 changes: 22 additions & 0 deletions x/mongo/driver/connstring/connstring_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,28 @@ func TestAuthSource(t *testing.T) {
}
})
}

tests = []struct {
s string
expected string
err bool
}{
{s: "authMechanismProperties=ENVIRONMENT:gcp,TOKEN_RESOURCE:mongodb://test-cluster", expected: "$external"},
}

for _, test := range tests {
s := fmt.Sprintf("mongodb://test.mongodb.net/?authMechanism=MONGODB-OIDC&/%s", test.s)
t.Run(s, func(t *testing.T) {
cs, err := connstring.ParseAndValidate(s)
if test.err {
require.Error(t, err)
} else {
require.NoError(t, err)
require.Equal(t, test.expected, cs.AuthSource)
}
})
}

}

func TestConnect(t *testing.T) {
Expand Down
Loading