mirror of
https://github.com/minio/minio.git
synced 2025-11-20 18:06:10 -05:00
api: Handle content-length-range policy properly. (#3297)
content-length-range policy in postPolicy API was
not working properly handle it. The reflection
strategy used has changed in recent version of Go.
Any free form interface{} of any integer is treated
as `float64` this caused a bug where content-length-range
parsing failed to provide any value.
Fixes #3295
This commit is contained in:
@@ -163,27 +163,25 @@ func (d byBucketName) Len() int { return len(d) }
|
||||
func (d byBucketName) Swap(i, j int) { d[i], d[j] = d[j], d[i] }
|
||||
func (d byBucketName) Less(i, j int) bool { return d[i].Name < d[j].Name }
|
||||
|
||||
// Copied from io.LimitReader()
|
||||
// limitReader returns a Reader that reads from r
|
||||
// but returns error after n bytes.
|
||||
// The underlying implementation is a *LimitedReader.
|
||||
type limitedReader struct {
|
||||
R io.Reader // underlying reader
|
||||
M int64 // min bytes remaining
|
||||
N int64 // max bytes remaining
|
||||
// rangeReader returns a Reader that reads from r
|
||||
// but returns error after Max bytes read as errDataTooLarge.
|
||||
// but returns error if reader exits before reading Min bytes
|
||||
// errDataTooSmall.
|
||||
type rangeReader struct {
|
||||
Reader io.Reader // underlying reader
|
||||
Min int64 // min bytes remaining
|
||||
Max int64 // max bytes remaining
|
||||
}
|
||||
|
||||
func limitReader(r io.Reader, m, n int64) io.Reader { return &limitedReader{r, m, n} }
|
||||
|
||||
func (l *limitedReader) Read(p []byte) (n int, err error) {
|
||||
n, err = l.R.Read(p)
|
||||
l.N -= int64(n)
|
||||
l.M -= int64(n)
|
||||
if l.N < 0 {
|
||||
func (l *rangeReader) Read(p []byte) (n int, err error) {
|
||||
n, err = l.Reader.Read(p)
|
||||
l.Max -= int64(n)
|
||||
l.Min -= int64(n)
|
||||
if l.Max < 0 {
|
||||
// If more data is available than what is expected we return error.
|
||||
return 0, errDataTooLarge
|
||||
}
|
||||
if err == io.EOF && l.M > 0 {
|
||||
if err == io.EOF && l.Min > 0 {
|
||||
return 0, errDataTooSmall
|
||||
}
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user