aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2022-04-20 09:40:41 -0700
committerchrislu <chris.lu@gmail.com>2022-04-20 09:40:41 -0700
commitbdc4d67de8ffe79a4f1fd19d98f9ba7799109823 (patch)
treeb70b300cd0b300461325a720c8946b2659b5432f
parent3aa4dc6ad5bbbb2eb79787345056a8fffecdc0c1 (diff)
downloadseaweedfs-bdc4d67de8ffe79a4f1fd19d98f9ba7799109823.tar.xz
seaweedfs-bdc4d67de8ffe79a4f1fd19d98f9ba7799109823.zip
Revert "Merge pull request #2944 from guo-sj/handle_implicit_username"
This reverts commit bc96e73b8dfbc25f285d17ac4438c85dfd958be3, reversing changes made to 88a669dd193ce03fd4a511487e1a0fdaab118890.
-rw-r--r--weed/iamapi/iamapi_management_handlers.go15
1 files changed, 0 insertions, 15 deletions
diff --git a/weed/iamapi/iamapi_management_handlers.go b/weed/iamapi/iamapi_management_handlers.go
index 5fea49f5c..94003c46e 100644
--- a/weed/iamapi/iamapi_management_handlers.go
+++ b/weed/iamapi/iamapi_management_handlers.go
@@ -377,18 +377,6 @@ func (iama *IamApiServer) DeleteAccessKey(s3cfg *iam_pb.S3ApiConfiguration, valu
return resp
}
-// handleImplicitUsername adds username who signs the request to values if 'username' is not specified
-// According to https://awscli.amazonaws.com/v2/documentation/api/latest/reference/iam/create-access-key.html/
-// "If you do not specify a user name, IAM determines the user name implicitly based on the Amazon Web
-// Services access key ID signing the request."
-func handleImplicitUsername(r *http.Request, values url.Values) {
- if values.Get("UserName") == "" {
- // get username who signs the request
- userName := strings.Split(r.Header["Authorization"][0], "/")[2]
- values.Set("UserName", userName)
- }
-}
-
func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) {
if err := r.ParseForm(); err != nil {
s3err.WriteErrorResponse(w, r, s3err.ErrInvalidRequest)
@@ -413,7 +401,6 @@ func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) {
response = iama.ListUsers(s3cfg, values)
changed = false
case "ListAccessKeys":
- handleImplicitUsername(r, values)
response = iama.ListAccessKeys(s3cfg, values)
changed = false
case "CreateUser":
@@ -441,10 +428,8 @@ func (iama *IamApiServer) DoActions(w http.ResponseWriter, r *http.Request) {
return
}
case "CreateAccessKey":
- handleImplicitUsername(r, values)
response = iama.CreateAccessKey(s3cfg, values)
case "DeleteAccessKey":
- handleImplicitUsername(r, values)
response = iama.DeleteAccessKey(s3cfg, values)
case "CreatePolicy":
response, err = iama.CreatePolicy(s3cfg, values)