gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename functions and remove uncessary check

Browse Source
This commit is contained in:
guol-fnst
2022-04-12 13:29:50 +08:00
parent 180aa88a92
commit 44d810d163
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
weed/s3api/s3api_object_multipart_handlers.go
View File

@@ -71,7 +71,7 @@ func (s3a *S3ApiServer) CompleteMultipartUploadHandler(w http.ResponseWriter, r
// Get upload id. // Get upload id.
uploadID, _, _, _ := getObjectResources(r.URL.Query()) uploadID, _, _, _ := getObjectResources(r.URL.Query())
err := s3a.chkUploadID(object, uploadID) err := s3a.checkUploadId(object, uploadID)
if err != nil { if err != nil {
s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload) s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload)
return return
@@ -100,7 +100,7 @@ func (s3a *S3ApiServer) AbortMultipartUploadHandler(w http.ResponseWriter, r *ht
// Get upload id. // Get upload id.
uploadID, _, _, _ := getObjectResources(r.URL.Query()) uploadID, _, _, _ := getObjectResources(r.URL.Query())
err := s3a.chkUploadID(object, uploadID) err := s3a.checkUploadId(object, uploadID)
if err != nil { if err != nil {
s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload) s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload)
return return
@@ -176,7 +176,7 @@ func (s3a *S3ApiServer) ListObjectPartsHandler(w http.ResponseWriter, r *http.Re
return return
} }
err := s3a.chkUploadID(object, uploadID) err := s3a.checkUploadId(object, uploadID)
if err != nil { if err != nil {
s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload) s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload)
return return
@@ -206,13 +206,7 @@ func (s3a *S3ApiServer) PutObjectPartHandler(w http.ResponseWriter, r *http.Requ
bucket, object := xhttp.GetBucketAndObject(r) bucket, object := xhttp.GetBucketAndObject(r)
uploadID := r.URL.Query().Get("uploadId") uploadID := r.URL.Query().Get("uploadId")
exists, err := s3a.exists(s3a.genUploadsFolder(bucket), uploadID, true) err := s3a.checkUploadId(object, uploadID)
if !exists {
s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload)
return
}
err = s3a.chkUploadID(object, uploadID)
if err != nil { if err != nil {
s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload) s3err.WriteErrorResponse(w, r, s3err.ErrNoSuchUpload)
return return
@@ -284,7 +278,7 @@ func (s3a *S3ApiServer) generateUploadID(object string) string {
} }
//Check object name and uploadID when processing multipart uploading //Check object name and uploadID when processing multipart uploading
func (s3a *S3ApiServer) chkUploadID(object string, id string) error { func (s3a *S3ApiServer) checkUploadId(object string, id string) error {
hash := s3a.generateUploadID(object) hash := s3a.generateUploadID(object)
if hash != id { if hash != id {