diff options
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_server_handlers_write.go | 5 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_write_autochunk.go | 19 |
2 files changed, 15 insertions, 9 deletions
diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index 923f2c0eb..1535ba207 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -15,6 +15,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/security" + "github.com/seaweedfs/seaweedfs/weed/util/constants" "github.com/seaweedfs/seaweedfs/weed/stats" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/util" @@ -168,7 +169,7 @@ func (fs *FilerServer) move(ctx context.Context, w http.ResponseWriter, r *http. return } else if wormEnforced { // you cannot move a worm file or directory - err = fmt.Errorf("cannot move write-once entry from '%s' to '%s': operation not permitted", src, dst) + err = fmt.Errorf("cannot move write-once entry from '%s' to '%s': %s", src, dst, constants.ErrMsgOperationNotPermitted) writeJsonError(w, r, http.StatusForbidden, err) return } @@ -228,7 +229,7 @@ func (fs *FilerServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { writeJsonError(w, r, http.StatusInternalServerError, err) return } else if wormEnforced { - writeJsonError(w, r, http.StatusForbidden, errors.New("operation not permitted")) + writeJsonError(w, r, http.StatusForbidden, errors.New(constants.ErrMsgOperationNotPermitted)) return } diff --git a/weed/server/filer_server_handlers_write_autochunk.go b/weed/server/filer_server_handlers_write_autochunk.go index 0d6462c11..46fa2519d 100644 --- a/weed/server/filer_server_handlers_write_autochunk.go +++ b/weed/server/filer_server_handlers_write_autochunk.go @@ -20,6 +20,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" + "github.com/seaweedfs/seaweedfs/weed/util/constants" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/util" ) @@ -50,13 +51,17 @@ func (fs *FilerServer) autoChunk(ctx context.Context, w http.ResponseWriter, r * reply, md5bytes, err = fs.doPutAutoChunk(ctx, w, r, chunkSize, contentLength, so) } if err != nil { - if err.Error() == "operation not permitted" { + errStr := err.Error() + switch { + case errStr == constants.ErrMsgOperationNotPermitted: writeJsonError(w, r, http.StatusForbidden, err) - } else if strings.HasPrefix(err.Error(), "read input:") || err.Error() == io.ErrUnexpectedEOF.Error() { + case strings.HasPrefix(errStr, "read input:") || errStr == io.ErrUnexpectedEOF.Error(): writeJsonError(w, r, util.HttpStatusCancelled, err) - } else if strings.HasSuffix(err.Error(), "is a file") || strings.HasSuffix(err.Error(), "already exists") { + case strings.HasSuffix(errStr, "is a file") || strings.HasSuffix(errStr, "already exists"): writeJsonError(w, r, http.StatusConflict, err) - } else { + case errStr == constants.ErrMsgBadDigest: + writeJsonError(w, r, http.StatusBadRequest, err) + default: writeJsonError(w, r, http.StatusInternalServerError, err) } } else if reply != nil { @@ -110,7 +115,7 @@ func (fs *FilerServer) doPostAutoChunk(ctx context.Context, w http.ResponseWrite headerMd5 := r.Header.Get("Content-Md5") if headerMd5 != "" && !(util.Base64Encode(md5bytes) == headerMd5 || fmt.Sprintf("%x", md5bytes) == headerMd5) { fs.filer.DeleteUncommittedChunks(ctx, fileChunks) - return nil, nil, errors.New("The Content-Md5 you specified did not match what we received.") + return nil, nil, errors.New(constants.ErrMsgBadDigest) } filerResult, replyerr = fs.saveMetaData(ctx, r, fileName, contentType, so, md5bytes, fileChunks, chunkOffset, smallContent) if replyerr != nil { @@ -142,7 +147,7 @@ func (fs *FilerServer) doPutAutoChunk(ctx context.Context, w http.ResponseWriter headerMd5 := r.Header.Get("Content-Md5") if headerMd5 != "" && !(util.Base64Encode(md5bytes) == headerMd5 || fmt.Sprintf("%x", md5bytes) == headerMd5) { fs.filer.DeleteUncommittedChunks(ctx, fileChunks) - return nil, nil, errors.New("The Content-Md5 you specified did not match what we received.") + return nil, nil, errors.New(constants.ErrMsgBadDigest) } filerResult, replyerr = fs.saveMetaData(ctx, r, fileName, contentType, so, md5bytes, fileChunks, chunkOffset, smallContent) if replyerr != nil { @@ -171,7 +176,7 @@ func (fs *FilerServer) checkPermissions(ctx context.Context, r *http.Request, fi return err } else if enforced { // you cannot change a worm file - return errors.New("operation not permitted") + return errors.New(constants.ErrMsgOperationNotPermitted) } return nil |