add mongo v5 SASL authentication support

Author: libi

.gitignore

@@ -1,2 +1,3 @@
 _harness
-.vscode
+.vscode
+.idea

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 
-go_import_path: github.com/globalsign/mgo
+go_import_path: github.com/libi/mgo
 
 go:
     - 1.9.x
@@ -33,7 +33,7 @@ install:
 
 before_script:
     - golint  ./... | grep -v 'ID' | cat
-    - go vet github.com/globalsign/mgo/bson github.com/globalsign/mgo/txn github.com/globalsign/mgo 
+    - go vet github.com/libi/mgo/bson github.com/libi/mgo/txn github.com/libi/mgo 
     - export NOIPV6=1
     - make startdb
 

auth.go

@@ -34,8 +34,8 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/globalsign/mgo/bson"
-	"github.com/globalsign/mgo/internal/scram"
+	"github.com/libi/mgo/bson"
+	"github.com/libi/mgo/internal/scram"
 )
 
 type authCmd struct {
@@ -77,6 +77,18 @@ type saslCmd struct {
 	Payload        []byte
 }
 
+type saslStartCmd struct {
+	Start     int    `bson:"saslStart,omitempty"`
+	Mechanism string `bson:"mechanism,omitempty"`
+	Payload   []byte
+}
+
+type saslContinueCmd struct {
+	Continue       int `bson:"saslContinue,omitempty"`
+	ConversationId int `bson:"conversationId,omitempty"`
+	Payload        []byte
+}
+
 type saslResult struct {
 	Ok    bool `bson:"ok"`
 	NotOk bool `bson:"code"` // Server <= 2.3.2 returns ok=1 & code>0 on errors (WTF?)
@@ -309,9 +321,30 @@ func (socket *mongoSocket) loginSASL(cred Credential) error {
 	lock(true)
 	defer lock(false)
 
-	start := 1
-	cmd := saslCmd{}
+	startStep, _, err := sasl.Step([]byte{})
+	if err != nil {
+		return err
+	}
+
+	lock(false)
 	res := saslResult{}
+	startCmd := saslStartCmd{
+		Start:     1,
+		Mechanism: cred.Mechanism,
+		Payload:   startStep,
+	}
+	err = socket.loginRun(cred.Source, &startCmd, &res, func() error {
+		// See the comment on lock for why this is necessary.
+		lock(true)
+		if !res.Ok || res.NotOk {
+			return fmt.Errorf("server returned error on SASL authentication step: %s", res.ErrMsg)
+		}
+		return nil
+	})
+	if err != nil {
+		return err
+	}
+	cmd := saslContinueCmd{}
 	for {
 		payload, done, err := sasl.Step(res.Payload)
 		if err != nil {
@@ -324,14 +357,11 @@ func (socket *mongoSocket) loginSASL(cred Credential) error {
 		}
 		lock(false)
 
-		cmd = saslCmd{
-			Start:          start,
-			Continue:       1 - start,
+		cmd = saslContinueCmd{
+			Continue:       1,
 			ConversationId: res.ConversationId,
-			Mechanism:      cred.Mechanism,
 			Payload:        payload,
 		}
-		start = 0
 		err = socket.loginRun(cred.Source, &cmd, &res, func() error {
 			// See the comment on lock for why this is necessary.
 			lock(true)

auth_test.go

@@ -39,7 +39,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/globalsign/mgo"
+	"github.com/libi/mgo"
 	. "gopkg.in/check.v1"
 )
 

bson/README.md

@@ -1,4 +1,4 @@
-[![GoDoc](https://godoc.org/github.com/globalsign/mgo/bson?status.svg)](https://godoc.org/github.com/globalsign/mgo/bson)
+[![GoDoc](https://godoc.org/github.com/libi/mgo/bson?status.svg)](https://godoc.org/github.com/libi/mgo/bson)
 
 An Implementation of BSON for Go
 --------------------------------

bson/bson_corpus_spec_test.go

@@ -12,7 +12,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/globalsign/mgo/internal/json"
+	"github.com/libi/mgo/internal/json"
 )
 
 func main() {
@@ -162,7 +162,7 @@ import (
 	"time"
 
 	. "gopkg.in/check.v1"
-    "github.com/globalsign/mgo/bson"
+    "github.com/libi/mgo/bson"
 )
 
 func testValid(c *C, in []byte, expected []byte, result interface{}) {

bson/bson_corpus_spec_test_generator.go

@@ -40,7 +40,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/globalsign/mgo/bson"
+	"github.com/libi/mgo/bson"
 	. "gopkg.in/check.v1"
 )
 

bson/bson_test.go

@@ -1,7 +1,7 @@
 package bson_test
 
 import (
-	"github.com/globalsign/mgo/bson"
+	"github.com/libi/mgo/bson"
 	. "gopkg.in/check.v1"
 )
 

bson/compatability_test.go

@@ -33,7 +33,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/globalsign/mgo/bson"
+	"github.com/libi/mgo/bson"
 
 	. "gopkg.in/check.v1"
 )