GODRIVER-3567 specify v2 in module

Author: prestonvasquez

internal/test/mongoaws/go.mod

@@ -4,12 +4,12 @@ go 1.23.1
 
 replace (
 	go.mongodb.org/mongo-driver/v2 => ../../../
-	go.mongodb.org/mongo-driver/v2/x/mongo/driver/auth/mongoaws => ../../../x/mongo/driver/auth/mongoaws
+	go.mongodb.org/mongo-driver/v2/x/mongo/driver/auth/mongoawsv2 => ../../../x/mongo/driver/auth/mongoawsv2
 )
 
 require (
 	go.mongodb.org/mongo-driver/v2 v2.3.4
-	go.mongodb.org/mongo-driver/v2/x/mongo/driver/auth/mongoaws v1.2.3
+	go.mongodb.org/mongo-driver/v2/x/mongo/driver/auth/mongoawsv2 v1.2.3
 )
 
 require (

internal/test/mongoaws/mongoaws_test.go

@@ -11,11 +11,11 @@ import (
 	"go.mongodb.org/mongo-driver/v2/mongo"
 	"go.mongodb.org/mongo-driver/v2/mongo/options"
 	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/auth"
-	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/auth/mongoaws"
+	"go.mongodb.org/mongo-driver/v2/x/mongo/driver/auth/mongoawsv2"
 )
 
 func TestMongoAWS(t *testing.T) {
-	auth.RegisterAuthenticatorFactory(auth.MongoDBAWS, mongoaws.NewAuthenticator)
+	auth.RegisterAuthenticatorFactory(auth.MongoDBAWS, mongoawsv2.NewAuthenticator)
 
 	uri := os.Getenv("MONGODB_URI")
 	ctx := context.Background()

x/mongo/driver/auth/mongoaws/go.mod x/mongo/driver/auth/mongoawsv2/go.modx/mongo/driver/auth/mongoaws/go.mod renamed to x/mongo/driver/auth/mongoawsv2/go.mod

@@ -1,4 +1,4 @@
-module go.mongodb.org/mongo-driver/v2/x/mongo/driver/auth/mongoaws
+module go.mongodb.org/mongo-driver/v2/x/mongo/driver/auth/mongoawsv2
 
 go 1.23
 

x/mongo/driver/auth/mongoaws/go.sum x/mongo/driver/auth/mongoawsv2/go.sumx/mongo/driver/auth/mongoaws/go.sum renamed to x/mongo/driver/auth/mongoawsv2/go.sum

@@ -1,13 +1,15 @@
-package mongoaws
+package mongoawsv2
 
 import (
 	"bytes"
 	"context"
 	"crypto/rand"
+	"crypto/sha256"
 	"encoding/base64"
+	"encoding/hex"
 	"errors"
 	"fmt"
-	"log"
+	"io"
 	"net/http"
 	"strings"
 	"time"
@@ -141,7 +143,6 @@ func getRegion(host string) (string, error) {
 // "client-final" payload containing the SigV4-signed STS GetCallerIdentity
 // request.
 func (client *awsSdkSaslClient) Next(ctx context.Context, challenge []byte) ([]byte, error) {
-	log.Println("challenge received")
 	if client.state != conversationStateServerFirst {
 		return nil, fmt.Errorf("invalid state: %v", client.state)
 	}
@@ -157,8 +158,6 @@ func (client *awsSdkSaslClient) Next(ctx context.Context, challenge []byte) ([]b
 		return nil, err
 	}
 
-	log.Printf("SASL h (sts host): %s", sm.Host)
-
 	// Check nonce prefix
 	if sm.Nonce.Subtype != 0x00 {
 		return nil, errors.New("server reply contained unexpected binary subtype")
@@ -173,13 +172,14 @@ func (client *awsSdkSaslClient) Next(ctx context.Context, challenge []byte) ([]b
 	}
 
 	currentTime := time.Now().UTC()
-	body := "Action=GetCallerIdentity&Version=2011-06-15"
+	//body := "Action=GetCallerIdentity&Version=2011-06-15"
+	body := strings.NewReader("Action=GetCallerIdentity&Version=2011-06-15")
 
 	// Create http.Request
-	req, _ := http.NewRequest("POST", "/", strings.NewReader(body))
+	req, _ := http.NewRequestWithContext(ctx, "POST", "/", body)
 	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 	req.Header.Set("Content-Length", "43")
-	req.URL.Scheme = "https"
+
 	req.Host = sm.Host
 	req.Header.Set("X-Amz-Date", currentTime.Format(amzDateFormat))
 
@@ -202,25 +202,22 @@ func (client *awsSdkSaslClient) Next(ctx context.Context, challenge []byte) ([]b
 		return nil, fmt.Errorf("failed to retrieve AWS credentials: %w", err)
 	}
 
-	log.Printf("SASL r (region): %s", region)
+	h := sha256.New()
+	_, _ = io.Copy(h, body)
+	payloadHash := hex.EncodeToString(h.Sum(nil))
 
 	// Create signer with credentials
-	err = client.signer.SignHTTP(ctx, creds, req, body, "sts", region, currentTime)
+	err = client.signer.SignHTTP(ctx, creds, req, payloadHash, "sts", region, currentTime)
 	if err != nil {
 		return nil, fmt.Errorf("failed to sign request: %w", err)
 	}
 
-	for k, v := range req.Header {
-		log.Printf("Header %q: %s", k, v)
-	}
-
 	// create message
 	// { a: Authorization, d: X-Amz-Date, t: X-Amz-Security-Token }
 	idx, msg := bsoncore.AppendDocumentStart(nil)
 	msg = bsoncore.AppendStringElement(msg, "a", req.Header.Get("Authorization"))
 	msg = bsoncore.AppendStringElement(msg, "d", req.Header.Get("X-Amz-Date"))
 	if tok := req.Header.Get("X-Amz-Security-Token"); tok != "" {
-		log.Println("token received")
 		msg = bsoncore.AppendStringElement(msg, "t", tok)
 	}
 	msg, _ = bsoncore.AppendDocumentEnd(msg, idx)