Ensure authsource defaults to dbname before admin

GODRIVER-486 Change-Id: Ie79cf08351b9f2bbbf1a4a47f548827ffee89cbf
mongodb · Jul 10, 2018 · 4503c54 · 4503c54
1 parent 88e57ff
commit 4503c54
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/core/connstring/connstring.go b/core/connstring/connstring.go
@@ -310,7 +310,10 @@ func (p *parser) setDefaultAuthParams(dbName string) error {
 		}
 	case "":
 		if p.AuthSource == "" {
-			p.AuthSource = "admin"
+			p.AuthSource = dbName
+			if p.AuthSource == "" {
+				p.AuthSource = "admin"
+			}
 		}
 	default:
 		return fmt.Errorf("invalid auth mechanism")

diff --git a/core/connstring/connstring_test.go b/core/connstring/connstring_test.go
@@ -66,6 +66,31 @@ func TestAuthMechanism(t *testing.T) {
 	}
 }
 
+func TestAuthSource(t *testing.T) {
+	tests := []struct {
+		s        string
+		expected string
+		err      bool
+	}{
+		{s: "foobar?authSource=bazqux", expected: "bazqux"},
+		{s: "foobar", expected: "foobar"},
+		{s: "", expected: "admin"},
+	}
+
+	for _, test := range tests {
+		s := fmt.Sprintf("mongodb://user:pass@localhost/%s", test.s)
+		t.Run(s, func(t *testing.T) {
+			cs, err := connstring.Parse(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) {
 	tests := []struct {
 		s        string