From 380e0ddb577d9c4e5613e9ea7af61b481dd7f8f3 Mon Sep 17 00:00:00 2001 From: kannappanr <30541348+kannappanr@users.noreply.github.com> Date: Fri, 9 Mar 2018 00:51:05 -0800 Subject: [PATCH] Remove unwanted errorIf calls (#5621) Remove errorIf call with a errSignatureMismatch error --- cmd/auth-handler.go | 12 ++---------- cmd/object-handlers.go | 6 ------ 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/cmd/auth-handler.go b/cmd/auth-handler.go index c469297d9..d50367ecc 100644 --- a/cmd/auth-handler.go +++ b/cmd/auth-handler.go @@ -123,17 +123,9 @@ func checkRequestAuthType(r *http.Request, bucket, policyAction, region string) switch reqAuthType { case authTypePresignedV2, authTypeSignedV2: // Signature V2 validation. - s3Error := isReqAuthenticatedV2(r) - if s3Error != ErrNone { - errorIf(errSignatureMismatch, "%s", dumpRequest(r)) - } - return s3Error + return isReqAuthenticatedV2(r) case authTypeSigned, authTypePresigned: - s3Error := isReqAuthenticated(r, region) - if s3Error != ErrNone { - errorIf(errSignatureMismatch, "%s", dumpRequest(r)) - } - return s3Error + return isReqAuthenticated(r, region) } if reqAuthType == authTypeAnonymous && policyAction != "" { diff --git a/cmd/object-handlers.go b/cmd/object-handlers.go index 07daedf1a..39286cf96 100644 --- a/cmd/object-handlers.go +++ b/cmd/object-handlers.go @@ -640,21 +640,18 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req // Initialize stream signature verifier. reader, s3Err = newSignV4ChunkedReader(r) if s3Err != ErrNone { - errorIf(errSignatureMismatch, "%s", dumpRequest(r)) writeErrorResponse(w, s3Err, r.URL) return } case authTypeSignedV2, authTypePresignedV2: s3Err = isReqAuthenticatedV2(r) if s3Err != ErrNone { - errorIf(errSignatureMismatch, "%s", dumpRequest(r)) writeErrorResponse(w, s3Err, r.URL) return } case authTypePresigned, authTypeSigned: if s3Err = reqSignatureV4Verify(r, globalServerConfig.GetRegion()); s3Err != ErrNone { - errorIf(errSignatureMismatch, "%s", dumpRequest(r)) writeErrorResponse(w, s3Err, r.URL) return } @@ -1069,20 +1066,17 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http var s3Error APIErrorCode reader, s3Error = newSignV4ChunkedReader(r) if s3Error != ErrNone { - errorIf(errSignatureMismatch, "%s", dumpRequest(r)) writeErrorResponse(w, s3Error, r.URL) return } case authTypeSignedV2, authTypePresignedV2: s3Error := isReqAuthenticatedV2(r) if s3Error != ErrNone { - errorIf(errSignatureMismatch, "%s", dumpRequest(r)) writeErrorResponse(w, s3Error, r.URL) return } case authTypePresigned, authTypeSigned: if s3Error := reqSignatureV4Verify(r, globalServerConfig.GetRegion()); s3Error != ErrNone { - errorIf(errSignatureMismatch, "%s", dumpRequest(r)) writeErrorResponse(w, s3Error, r.URL) return }