From fafc41a27fd3c5f6a4244729f94b68d690ec2482 Mon Sep 17 00:00:00 2001
From: Rinat Shigapov <rinatshigapov@gmail.com>
Date: Thu, 11 Jun 2020 17:53:15 +0300
Subject: [PATCH] return xml encoded NotFound status code for s3 delete

---
 weed/s3api/s3api_errors.go          | 6 ++++++
 weed/s3api/s3api_handlers.go        | 9 ++++++++-
 weed/s3api/s3api_object_handlers.go | 4 ++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/weed/s3api/s3api_errors.go b/weed/s3api/s3api_errors.go
index 3f97c73cb..ff411f276 100644
--- a/weed/s3api/s3api_errors.go
+++ b/weed/s3api/s3api_errors.go
@@ -33,6 +33,7 @@ const (
 	ErrBucketAlreadyExists
 	ErrBucketAlreadyOwnedByYou
 	ErrNoSuchBucket
+	ErrNoSuchKey
 	ErrNoSuchUpload
 	ErrInvalidBucketName
 	ErrInvalidDigest
@@ -134,6 +135,11 @@ var errorCodeResponse = map[ErrorCode]APIError{
 		Description:    "The specified bucket does not exist",
 		HTTPStatusCode: http.StatusNotFound,
 	},
+	ErrNoSuchKey: {
+		Code:           "NoSuchKey",
+		Description:    "The specified key does not exist.",
+		HTTPStatusCode: http.StatusNotFound,
+	},
 	ErrNoSuchUpload: {
 		Code:           "NoSuchUpload",
 		Description:    "The specified multipart upload does not exist. The upload ID may be invalid, or the upload may have been aborted or completed.",
diff --git a/weed/s3api/s3api_handlers.go b/weed/s3api/s3api_handlers.go
index 45a7cbc2e..7ef676400 100644
--- a/weed/s3api/s3api_handlers.go
+++ b/weed/s3api/s3api_handlers.go
@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
+	"strconv"
 	"time"
 
 	"google.golang.org/grpc"
@@ -76,13 +77,19 @@ func getRESTErrorResponse(err APIError, resource string) RESTErrorResponse {
 
 func writeResponse(w http.ResponseWriter, statusCode int, response []byte, mType mimeType) {
 	setCommonHeaders(w)
+	if response != nil {
+		w.Header().Set("Content-Length", strconv.Itoa(len(response)))
+	}
 	if mType != mimeNone {
 		w.Header().Set("Content-Type", string(mType))
 	}
 	w.WriteHeader(statusCode)
 	if response != nil {
 		glog.V(4).Infof("status %d %s: %s", statusCode, mType, string(response))
-		w.Write(response)
+		_, err := w.Write(response)
+		if err != nil {
+			glog.V(0).Infof("write err: %v", err)
+		}
 		w.(http.Flusher).Flush()
 	}
 }
diff --git a/weed/s3api/s3api_object_handlers.go b/weed/s3api/s3api_object_handlers.go
index ce3bdba8c..7c6eaeb70 100644
--- a/weed/s3api/s3api_object_handlers.go
+++ b/weed/s3api/s3api_object_handlers.go
@@ -112,6 +112,10 @@ func (s3a *S3ApiServer) DeleteObjectHandler(w http.ResponseWriter, r *http.Reque
 		for k, v := range proxyResponse.Header {
 			w.Header()[k] = v
 		}
+		if proxyResponse.StatusCode == http.StatusNotFound {
+			writeErrorResponse(w, ErrNoSuchKey, r.URL)
+			return
+		}
 		w.WriteHeader(proxyResponse.StatusCode)
 	})