add tests s3cmd comments

refactor indentations

Author: enguer

handler.go

@@ -16,6 +16,7 @@ import (
 	v4 "github.com/aws/aws-sdk-go/aws/signer/v4"
 	log "github.com/sirupsen/logrus"
 )
+
 // - new less strict regexp in order to allow different region naming (compatibility with other providers)
 // - east-eu-1 => pass (aws style)
 // - gra => pass (ceph style)
@@ -227,12 +228,12 @@ func (h *Handler) buildUpstreamRequest(req *http.Request) (*http.Request, error)
 		return nil, err
 	}
 
-    // WORKAROUND S3CMD which dont use white space before the some commas in the authorization header
-    fakeAuthorizationStr := fakeReq.Header.Get("Authorization")
-    // Sanitize fakeReq to remove white spaces before the comma signature
-    authorizationStr :=  strings.Replace(req.Header["Authorization"][0],",Signature",", Signature",1)
-    // Sanitize fakeReq to remove white spaces before the comma signheaders
-    authorizationStr =  strings.Replace(authorizationStr,",SignedHeaders",", SignedHeaders",1)
+	// WORKAROUND S3CMD which dont use white space before the some commas in the authorization header
+	fakeAuthorizationStr := fakeReq.Header.Get("Authorization")
+	// Sanitize fakeReq to remove white spaces before the comma signature
+	authorizationStr := strings.Replace(req.Header["Authorization"][0], ",Signature", ", Signature", 1)
+	// Sanitize fakeReq to remove white spaces before the comma signheaders
+	authorizationStr = strings.Replace(authorizationStr, ",SignedHeaders", ", SignedHeaders", 1)
 
 	// Verify that the fake request and the incoming request have the same signature
 	// This ensures it was sent and signed by a client with correct AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY

handler_test.go

@@ -79,11 +79,11 @@ func verifySignature(w http.ResponseWriter, r *http.Request) {
 	signer.Sign(r, body, "s3", "eu-test-1", signTime)
 	expectedAuthorization := r.Header["Authorization"][0]
 
-    // WORKAROUND S3CMD who dont use white space before the comma in the authorization header
-    // Sanitize fakeReq to remove white spaces before the comma signature
-    receivedAuthorization =  strings.Replace(receivedAuthorization,",Signature",", Signature",1)
-    // Sanitize fakeReq to remove white spaces before the comma signheaders
-    receivedAuthorization =  strings.Replace(receivedAuthorization,",SignedHeaders",", SignedHeaders",1)
+	// WORKAROUND S3CMD who dont use white space before the comma in the authorization header
+	// Sanitize fakeReq to remove white spaces before the comma signature
+	receivedAuthorization = strings.Replace(receivedAuthorization, ",Signature", ", Signature", 1)
+	// Sanitize fakeReq to remove white spaces before the comma signheaders
+	receivedAuthorization = strings.Replace(receivedAuthorization, ",SignedHeaders", ", SignedHeaders", 1)
 
 	// verify signature
 	fmt.Fprintln(w, receivedAuthorization, expectedAuthorization)
@@ -154,10 +154,14 @@ func TestHandlerValidSignatureS3cmd(t *testing.T) {
 
 	req := httptest.NewRequest(http.MethodGet, "http://foobar.example.com", nil)
 	signRequest(req)
-	authorizationReq := req.Header.Get("Authorization");
-    authorizationReq =  strings.Replace(authorizationReq,", Signature",",Signature",1)
-    authorizationReq =  strings.Replace(authorizationReq,", SignedHeaders",",SignedHeaders",1)
-    req.Header.Set("Authorization",authorizationReq);
+	// get the generated signed authorization header in order to simulate the s3cmd syntax
+	authorizationReq := req.Header.Get("Authorization")
+	// simulating s3cmd syntax and remove the whites space after the comma of the Signature part
+	authorizationReq = strings.Replace(authorizationReq, ", Signature", ",Signature", 1)
+	// simulating s3cmd syntax and remove the whites space before the comma of the SignedHeaders part
+	authorizationReq = strings.Replace(authorizationReq, ", SignedHeaders", ",SignedHeaders", 1)
+	// push the edited authorization header
+	req.Header.Set("Authorization", authorizationReq)
 	resp := httptest.NewRecorder()
 	h.ServeHTTP(resp, req)
 	assert.Equal(t, 200, resp.Code)

main.go

@@ -100,10 +100,6 @@ func NewAwsS3ReverseProxy(opts Options) (*Handler, error) {
 	}
 	return handler, nil
 }
-//handle /health path
-func health(w http.ResponseWriter, req *http.Request){
-   fmt.Fprintf(w,"ok")
-}
 func main() {
 	opts := NewOptions()
 	handler, err := NewAwsS3ReverseProxy(opts)
@@ -139,8 +135,6 @@ func main() {
 	var wrappedHandler http.Handler = handler
 	if len(opts.MetricsListenAddr) > 0 && len(strings.Split(opts.MetricsListenAddr, ":")) == 2 {
 		metricsHandler := http.NewServeMux()
-		//add health on metrics http to serve k8s liveness
-        metricsHandler.HandleFunc("/health",health)
 		metricsHandler.Handle("/metrics", promhttp.Handler())
 
 		log.Infof("Listening for secure Prometheus metrics on %s", opts.MetricsListenAddr)