changes to integration test, changes to test proxy to toggle v4 auth

Author: nathanejohnson

adminapi_integration_test.go

@@ -153,14 +153,6 @@ func (is *IntegrationsSuite) Test05Bucket() {
 		Fix:          true,
 	})
 
-	// see if we can now get stats.
-
-	ui, err := is.aa.UserInfo(context.Background(), is.ic.Integration.TestUID, true)
-
-	is.NoError(err)
-	is.NotNil(ui.Stats)
-
-	is.T().Logf("%#v", ui)
 	bucketnames, err := is.aa.BucketList(context.Background(), "")
 	is.NoError(err, "Got error fetching bucket names")
 	is.T().Logf("bucket names: %#v\n", bucketnames)
@@ -184,6 +176,15 @@ func (is *IntegrationsSuite) Test05Bucket() {
 	bucketindresp, err := is.aa.BucketIndex(context.Background(), bireq)
 	is.NoError(err, "Got error from BucketIndex()")
 	is.T().Logf(spew.Sdump(bucketindresp))
+
+	// see if we can now get stats.
+
+	ui, err := is.aa.UserInfo(context.Background(), is.ic.Integration.TestUID, true)
+
+	is.NoError(err)
+	is.NotNil(ui.Stats)
+
+	is.T().Log(spew.Sdump(ui))
 }
 
 func (is *IntegrationsSuite) Test06Caps() {
@@ -362,9 +363,9 @@ func (is *IntegrationsSuite) writeRandomFile(path string, sizekb int) {
 }
 
 type RandoReader struct {
-	r          *rand.Rand
-	max        int64
-	read       int64
+	r    *rand.Rand
+	max  int64
+	read int64
 }
 
 func NewRandoReader(seed int64, bytes int64) *RandoReader {

testradosgwproxy/config/config.toml.example

@@ -3,6 +3,7 @@
     ServicePort = 8080
     Readtimeout = "120s"
     WriteTimeout = "120s"
+    UseV4Auth = false
 
 [rgw]
     ClientTimeout = "120s"

testradosgwproxy/main.go

@@ -87,7 +87,11 @@ func (p *proxy) director(req *http.Request) {
 	req.Host = target.Host
 	req.URL.Path = singleJoiningSlash(target.Path, req.URL.Path)
 	req.Header.Set("Host", target.Host)
-	_ = awsauth.SignS3(req, p.creds)
+	if p.cfg.Server.UseV4Auth {
+		_ = awsauth.Sign4(req, p.creds)
+	} else {
+		_ = awsauth.SignS3(req, p.creds)
+	}
 	if targetQuery == "" || req.URL.RawQuery == "" {
 		req.URL.RawQuery = targetQuery + req.URL.RawQuery
 	} else {
@@ -123,6 +127,7 @@ type serverConfig struct {
 	ServicePort  int
 	ReadTimeout  rgw.Duration
 	WriteTimeout rgw.Duration
+	UseV4Auth    bool
 }
 
 func init() {

user.go

@@ -64,7 +64,6 @@ type UserInfoResponse struct {
 	Stats *UserStats `json:"stats"`
 }
 
-
 //UserStats - statistics for a user
 type UserStats struct {
 	Size           int `json:"size"`