MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-29 14:17:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: allow payload verification error to be returned (#15364)

Browse Source 
without reading the reader the error is ignored
by the custom unmarshaller written by ObjectLegalHold
data structure.
This commit is contained in:
Harshavardhana 2022-07-21 01:24:03 -07:00 committed by GitHub
parent c6ecaf68ed
commit 8249cd4406
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -39,7 +39,7 @@ lint: ## runs golangci-lint suite of linters
check: test check: test
test: verifiers build ## builds minio, runs linters, tests test: verifiers build ## builds minio, runs linters, tests
@echo "Running unit tests" @echo "Running unit tests"
@CGO_ENABLED=0 go test -tags kqueue ./... @MINIO_API_REQUESTS_MAX=10000 CGO_ENABLED=0 go test -tags kqueue ./...
test-decom: install test-decom: install
@echo "Running minio decom tests" @echo "Running minio decom tests"
@ -58,9 +58,9 @@ test-race: verifiers build ## builds minio, runs linters, tests (race)
test-iam: build ## verify IAM (external IDP, etcd backends) test-iam: build ## verify IAM (external IDP, etcd backends)
@echo "Running tests for IAM (external IDP, etcd backends)" @echo "Running tests for IAM (external IDP, etcd backends)"
@CGO_ENABLED=0 go test -tags kqueue -v -run TestIAM* ./cmd @MINIO_API_REQUESTS_MAX=10000 CGO_ENABLED=0 go test -tags kqueue -v -run TestIAM* ./cmd
@echo "Running tests for IAM (external IDP, etcd backends) with -race" @echo "Running tests for IAM (external IDP, etcd backends) with -race"
@GORACE=history_size=7 CGO_ENABLED=1 go test -race -tags kqueue -v -run TestIAM* ./cmd @MINIO_API_REQUESTS_MAX=10000 GORACE=history_size=7 CGO_ENABLED=1 go test -race -tags kqueue -v -run TestIAM* ./cmd
test-replication: install ## verify multi site replication test-replication: install ## verify multi site replication
@echo "Running tests for replicating three sites" @echo "Running tests for replicating three sites"

2
buildscripts/race.sh
View File

@ -3,6 +3,8 @@
set -e set -e
export GORACE="history_size=7" export GORACE="history_size=7"
export MINIO_API_REQUESTS_MAX=10000
## TODO remove `dsync` from race detector once this is merged and released https://go-review.googlesource.com/c/go/+/333529/ ## TODO remove `dsync` from race detector once this is merged and released https://go-review.googlesource.com/c/go/+/333529/
for d in $(go list ./... | grep -v dsync); do for d in $(go list ./... | grep -v dsync); do
CGO_ENABLED=1 go test -v -race --timeout 100m "$d" CGO_ENABLED=1 go test -v -race --timeout 100m "$d"

8
internal/bucket/object/lock/lock.go
View File

@ -18,6 +18,7 @@
package lock package lock
import ( import (
"bytes"
"context" "context"
"encoding/xml" "encoding/xml"
"errors" "errors"
@ -529,8 +530,13 @@ func (l *ObjectLegalHold) IsEmpty() bool {
// ParseObjectLegalHold decodes the XML into ObjectLegalHold // ParseObjectLegalHold decodes the XML into ObjectLegalHold
func ParseObjectLegalHold(reader io.Reader) (hold *ObjectLegalHold, err error) { func ParseObjectLegalHold(reader io.Reader) (hold *ObjectLegalHold, err error) {
buf, err := io.ReadAll(io.LimitReader(reader, maxObjectLockConfigSize))
if err != nil {
return nil, err
}
hold = &ObjectLegalHold{} hold = &ObjectLegalHold{}
if err = xml.NewDecoder(reader).Decode(hold); err != nil { if err = xml.NewDecoder(bytes.NewReader(buf)).Decode(hold); err != nil {
return nil, err return nil, err
} }