Implement the saslStepper interface in SCRAM

Author: mhill-anynines

auth.go

@@ -277,7 +277,10 @@ func (socket *mongoSocket) loginSASL(cred Credential) error {
 		// SCRAM is handled with github.com/xdg-go/scram.
 		var method *scram.Method
 		method, err = scram.NewMethod(cred.Mechanism)
-		sasl = saslNewScram(method, cred)
+		if err != nil {
+			return err
+		}
+		sasl, err = scram.NewClient(method, cred.Username, cred.Password)
 	} else if len(cred.ServiceHost) > 0 {
 		sasl, err = saslNew(cred, cred.ServiceHost)
 	} else {
@@ -350,25 +353,6 @@ func (socket *mongoSocket) loginSASL(cred Credential) error {
 	return nil
 }
 
-func saslNewScram(method *scram.Method, cred Credential) *saslScram {
-	credsum := md5.New()
-	credsum.Write([]byte(cred.Username + ":mongo:" + cred.Password))
-	client := scram.NewClient(method, cred.Username, hex.EncodeToString(credsum.Sum(nil)))
-	return &saslScram{cred: cred, client: client}
-}
-
-type saslScram struct {
-	cred   Credential
-	client *scram.Client
-}
-
-func (s *saslScram) Close() {}
-
-func (s *saslScram) Step(serverData []byte) (clientData []byte, done bool, err error) {
-	more := s.client.Step(serverData)
-	return s.client.Out(), !more, s.client.Err()
-}
-
 func (socket *mongoSocket) loginRun(db string, query, result interface{}, f func() error) error {
 	var mutex sync.Mutex
 	var replyErr error

internal/scram/scram.go

@@ -31,7 +31,6 @@
 package scram
 
 import (
-	"bytes"
 	"errors"
 
 	xdg "github.com/xdg-go/scram"
@@ -59,8 +58,6 @@ import (
 //    }
 //
 type Client struct {
-	out  bytes.Buffer
-	err  error
 	conv *xdg.ClientConversation
 }
 
@@ -97,48 +94,38 @@ func NewMethod(methodString string) (*Method, error) {
 //
 //    method, _ := scram.NewMethod("SCRAM-SHA-1")
 //
-//    client := scram.NewClient(method, user, pass)
+//    client, _ := scram.NewClient(method, user, pass)
 //
-func NewClient(method *Method, user, pass string) *Client {
-	var client *xdg.Client
-	var err error
+func NewClient(method *Method, user, pass string) (client *Client, err error) {
+	var internalClient *xdg.Client
 
 	switch method.method {
 	case ScramSha1:
-		client, err = xdg.SHA1.NewClient(user, pass, "")
+		internalClient, err = xdg.SHA1.NewClient(user, pass, "")
 	case ScramSha256:
-		client, err = xdg.SHA256.NewClient(user, pass, "")
+		internalClient, err = xdg.SHA256.NewClient(user, pass, "")
 	}
 
-	c := &Client{
-		conv: client.NewConversation(),
-		err:  err,
+	client = &Client{
+		conv: internalClient.NewConversation(),
 	}
-	c.out.Grow(256)
-	return c
+	return
 }
 
-// Out returns the data to be sent to the server in the current step.
-func (c *Client) Out() []byte {
-	if c.out.Len() == 0 {
-		return []byte{}
-	}
-	return c.out.Bytes()
-}
-
-// Err returns the error that occurred, or nil if there were no errors.
-func (c *Client) Err() error {
-	return c.err
+// Implement saslStepper (auth.go)
+type saslStepper interface {
+	Step(serverData []byte) (clientData []byte, done bool, err error)
+	Close()
 }
 
-// Step processes the incoming data from the server and makes the
-// next round of data for the server available via Client.Out.
-// Step returns false if there are no errors and more data is
-// still expected.
-func (c *Client) Step(in []byte) bool {
+// Step progresses the underlying SASL SCRAM process
+func (c *Client) Step(serverData []byte) (clientData []byte, done bool, err error) {
 	var resp string
-	c.out.Reset()
-	resp, c.err = c.conv.Step(string(in))
-	_, c.err = c.out.Write([]byte(resp))
-	return c.conv.Valid() || c.err != nil
+	resp, err = c.conv.Step(string(serverData))
+	clientData = []byte(resp)
+	done = c.conv.Done()
+	return
 }
+
+// Close is a no opp to fit the saslStepper interface
+func (c *Client) Close() {}