MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-06 12:50:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

preserve incoming query params in success_action_redirect (#15280)

Browse Source 
fixes #15274
This commit is contained in:
Harshavardhana 2022-07-13 07:46:44 -07:00 committed by GitHub
parent 996cac5fed
commit 788fd3df81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/bucket-handlers.go
View File

@ -1116,9 +1116,10 @@ func (api objectAPIHandlers) PostPolicyBucketHandler(w http.ResponseWriter, r *h
Host: handlers.GetSourceIP(r), Host: handlers.GetSourceIP(r),
}) })
if successRedirect != "" { if redirectURL != nil { // success_action_redirect is valid and set.
// Replace raw query params.. redirectURL.Query().Add("bucket", objInfo.Bucket)
redirectURL.RawQuery = getRedirectPostRawQuery(objInfo) redirectURL.Query().Add("key", objInfo.Name)
redirectURL.Query().Add("etag", "\""+objInfo.ETag+"\"")
writeRedirectSeeOther(w, redirectURL.String()) writeRedirectSeeOther(w, redirectURL.String())
return return
} }

11
cmd/handler-utils.go
View File

@ -27,7 +27,6 @@ import (
"mime/multipart" "mime/multipart"
"net/http" "net/http"
"net/textproto" "net/textproto"
"net/url"
"regexp" "regexp"
"strings" "strings"
@ -197,16 +196,6 @@ func extractMetadataFromMime(ctx context.Context, v textproto.MIMEHeader, m map[
return nil return nil
} }
// The Query string for the redirect URL the client is
// redirected on successful upload.
func getRedirectPostRawQuery(objInfo ObjectInfo) string {
redirectValues := make(url.Values)
redirectValues.Set("bucket", objInfo.Bucket)
redirectValues.Set("key", objInfo.Name)
redirectValues.Set("etag", "\""+objInfo.ETag+"\"")
return redirectValues.Encode()
}
// Returns access credentials in the request Authorization header. // Returns access credentials in the request Authorization header.
func getReqAccessCred(r *http.Request, region string) (cred auth.Credentials) { func getReqAccessCred(r *http.Request, region string) (cred auth.Credentials) {
cred, _, _ = getReqAccessKeyV4(r, region, serviceS3) cred, _, _ = getReqAccessKeyV4(r, region, serviceS3)

6
cmd/post-policy_test.go
View File

@ -447,7 +447,7 @@ func testPostPolicyBucketHandlerRedirect(obj ObjectLayer, instanceType string, t
targetObj := keyName + "/upload.txt" targetObj := keyName + "/upload.txt"
// The url of success_action_redirect field // The url of success_action_redirect field
redirectURL, err := url.Parse("http://www.google.com") redirectURL, err := url.Parse("http://www.google.com?query=value")
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -499,7 +499,9 @@ func testPostPolicyBucketHandlerRedirect(obj ObjectLayer, instanceType string, t
t.Error("Unexpected error: ", err) t.Error("Unexpected error: ", err)
} }
redirectURL.RawQuery = getRedirectPostRawQuery(info) redirectURL.Query().Add("bucket", info.Bucket)
redirectURL.Query().Add("key", info.Name)
redirectURL.Query().Add("etag", "\""+info.ETag+"\"")
expectedLocation := redirectURL.String() expectedLocation := redirectURL.String()
// Check the new location url // Check the new location url