log: Dump signature request properly. (#4063)

Currently percent encoded strings are not properly encoded.

`s3%!!(MISSING)A(MISSING)`

Print properly as json encoded.

`s3%3AObjectCreated%3A%2A`
This commit is contained in:
Harshavardhana
2017-04-07 14:37:32 -07:00
committed by GitHub
parent 60ea2b17ba
commit f44f2e341c
2 changed files with 51 additions and 6 deletions
+43
View File
@@ -17,12 +17,14 @@
package cmd
import (
"encoding/json"
"fmt"
"net"
"net/http"
"net/url"
"reflect"
"runtime"
"strings"
"testing"
)
@@ -413,3 +415,44 @@ func TestCheckURL(t *testing.T) {
}
}
}
// Testing dumping request function.
func TestDumpRequest(t *testing.T) {
req, err := http.NewRequest("GET", "http://localhost:9000?prefix=Hello%2AWorld%2A", nil)
if err != nil {
t.Fatal(err)
}
req.Header.Set("content-md5", "====test")
jsonReq := dumpRequest(req)
type jsonResult struct {
Method string `json:"method"`
Path string `json:"path"`
Query string `json:"query"`
Header http.Header `json:"header"`
}
jsonReq = strings.Replace(jsonReq, "%%", "%", -1)
res := jsonResult{}
if err = json.Unmarshal([]byte(jsonReq), &res); err != nil {
t.Fatal(err)
}
// Look for expected method.
if res.Method != "GET" {
t.Fatalf("Unexpected method %s, expected 'GET'", res.Method)
}
// Look for expected query values
expectedQuery := url.Values{}
expectedQuery.Set("prefix", "Hello*World*")
if !reflect.DeepEqual(res.Query, expectedQuery.Encode()) {
t.Fatalf("Expected %#v, got %#v", expectedQuery, res.Query)
}
// Look for expected header.
expectedHeader := http.Header{}
expectedHeader.Set("content-md5", "====test")
expectedHeader.Set("host", "localhost:9000")
if !reflect.DeepEqual(res.Header, expectedHeader) {
t.Fatalf("Expected %#v, got %#v", expectedHeader, res.Header)
}
}