mirror of
https://github.com/minio/minio.git
synced 2025-04-05 12:20:34 -04:00
bucket-handlers: do not unescape marker as gorilla layer would have already done it. (#1495) (#1510)
This commit is contained in:
parent
a5d31d4254
commit
c06b9abc15
@ -171,14 +171,6 @@ func (api objectAPIHandlers) ListMultipartUploadsHandler(w http.ResponseWriter,
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if keyMarker != "" {
|
if keyMarker != "" {
|
||||||
// Unescape keyMarker string
|
|
||||||
keyMarkerUnescaped, err := url.QueryUnescape(keyMarker)
|
|
||||||
if err != nil {
|
|
||||||
// Return 'NoSuchKey' to indicate invalid marker key.
|
|
||||||
writeErrorResponse(w, r, ErrNoSuchKey, r.URL.Path)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
keyMarker = keyMarkerUnescaped
|
|
||||||
// Marker not common with prefix is not implemented.
|
// Marker not common with prefix is not implemented.
|
||||||
if !strings.HasPrefix(keyMarker, prefix) {
|
if !strings.HasPrefix(keyMarker, prefix) {
|
||||||
writeErrorResponse(w, r, ErrNotImplemented, r.URL.Path)
|
writeErrorResponse(w, r, ErrNotImplemented, r.URL.Path)
|
||||||
@ -242,14 +234,6 @@ func (api objectAPIHandlers) ListObjectsHandler(w http.ResponseWriter, r *http.R
|
|||||||
}
|
}
|
||||||
// If marker is set unescape.
|
// If marker is set unescape.
|
||||||
if marker != "" {
|
if marker != "" {
|
||||||
// Try to unescape marker.
|
|
||||||
markerUnescaped, err := url.QueryUnescape(marker)
|
|
||||||
if err != nil {
|
|
||||||
// Return 'NoSuchKey' to indicate invalid marker key.
|
|
||||||
writeErrorResponse(w, r, ErrNoSuchKey, r.URL.Path)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
marker = markerUnescaped
|
|
||||||
// Marker not common with prefix is not implemented.
|
// Marker not common with prefix is not implemented.
|
||||||
if !strings.HasPrefix(marker, prefix) {
|
if !strings.HasPrefix(marker, prefix) {
|
||||||
writeErrorResponse(w, r, ErrNotImplemented, r.URL.Path)
|
writeErrorResponse(w, r, ErrNotImplemented, r.URL.Path)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user