aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorguosj <515878133@qq.com>2022-04-24 16:09:10 +0800
committerguosj <515878133@qq.com>2022-04-24 16:09:10 +0800
commit8fd7b24b80e7706741dc26d873a656a5d3555a4d (patch)
tree31c0623a83171f202ee22e9c51923d95ee5f3373
parent09befe871f359d5bf8e3a24524f2b13de4061c3e (diff)
downloadseaweedfs-8fd7b24b80e7706741dc26d873a656a5d3555a4d.tar.xz
seaweedfs-8fd7b24b80e7706741dc26d873a656a5d3555a4d.zip
remove redundant logs & add unit test
-rw-r--r--weed/iamapi/iamapi_management_handlers.go4
-rw-r--r--weed/iamapi/iamapi_test.go22
2 files changed, 22 insertions, 4 deletions
diff --git a/weed/iamapi/iamapi_management_handlers.go b/weed/iamapi/iamapi_management_handlers.go
index fedc837d6..488e92aa5 100644
--- a/weed/iamapi/iamapi_management_handlers.go
+++ b/weed/iamapi/iamapi_management_handlers.go
@@ -394,19 +394,15 @@ func handleImplicitUsername(r *http.Request, values url.Values) {
if len(s) < 2 {
return
}
- glog.V(4).Infof("First strip: %v", s)
s = strings.Split(s[1], ",")
if len(s) < 2 {
return
}
- glog.V(4).Infof("Second strip: %v", s)
s = strings.Split(s[0], "/")
if len(s) < 5 {
return
}
- glog.V(4).Infof("Third strip: %v", s)
userName := s[2]
- glog.V(4).Infof("UserName: %v", userName)
values.Set("UserName", userName)
}
diff --git a/weed/iamapi/iamapi_test.go b/weed/iamapi/iamapi_test.go
index 5b21e4293..375e9a2f3 100644
--- a/weed/iamapi/iamapi_test.go
+++ b/weed/iamapi/iamapi_test.go
@@ -4,6 +4,7 @@ import (
"encoding/xml"
"net/http"
"net/http/httptest"
+ "net/url"
"testing"
"github.com/aws/aws-sdk-go/aws"
@@ -192,3 +193,24 @@ func executeRequest(req *http.Request, v interface{}) (*httptest.ResponseRecorde
apiRouter.ServeHTTP(rr, req)
return rr, xml.Unmarshal(rr.Body.Bytes(), &v)
}
+
+func TestHandleImplicitUsername(t *testing.T) {
+ var tests = []struct {
+ r *http.Request
+ values url.Values
+ userName string
+ }{
+ {&http.Request{}, url.Values{}, ""},
+ {&http.Request{Header: http.Header{"Authorization": []string{"AWS4-HMAC-SHA256 Credential=197FSAQ7HHTA48X64O3A/20220420/test1/iam/aws4_request, SignedHeaders=content-type;host;x-amz-date, Signature=6757dc6b3d7534d67e17842760310e99ee695408497f6edc4fdb84770c252dc8"}}}, url.Values{}, "test1"},
+ {&http.Request{Header: http.Header{"Authorization": []string{"AWS4-HMAC-SHA256 =197FSAQ7HHTA48X64O3A/20220420/test1/iam/aws4_request, SignedHeaders=content-type;host;x-amz-date, Signature=6757dc6b3d7534d67e17842760310e99ee695408497f6edc4fdb84770c252dc8"}}}, url.Values{}, ""},
+ {&http.Request{Header: http.Header{"Authorization": []string{"AWS4-HMAC-SHA256 Credential=197FSAQ7HHTA48X64O3A/20220420/test1/iam/aws4_request SignedHeaders=content-type;host;x-amz-date Signature=6757dc6b3d7534d67e17842760310e99ee695408497f6edc4fdb84770c252dc8"}}}, url.Values{}, ""},
+ {&http.Request{Header: http.Header{"Authorization": []string{"AWS4-HMAC-SHA256 Credential=197FSAQ7HHTA48X64O3A/20220420/test1/iam, SignedHeaders=content-type;host;x-amz-date, Signature=6757dc6b3d7534d67e17842760310e99ee695408497f6edc4fdb84770c252dc8"}}}, url.Values{}, ""},
+ }
+
+ for i, test := range tests {
+ handleImplicitUsername(test.r, test.values)
+ if un := test.values.Get("UserName"); un != test.userName {
+ t.Errorf("No.%d: Got: %v, Expected: %v", i, un, test.userName)
+ }
+ }
+}