Merge branch 'master' into SNOW-1825790-token-cache

Author: sfc-gh-pfus

file_transfer_agent.go

@@ -44,8 +44,8 @@ const (
 	downloadCommand commandType = "DOWNLOAD"
 	unknownCommand  commandType = "UNKNOWN"
 
-	putRegexp string = `(?i)^(?:/\*.*\*/\s*)*put\s+`
-	getRegexp string = `(?i)^(?:/\*.*\*/\s*)*get\s+`
+	putRegexp string = `(?i)^(?:/\*.*\*/\s*)*\s*put\s+`
+	getRegexp string = `(?i)^(?:/\*.*\*/\s*)*\s*get\s+`
 )
 
 const (

file_transfer_agent_test.go

@@ -13,6 +13,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"regexp"
 	"strconv"
 	"strings"
 	"testing"
@@ -1004,3 +1005,59 @@ func testUploadDownloadOneFile(t *testing.T, isStream bool) {
 		t.Fatalf("failed to download file")
 	}
 }
+
+func TestPutGetRegexShouldIgnoreWhitespaceAtTheBeginning(t *testing.T) {
+	for _, test := range []struct {
+		regex string
+		query string
+	}{
+		{
+			regex: putRegexp,
+			query: "PUT abc",
+		},
+		{
+			regex: putRegexp,
+			query: "   PUT abc",
+		},
+		{
+			regex: putRegexp,
+			query: "\tPUT abc",
+		},
+		{
+			regex: putRegexp,
+			query: "\nPUT abc",
+		},
+		{
+			regex: putRegexp,
+			query: "\r\nPUT abc",
+		},
+		{
+			regex: getRegexp,
+			query: "GET abc",
+		},
+		{
+			regex: getRegexp,
+			query: "   GET abc",
+		},
+		{
+			regex: getRegexp,
+			query: "\tGET abc",
+		},
+		{
+			regex: getRegexp,
+			query: "\nGET abc",
+		},
+		{
+			regex: getRegexp,
+			query: "\r\nGET abc",
+		},
+	} {
+		{
+			t.Run(test.regex+" "+test.query, func(t *testing.T) {
+				regex := regexp.MustCompile(test.regex)
+				assertTrueE(t, regex.Match([]byte(test.query)))
+				assertFalseE(t, regex.Match([]byte("prefix "+test.query)))
+			})
+		}
+	}
+}

ocsp.go

@@ -670,6 +670,8 @@ func verifyPeerCertificate(ctx context.Context, verifiedChains [][]*x509.Certifi
 	for i := 0; i < len(verifiedChains); i++ {
 		// Certificate signed by Root CA. This should be one before the last in the Certificate Chain
 		numberOfNoneRootCerts := len(verifiedChains[i]) - 1
+		logger.Tracef("checking cert, %v, %v, isCa: %v, rawIssuer: %v, rawSubject: %v", i, numberOfNoneRootCerts, verifiedChains[i][numberOfNoneRootCerts].IsCA, string(verifiedChains[i][numberOfNoneRootCerts].RawIssuer), string(verifiedChains[i][numberOfNoneRootCerts].RawSubject))
+		logger.Tracef("checking cert, base64, rawIssuer: %v, rawSubject: %v", base64.StdEncoding.EncodeToString(verifiedChains[i][numberOfNoneRootCerts].RawIssuer), base64.StdEncoding.EncodeToString(verifiedChains[i][numberOfNoneRootCerts].RawSubject))
 		if !verifiedChains[i][numberOfNoneRootCerts].IsCA || string(verifiedChains[i][numberOfNoneRootCerts].RawIssuer) != string(verifiedChains[i][numberOfNoneRootCerts].RawSubject) {
 			// Check if the last Non Root Cert is also a CA or is self signed.
 			// if the last certificate is not, add it to the list